Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[tfaber] 72810: [KERNEL32] - Handle UTF-16 surrogate pairs in IntWideCharToMultiByteUTF8. CORE-12042 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Sep 26 10:12:58 2016 New Revision: 72810 URL: http://svn.reactos.org/svn/reactos?rev=72810&view=rev Log: [KERNEL32] - Handle UTF-16 surrogate pairs in IntWideCharToMultiByteUTF8. CORE-12042 #resolve Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/nls.c [iso-8859-1] Mon Sep 26 10:12:58 2016 @@ -95,7 +95,7 @@ RtlInitCodePageTable((PUSHORT)AnsiCodePage.SectionMapping, &AnsiCodePage.CodePageTable); AnsiCodePage.CodePage = AnsiCodePage.CodePageTable.CodePage; - + InsertTailList(&CodePageListHead, &AnsiCodePage.Entry); /* Setup OEM code page. */ @@ -515,7 +515,7 @@ TempString++; } } - + /* Does caller query for output buffer size? */ if (WideCharCount == 0) { @@ -753,7 +753,7 @@ LPBOOL UsedDefaultChar) { INT TempLength; - WCHAR Char; + DWORD Char; /* Does caller query for output buffer size? */ if (MultiByteCount == 0) @@ -766,7 +766,17 @@ { TempLength++; if (*WideCharString >= 0x800) + { TempLength++; + if (*WideCharString >= 0xd800 && *WideCharString < 0xdc00 && + WideCharCount >= 1 && + WideCharString[1] >= 0xdc00 && WideCharString[1] <= 0xe000) + { + WideCharCount--; + WideCharString++; + TempLength++; + } + } } } return TempLength; @@ -798,6 +808,35 @@ MultiByteString[0] = 0xc0 | Char; MultiByteString += 2; TempLength -= 2; + continue; + } + + /* surrogate pair 0x10000-0x10ffff: 4 bytes */ + if (Char >= 0xd800 && Char < 0xdc00 && + WideCharCount >= 1 && + WideCharString[1] >= 0xdc00 && WideCharString[1] < 0xe000) + { + WideCharCount--; + WideCharString++; + + if (TempLength < 4) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + break; + } + + Char = (Char - 0xd800) << 10; + Char |= *WideCharString - 0xdc00; + ASSERT(Char <= 0xfffff); + Char += 0x10000; + ASSERT(Char <= 0x10ffff); + + MultiByteString[3] = 0x80 | (Char & 0x3f); Char >>= 6; + MultiByteString[2] = 0x80 | (Char & 0x3f); Char >>= 6; + MultiByteString[1] = 0x80 | (Char & 0x3f); Char >>= 6; + MultiByteString[0] = 0xf0 | Char; + MultiByteString += 4; + TempLength -= 4; continue; }

7 years, 11 months

[tfaber] 72809: [KERNEL32_APITEST] - Add a test for WideCharToMultiByte with CP_UTF8 CORE-12042

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Sep 26 10:06:55 2016 New Revision: 72809 URL: http://svn.reactos.org/svn/reactos?rev=72809&view=rev Log: [KERNEL32_APITEST] - Add a test for WideCharToMultiByte with CP_UTF8 CORE-12042 Added: trunk/rostests/apitests/kernel32/WideCharToMultiByte.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Mon Sep 26 10:06:55 2016 @@ -14,6 +14,7 @@ SetUnhandledExceptionFilter.c TerminateProcess.c TunnelCache.c + WideCharToMultiByte.c testlist.c Mailslot.c) Added: trunk/rostests/apitests/kernel32/WideCharToMultiByte.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/WideCha… ============================================================================== --- trunk/rostests/apitests/kernel32/WideCharToMultiByte.c (added) +++ trunk/rostests/apitests/kernel32/WideCharToMultiByte.c [iso-8859-1] Mon Sep 26 10:06:55 2016 @@ -0,0 +1,175 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for WideCharToMultiByte + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#include <winnls.h> + +#define ntv6(x) (LOBYTE(LOWORD(GetVersion())) >= 6 ? (x) : 0) + +static +VOID +Utf8Convert_( + _In_ PCWSTR WideString, + _In_ PCSTR ExpectedUtf8_2003, + _In_ PCSTR ExpectedUtf8_Vista, + _In_ BOOL IsInvalid, + _In_ PCSTR File, + _In_ INT Line) +{ + size_t WideLen; + size_t Utf8Len; + char Buffer[32]; + int Ret; + ULONG i; + ULONG Error; + PCSTR ExpectedUtf8; + + ExpectedUtf8 = ntv6(1) ? ExpectedUtf8_Vista : ExpectedUtf8_2003; + WideLen = wcslen(WideString); + Utf8Len = strlen(ExpectedUtf8); + + /* Get length only */ + Ret = WideCharToMultiByte(CP_UTF8, 0, WideString, WideLen, NULL, 0, NULL, NULL); + ok_(File, Line)(Ret == Utf8Len, "Length check: Ret = %d\n", Ret); + + /* Get length including nul */ + Ret = WideCharToMultiByte(CP_UTF8, 0, WideString, WideLen + 1, NULL, 0, NULL, NULL); + ok_(File, Line)(Ret == Utf8Len + 1, "Length check with null: Ret = %d\n", Ret); + + /* Convert, excluding null */ + FillMemory(Buffer, sizeof(Buffer), 0x55); + Ret = WideCharToMultiByte(CP_UTF8, 0, WideString, WideLen, Buffer, sizeof(Buffer), NULL, NULL); + ok_(File, Line)(Ret == Utf8Len, "Convert: Ret = %d\n", Ret); + for (i = 0; i < Utf8Len; i++) + { + ok_(File, Line)(Buffer[i] == ExpectedUtf8[i], "Convert: Buffer[%lu] = 0x%x, expected 0x%x\n", i, (unsigned char)Buffer[i], (unsigned char)ExpectedUtf8[i]); + } + + /* Convert, including null */ + FillMemory(Buffer, sizeof(Buffer), 0x55); + Ret = WideCharToMultiByte(CP_UTF8, 0, WideString, WideLen + 1, Buffer, sizeof(Buffer), NULL, NULL); + ok_(File, Line)(Ret == Utf8Len + 1, "Convert with null: Ret = %d\n", Ret); + for (i = 0; i < Utf8Len + 1; i++) + { + ok_(File, Line)(Buffer[i] == ExpectedUtf8[i], "Convert with null: Buffer[%lu] = 0x%x, expected 0x%x\n", i, (unsigned char)Buffer[i], (unsigned char)ExpectedUtf8[i]); + } + + /* Get length, reject invalid */ + SetLastError(0xfeedf00d); + Ret = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, WideString, WideLen + 1, NULL, 0, NULL, NULL); + Error = GetLastError(); + if (!ntv6(1)) + { + ok_(File, Line)(Ret == 0, "Length check, reject invalid, NT5: Ret = %d\n", Ret); + ok_(File, Line)(Error == ERROR_INVALID_FLAGS, "Length check, reject invalid, NT5: Error = %lu\n", Error); + } + else if (IsInvalid) + { + ok_(File, Line)(Ret == 0, "Length check, reject invalid: Ret = %d\n", Ret); + ok_(File, Line)(Error == ERROR_NO_UNICODE_TRANSLATION, "Length check, reject invalid: Error = %lu\n", Error); + } + else + { + ok_(File, Line)(Ret == Utf8Len + 1, "Length check, reject invalid: Ret = %d\n", Ret); + } + + /* Convert, reject invalid */ + FillMemory(Buffer, sizeof(Buffer), 0x55); + SetLastError(0xfeedf00d); + Ret = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, WideString, WideLen + 1, Buffer, sizeof(Buffer), NULL, NULL); + Error = GetLastError(); + if (!ntv6(1)) + { + ok_(File, Line)(Ret == 0, "Convert, reject invalid, NT5: Ret = %d\n", Ret); + ok_(File, Line)(Error == ERROR_INVALID_FLAGS, "Convert, reject invalid, NT5: Error = %lu\n", Error); + } + else if (IsInvalid) + { + ok_(File, Line)(Ret == 0, "Convert, reject invalid: Ret = %d\n", Ret); + ok_(File, Line)(Error == ERROR_NO_UNICODE_TRANSLATION, "Convert, reject invalid: Error = %lu\n", Error); + for (i = 0; i < Utf8Len + 1; i++) + { + ok_(File, Line)(Buffer[i] == ExpectedUtf8[i], "Convert, reject invalid: Buffer[%lu] = 0x%x, expected 0x%x\n", i, (unsigned char)Buffer[i], (unsigned char)ExpectedUtf8[i]); + } + } + else + { + ok_(File, Line)(Ret == Utf8Len + 1, "Convert, reject invalid: Ret = %d\n", Ret); + for (i = 0; i < Utf8Len + 1; i++) + { + ok_(File, Line)(Buffer[i] == ExpectedUtf8[i], "Convert, reject invalid: Buffer[%lu] = 0x%x, expected 0x%x\n", i, (unsigned char)Buffer[i], (unsigned char)ExpectedUtf8[i]); + } + } +} +#define Utf8Convert(w, e, i) Utf8Convert_(w, e, e, i, __FILE__, __LINE__) +#define Utf8Convert_Vista(w, e, i, e2) Utf8Convert_(w, e, e2, i, __FILE__, __LINE__) + +static +VOID +TestUtf8(VOID) +{ + Utf8Convert(L"", "", FALSE); + + /* Various character ranges */ + Utf8Convert(L"A", "A", FALSE); + Utf8Convert(L"\x007f", "\x7f", FALSE); + Utf8Convert(L"\x0080", "\xc2\x80", FALSE); + Utf8Convert(L"\x00ff", "\xc3\xbf", FALSE); + Utf8Convert(L"\x0100", "\xc4\x80", FALSE); + Utf8Convert(L"\x07ff", "\xdf\xbf", FALSE); + Utf8Convert(L"\x0800", "\xe0\xa0\x80", FALSE); + Utf8Convert(L"\xd7ff", "\xed\x9f\xbf", FALSE); + Utf8Convert(L"\xe000", "\xee\x80\x80", FALSE); + Utf8Convert(L"\xffff", "\xef\xbf\xbf", FALSE); + + /* surrogate pairs */ + Utf8Convert(L"\xd800\xdc00", "\xf0\x90\x80\x80", FALSE); /* U+10000 */ + Utf8Convert(L"\xd800\xdfff", "\xf0\x90\x8f\xbf", FALSE); /* U+103ff */ + Utf8Convert(L"\xd801\xdc00", "\xf0\x90\x90\x80", FALSE); /* U+10400 */ + Utf8Convert(L"\xdbff\xdfff", "\xf4\x8f\xbf\xbf", FALSE); /* U+10ffff */ + + /* standalone lead surrogate becomes 0xfffd on Vista, goes through verbatim on 2003 */ + Utf8Convert_Vista(L"\xd800", "\xed\xa0\x80", TRUE, + "\xef\xbf\xbd"); + Utf8Convert_Vista(L"\xd800-", "\xed\xa0\x80-", TRUE, + "\xef\xbf\xbd-"); + Utf8Convert_Vista(L"\xdbff", "\xed\xaf\xbf", TRUE, + "\xef\xbf\xbd"); + Utf8Convert_Vista(L"\xdbff-", "\xed\xaf\xbf-", TRUE, + "\xef\xbf\xbd-"); + + /* standalone trail surrogate becomes 0xfffd */ + Utf8Convert_Vista(L"\xdc00", "\xed\xb0\x80", TRUE, + "\xef\xbf\xbd"); + Utf8Convert_Vista(L"\xdc00-", "\xed\xb0\x80-", TRUE, + "\xef\xbf\xbd-"); + Utf8Convert_Vista(L"\xdfff", "\xed\xbf\xbf", TRUE, + "\xef\xbf\xbd"); + Utf8Convert_Vista(L"\xdfff-", "\xed\xbf\xbf-", TRUE, + "\xef\xbf\xbd-"); + + /* Reverse surrogate pair */ + Utf8Convert_Vista(L"\xdfff\xdbff", "\xed\xbf\xbf\xed\xaf\xbf", TRUE, + "\xef\xbf\xbd\xef\xbf\xbd"); + + /* Byte order marks */ + Utf8Convert(L"\xfeff", "\xef\xbb\xbf", FALSE); + Utf8Convert(L"\xfffe", "\xef\xbf\xbe", FALSE); + + /* canonically equivalent representations -- no normalization should happen */ + Utf8Convert(L"\x1e09", "\xe1\xb8\x89", FALSE); + Utf8Convert(L"\x0107\x0327", "\xc4\x87\xcc\xa7", FALSE); + Utf8Convert(L"\x00e7\x0301", "\xc3\xa7\xcc\x81", FALSE); + Utf8Convert(L"\x0063\x0327\x0301", "\x63\xcc\xa7\xcc\x81", FALSE); + Utf8Convert(L"\x0063\x0301\x0327", "\x63\xcc\x81\xcc\xa7", FALSE); +} + +START_TEST(WideCharToMultiByte) +{ + TestUtf8(); +} Propchange: trunk/rostests/apitests/kernel32/WideCharToMultiByte.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Mon Sep 26 10:06:55 2016 @@ -18,6 +18,7 @@ extern void func_SetUnhandledExceptionFilter(void); extern void func_TerminateProcess(void); extern void func_TunnelCache(void); +extern void func_WideCharToMultiByte(void); const struct test winetest_testlist[] = { @@ -36,6 +37,7 @@ { "SetUnhandledExceptionFilter", func_SetUnhandledExceptionFilter }, { "TerminateProcess", func_TerminateProcess }, { "TunnelCache", func_TunnelCache }, + { "WideCharToMultiByte", func_WideCharToMultiByte }, { 0, 0 } };

7 years, 11 months

[gadamopoulos] 72808: [SHELL32] - CDefView: Overhaul the code that filled the menu bar of explorer. Fill the arrange as menu with the column names from the shell folders instead of hardcoding them....

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Sep 26 00:43:21 2016 New Revision: 72808 URL: http://svn.reactos.org/svn/reactos?rev=72808&view=rev Log: [SHELL32] - CDefView: Overhaul the code that filled the menu bar of explorer. Fill the arrange as menu with the column names from the shell folders instead of hardcoding them. Check the selected arrange mode and view mode in the menu bar and in the context menu. Make the items in the file menu to actually work. It is possible to arrange the icons from the context menu now. - Note to translators: Please check that the changes that I did in the 31 resource files make sense. Also note that the "Arrange Icons" menu now is called "Arrange Icons As". Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef…

7 years, 11 months

[rnaumann] 72807: [SHELL32]Swedish translation by Andreas Bjerkeholt CORE-12040

by rnaumann＠svn.reactos.org

Author: rnaumann Date: Sun Sep 25 22:53:05 2016 New Revision: 72807 URL: http://svn.reactos.org/svn/reactos?rev=72807&view=rev Log: [SHELL32]Swedish translation by Andreas Bjerkeholt CORE-12040 Added: trunk/reactos/dll/win32/mycomput/lang/sv-SE.rc (with props) Modified: trunk/reactos/dll/win32/mycomput/mycomput.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc Added: trunk/reactos/dll/win32/mycomput/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/lang/sv… ============================================================================== --- trunk/reactos/dll/win32/mycomput/lang/sv-SE.rc (added) +++ trunk/reactos/dll/win32/mycomput/lang/sv-SE.rc [iso-8859-1] Sun Sep 25 22:53:05 2016 @@ -0,0 +1,6 @@ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_MANAGE "Hantera" +END Propchange: trunk/reactos/dll/win32/mycomput/lang/sv-SE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mycomput/mycomput.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mycomput/mycompu… ============================================================================== --- trunk/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mycomput/mycomput.rc [iso-8859-1] Sun Sep 25 22:53:05 2016 @@ -39,6 +39,9 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_SV_SE + #include "lang/sv-SE.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Sun Sep 25 22:53:05 2016 @@ -2,10 +2,10 @@ MENU_001 MENU BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "Sto&ra ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mÃ¥ ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END /* shellview background menu */ @@ -13,49 +13,49 @@ BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&Visa" BEGIN - MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON - MENUITEM "&List", FCIDM_SHVIEW_LISTVIEW - MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW + MENUITEM "Sto&ra ikoner", FCIDM_SHVIEW_BIGICON + MENUITEM "S&mÃ¥ ikoner", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW + MENUITEM "&Detaljer", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Arrange &Icons" + POPUP "Ordna &ikoner" BEGIN - MENUITEM "By &Name", 0x30 /* column 0 */ - MENUITEM "By &Type", 0x32 /* column 2 */ - MENUITEM "By &Size", 0x31 /* ... */ - MENUITEM "By &Date", 0x33 + MENUITEM "Efter &namn", 0x30 /* column 0 */ + MENUITEM "Efter &typ", 0x32 /* column 2 */ + MENUITEM "Efter &storlek", 0x31 /* ... */ + MENUITEM "Efter &datum", 0x33 MENUITEM SEPARATOR - MENUITEM "&Auto Arrange", FCIDM_SHVIEW_AUTOARRANGE + MENUITEM "&Ordna automatiskt", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Line up Icons", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Rada upp ikoner", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR - MENUITEM "Refresh", FCIDM_SHVIEW_REFRESH + MENUITEM "Uppdatera", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR - MENUITEM "Paste", FCIDM_SHVIEW_INSERT - MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Klistra in", FCIDM_SHVIEW_INSERT + MENUITEM "Klistra in som genvÃ¤g", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES END END /* menubar EDIT menu */ MENU_003 MENU BEGIN - MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM "&Ãngra\tCtrl+Z", FCIDM_SHVIEW_UNDO MENUITEM SEPARATOR - MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT - MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY - MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT - MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Kl&ipp ut\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Kopiera\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Klistra in\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Klistra in &genvÃ¤g", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO - MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM "Kopiera till &mapp...", FCIDM_SHVIEW_COPYTO + MENUITEM "Fl&ytta till mapp...", FCIDM_SHVIEW_MOVETO MENUITEM SEPARATOR - MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL - MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION + MENUITEM "Markera &allt\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&OmvÃ¤nd markering", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -63,27 +63,27 @@ BEGIN POPUP "" BEGIN - MENUITEM "E&xplore", FCIDM_SHVIEW_EXPLORE - MENUITEM "&Open", FCIDM_SHVIEW_OPEN + MENUITEM "U&tforska", FCIDM_SHVIEW_EXPLORE + MENUITEM "&Ãppna", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ut", FCIDM_SHVIEW_CUT - MENUITEM "&Copy", FCIDM_SHVIEW_COPY + MENUITEM "K&lipp ut", FCIDM_SHVIEW_CUT + MENUITEM "&Kopiera", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Delete", FCIDM_SHVIEW_DELETE - MENUITEM "&Rename", FCIDM_SHVIEW_RENAME + MENUITEM "Skapa &genvÃ¤g", FCIDM_SHVIEW_CREATELINK + MENUITEM "&Ta bort", FCIDM_SHVIEW_DELETE + MENUITEM "&Byt namn", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR - MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES + MENUITEM "&Egenskaper", FCIDM_SHVIEW_PROPERTIES END END IDD_BROWSE_FOR_FOLDER DIALOGEX 15, 40, 188, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Browse for Folder" +CAPTION "BlÃ¤ddra efter mapp" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", 1, 60, 175, 60, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", 2, 125, 175, 60, 15, WS_GROUP | WS_TABSTOP LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 4, 4, 180, 12 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 4, 25, 180, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 4, 40, 180, 120 @@ -91,28 +91,28 @@ IDD_BROWSE_FOR_FOLDER_NEW DIALOGEX 15, 40, 218, 196 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Browse for Folder" +CAPTION "BlÃ¤ddra efter mapp" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_BROWSE_FOR_FOLDER_TITLE, 10, 8, 198, 24 LTEXT "", IDC_BROWSE_FOR_FOLDER_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 + LTEXT "Mapp:", IDC_BROWSE_FOR_FOLDER_FOLDER, 10, 152, 40, 12 CONTROL "", IDC_BROWSE_FOR_FOLDER_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDC_BROWSE_FOR_FOLDER_FOLDER_TEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Make New Folder", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Skapa ny mapp", IDC_BROWSE_FOR_FOLDER_NEW_FOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Avbryt", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP END IDD_YESTOALL_MSGBOX DIALOGEX 200, 100, 280, 90 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Message" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Yes to &all", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP +CAPTION "Meddelande" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Ja", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ja till &alla", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nej", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Avbryt", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDC_YESTOALL_ICON, 10, 10, 16, 16 LTEXT "", IDC_YESTOALL_MESSAGE, 40, 10, 238, 52, 0 END @@ -131,13 +131,13 @@ LTEXT ")", IDC_STATIC, 153, 65, 5, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 - LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 + LTEXT " ReactOS-gruppen\0", IDC_STATIC, 105, 75, 60, 10 LTEXT "", IDC_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Den hÃ¤r versionen av ReactOS Ã¤r registrerad till:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ - LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "Installerat fysiskt minne:", IDC_STATIC, 35, 152, 130, 10 LTEXT "", IDC_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 PUSHBUTTON "", IDC_ABOUT_AUTHORS, 5, 178, 70, 14 @@ -153,11 +153,11 @@ IDD_RUN DIALOGEX 0, 0, 227, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Run" +CAPTION "KÃ¶r" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Skriv namnet pÃ¥ ett program, en mapp eller ett dokument och ReactOS kommer att Ã¶ppna det fÃ¶r dig.", 12289, 36, 11, 182, 18 + LTEXT "Skriv namnet pÃ¥ ett program, en mapp, ett dokument eller en internetresurs som du vill Ã¶ppna.", 12289, 36, 11, 182, 18 LTEXT "&Ãppna:", 12305, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP @@ -167,109 +167,109 @@ IDD_SHORTCUT_PROPERTIES DIALOGEX 0, 0, 235, 215 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Shortcut" +CAPTION "GenvÃ¤g" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Target type:", 14004, 8, 38, 68, 10 + LTEXT "MÃ¥ltyp:", 14004, 8, 38, 68, 10 EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Target location:", 14006, 8, 55, 68, 10 + LTEXT "MÃ¥lplats:", 14006, 8, 55, 68, 10 EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Target:", 14008, 8, 71, 68, 10 + LTEXT "&MÃ¥l:", 14008, 8, 71, 68, 10 EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Start in:", 14010, 8, 98, 68, 10 + LTEXT "&Starta i:", 14010, 8, 98, 68, 10 EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 8, 117, 68, 10 + LTEXT "Kort&kommando:", 14014, 8, 117, 68, 10 CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "&Run:", 14016, 8, 136, 68, 10 + LTEXT "&KÃ¶r:", 14016, 8, 136, 68, 10 COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "C&omment:", 14018, 8, 154, 68, 10 + LTEXT "K&ommentar:", 14018, 8, 154, 68, 10 EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 9, 172, 70, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 84, 172, 70, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 159, 172, 70, 14, ES_LEFT + PUSHBUTTON "&SÃ¶k mÃ¥l...", 14020, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Ãndra ikon...", 14021, 84, 172, 70, 14, ES_LEFT + PUSHBUTTON "A&vancerat...", 14022, 159, 172, 70, 14, ES_LEFT END IDD_SHORTCUT_EXTENDED_PROPERTIES DIALOGEX 0, 0, 230, 150 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Extended Properties" +CAPTION "UtÃ¶kade egenskaper" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON - LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 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", 14001, 25, 100, 150, 10, WS_DISABLED + LTEXT "VÃ¤lj de avancerade egenskaper du vill ha fÃ¶r den hÃ¤r genvÃ¤gen.", -1, 5, 30, 210, 10 + CHECKBOX "KÃ¶r med andra anvÃ¤ndaruppgifter", 14000, 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", 14001, 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 "Avbryt", 2, 120, 124, 50, 15, WS_VISIBLE END IDD_FOLDER_PROPERTIES DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "General" +CAPTION "AllmÃ¤nt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT - LTEXT "Type of file:", 14004, 8, 40, 55, 10 - CONTROL "Folder", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 68, 40, 160, 10 + LTEXT "Filtyp:", 14004, 8, 40, 55, 10 + CONTROL "Mapp", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 68, 40, 160, 10 LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Location:", 14008, 8, 56, 55, 10 + LTEXT "Plats:", 14008, 8, 56, 55, 10 EDITTEXT 14009, 68, 56, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP - LTEXT "Size:", 14010, 8, 72, 55, 10 + LTEXT "Storlek:", 14010, 8, 72, 55, 10 EDITTEXT 14011, 68, 72, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Size on disk:", 140101, 8, 88, 55, 10 + LTEXT "Storlek pÃ¥ disk:", 140101, 8, 88, 55, 10 EDITTEXT 14012, 68, 88, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Contains:", 14026, 8, 104, 55, 10 + LTEXT "InnehÃ¥ller:", 14026, 8, 104, 55, 10 EDITTEXT 14027, 68, 104, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Created:", 14014, 8, 128, 55, 10 + LTEXT "Skapad:", 14014, 8, 128, 55, 10 EDITTEXT 14015, 68, 128, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Attributes:", 14020, 8, 152, 46, 10 - AUTOCHECKBOX "&Read-only", 14021, 56, 152, 70, 10 - AUTOCHECKBOX "&Hidden", 14022, 56, 166, 70, 10 - AUTOCHECKBOX "&Archive", 14023, 56, 180, 70, 10 - PUSHBUTTON "A&dvanced...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Attribut:", 14020, 8, 152, 46, 10 + AUTOCHECKBOX "&Skrivskyddad", 14021, 56, 152, 70, 10 + AUTOCHECKBOX "&Dold", 14022, 56, 166, 70, 10 + AUTOCHECKBOX "&Arkiv", 14023, 56, 180, 70, 10 + PUSHBUTTON "A&vancerat...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_FILE_PROPERTIES DIALOGEX 0, 0, 240, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "General" +CAPTION "AllmÃ¤nt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | WS_TABSTOP LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type of file:", 14004, 8, 35, 50, 10 - CONTROL "File", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10 - LTEXT "Opens with:", 14006, 8, 53, 50, 10 + LTEXT "Filtyp:", 14004, 8, 35, 50, 10 + CONTROL "Fil", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 68, 35, 160, 10 + LTEXT "Ãppna med:", 14006, 8, 53, 50, 10 ICON "", 14025, 68, 52, 11, 10, NOT WS_VISIBLE - PUSHBUTTON "&Change...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ãndra...", 14024, 168, 50, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP EDITTEXT 14007, 68, 53, 90, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "", -1, 8, 68, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Location:", 14008, 8, 75, 45, 10 + LTEXT "Plats:", 14008, 8, 75, 45, 10 EDITTEXT 14009, 68, 75, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP - LTEXT "Size:", 14010, 8, 91, 45, 10 + LTEXT "Storlek:", 14010, 8, 91, 45, 10 EDITTEXT 14011, 68, 91, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Size on disk:", 140112, 8, 107, 55, 10 + LTEXT "Storlek pÃ¥ disk:", 140112, 8, 107, 55, 10 EDITTEXT 14012, 68, 107, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Created:", 14014, 8, 131, 45, 10 + LTEXT "Skapad:", 14014, 8, 131, 45, 10 EDITTEXT 14015, 68, 131, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Modified:", 14016, 8, 147, 45, 10 + LTEXT "Ãndrad:", 14016, 8, 147, 45, 10 EDITTEXT 14017, 68, 147, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Accessed:", 14018, 8, 163, 45, 10 + LTEXT "AnvÃ¤nd:", 14018, 8, 163, 45, 10 EDITTEXT 14019, 68, 163, 160, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Attributes:", 14020, 8, 189, 45, 10 - AUTOCHECKBOX "&Read-only", 14021, 58, 189, 67, 10 - AUTOCHECKBOX "&Hidden", 14022, 126, 189, 50, 10 - AUTOCHECKBOX "&Archive", 14023, 181, 189, 49, 10 - PUSHBUTTON "A&dvanced...", 14028, 180, 185, 50, 15, WS_TABSTOP + LTEXT "Attribut:", 14020, 8, 189, 45, 10 + AUTOCHECKBOX "&Skrivskyddad", 14021, 58, 189, 67, 10 + AUTOCHECKBOX "&Dold", 14022, 126, 189, 50, 10 + AUTOCHECKBOX "&Arkiv", 14023, 181, 189, 49, 10 + PUSHBUTTON "A&vancerat...", 14028, 180, 185, 50, 15, WS_TABSTOP END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 @@ -277,444 +277,444 @@ CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "File version: ", 14000, 10, 10, 55, 10 + LTEXT "Filversion: ", 14000, 10, 10, 55, 10 EDITTEXT 14001, 77, 10, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - LTEXT "Description: ", 14002, 10, 27, 45, 10 + LTEXT "Beskrivning: ", 14002, 10, 27, 45, 10 EDITTEXT 14003, 77, 27, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER LTEXT "Copyright: ", 14004, 10, 46, 66, 10 EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER - GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115 - LTEXT "Item name: ", 14007, 13, 82, 50, 10 - LTEXT "Value: ", 14008, 112, 82, 45, 10 + GROUPBOX "Annan versionsinformation: ", 14006, 6, 70, 222, 115 + LTEXT "Objektnamn: ", 14007, 13, 82, 50, 10 + LTEXT "VÃ¤rde: ", 14008, 112, 82, 45, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END IDD_DRIVE_PROPERTIES DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "AllmÃ¤nt" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14016, 10, 3, 32, 32, WS_VISIBLE EDITTEXT 14000, 40, 11, 190, 14, ES_LEFT | WS_BORDER | WS_GROUP | ES_AUTOHSCROLL LTEXT "", -1, 8, 32, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type:", -1, 8, 38, 95, 10 + LTEXT "Typ:", -1, 8, 38, 95, 10 EDITTEXT 14001, 110, 38, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "File system:", -1, 8, 51, 95, 10 + LTEXT "Filsystem:", -1, 8, 51, 95, 10 EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10 - LTEXT "Used space:", -1, 25, 69, 80, 10 + LTEXT "AnvÃ¤nt utrymme:", -1, 25, 69, 80, 10 EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10 - LTEXT "Free space:", -1, 25, 82, 80, 10 + LTEXT "Ledigt utrymme:", -1, 25, 82, 80, 10 EDITTEXT 14005, 110, 82, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14006, 197, 82, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 97, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Capacity:", -1, 25, 103, 80, 10 + LTEXT "Kapacitet:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 - LTEXT "Drive %c", 14009, 100, 150, 70, 10 - PUSHBUTTON "&Disk Cleanup", 14010, 160, 154, 70, 15, WS_TABSTOP + LTEXT "Enhet %c", 14009, 100, 150, 70, 10 + PUSHBUTTON "&Diskrensning", 14010, 160, 154, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CHECKBOX "Compress drive to save disk space", 14011, 8, 191, 222, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 8, 205, 222, 10, WS_DISABLED + CHECKBOX "Komprimera enhet fÃ¶r att spara diskutrymme", 14011, 8, 191, 222, 10, WS_DISABLED + CHECKBOX "TillÃ¥t indexeringstjÃ¤nsten att indexera den hÃ¤r disken fÃ¶r snabb filsÃ¶kning", 14012, 8, 205, 222, 10, WS_DISABLED END IDD_DRIVE_TOOLS DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tools" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Error-checking", -1, 5, 5, 230, 60 +CAPTION "Verktyg" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Felkontroll", -1, 5, 5, 230, 60 ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 - LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 - PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP - GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 + LTEXT "Det hÃ¤r valet kontrollerar enheten efter\nfel.", -1, 40, 25, 160, 20 + PUSHBUTTON "Kontrollera nu...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentering", -1, 5, 65, 230, 60 ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 - LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 - PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP - GROUPBOX "Backup", -1, 5, 130, 230, 60 + LTEXT "Det hÃ¤r valet defragmenterar filer pÃ¥ enheten", -1, 40, 85, 160, 20 + PUSHBUTTON "Defragmentera nu...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "SÃ¤kerhetskopiering", -1, 5, 130, 230, 60 ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 - LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 - PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP + LTEXT "Det hÃ¤r valet sÃ¤kerhetskopierar filer pÃ¥ den hÃ¤r enheten.", -1, 40, 150, 160, 20 + PUSHBUTTON "SÃ¤kerhetskopiera nu...", 14002, 130, 170, 90, 15, WS_TABSTOP END IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" +CAPTION "HÃ¥rdvara" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN END IDD_RUN_AS DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Run As" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 - CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 - LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE - CHECKBOX "The following user:", 14002, 10, 100, 90, 10 - LTEXT "User name:", -1, 20, 118, 54, 10 +CAPTION "KÃ¶r som" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Vilket anvÃ¤ndarkonto vill du anvÃ¤nda fÃ¶r att kÃ¶ra det hÃ¤r programmet?", -1, 10, 20, 220, 20 + CHECKBOX "Nuvarande anvÃ¤ndare %s", 14000, 10, 45, 150, 10 + LTEXT "Skydda min dator frÃ¥n otillÃ¥ten programaktivitet", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "Det hÃ¤r alternativet kan hindra virus frÃ¥n att skada din dator eller personliga data, men kan orsaka att programmet inte fungerar korrekt.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "FÃ¶ljande anvÃ¤ndare:", 14002, 10, 100, 90, 10 + LTEXT "AnvÃ¤ndarnamn:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP - LTEXT "Password:", -1, 20, 143, 53, 10 + LTEXT "LÃ¶senord:", -1, 20, 143, 53, 10 EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP - PUSHBUTTON "Cancel", 14008, 122, 170, 60, 14, WS_TABSTOP + PUSHBUTTON "Avbryt", 14008, 122, 170, 60, 14, WS_TABSTOP END IDD_RECYCLE_BIN_PROPERTIES DIALOGEX 0, 0, 240, 190 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Recycle Bin Properties" +CAPTION "Egenskaper fÃ¶r Papperskorgen" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 - GROUPBOX "Settings for selected location", -1, 10, 72, 220, 70 - RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10, WS_TABSTOP - EDITTEXT 14002, 106, 87, 50, 14, WS_TABSTOP | ES_NUMBER - LTEXT "M&aximum size(MB):", -1, 20, 105, 70, 10 - RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - AUTOCHECKBOX "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP + GROUPBOX "InstÃ¤llningar fÃ¶r vald plats", -1, 10, 72, 220, 70 + RADIOBUTTON "&AnvÃ¤ndardefinierad storlek:", 14001, 20, 90, 100, 10, WS_TABSTOP + EDITTEXT 14002, 132, 87, 50, 14, WS_TABSTOP | ES_NUMBER + LTEXT "M&aximal storlek(MB):", -1, 20, 105, 70, 10 + RADIOBUTTON "Flytta inte filer till &Papperskorgen. Radera filer direkt nÃ¤r de tas bort.", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP + AUTOCHECKBOX "&Visa dialog fÃ¶r bekrÃ¤ftelse av borttagning", 14004, 20, 155, 150, 10, WS_TABSTOP END IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Open With" +CAPTION "Ãppna med" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 8, 12, 21, 20 - LTEXT "Choose the program you want to use to open this file:", -1, 44, 12, 211, 10 - LTEXT "File: ", 14001, 44, 25, 188, 20 - GROUPBOX "&Programs", -1, 7, 42, 249, 187 - CONTROL "Programs", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 - AUTOCHECKBOX "&Always use the selected program to open this kind of file", 14003, 20, 193, 225, 10 - PUSHBUTTON "&Browse...", 14004, 198, 207, 50, 14 + LTEXT "VÃ¤lj ett program att Ã¶ppna den hÃ¤r filen med:", -1, 44, 12, 211, 10 + LTEXT "Fil: ", 14001, 44, 25, 188, 20 + GROUPBOX "&Program", -1, 7, 42, 249, 187 + CONTROL "Program", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,57, 230, 130 + AUTOCHECKBOX "&AnvÃ¤nd alltid the valda programmet fÃ¶r att Ã¶ppna den hÃ¤r filtypen", 14003, 20, 193, 225, 10 + PUSHBUTTON "&BlÃ¤ddra...", 14004, 198, 207, 50, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 206, 236, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 206, 236, 50, 14 END IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "General" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Tasks", -1, 7, 10, 249, 45 +CAPTION "AllmÃ¤nt" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Aktiviteter", -1, 7, 10, 249, 45 CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20 - AUTORADIOBUTTON "Show common tasks in &folders", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Use ReactOS class&ic folders", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 120, 10 - GROUPBOX "Browse folders", -1, 7, 60, 249, 45, WS_TABSTOP + AUTORADIOBUTTON "Visa vanliga aktiviteter i &mappar", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 125, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "AnvÃ¤nd ReactOS klass&iska mappar", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 125, 10 + GROUPBOX "BlÃ¤ddra mappar", -1, 7, 60, 249, 45, WS_TABSTOP CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20 - AUTORADIOBUTTON "Open each folder in the sa&me window", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Open each folder in its own &window", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10 - GROUPBOX "Click items as follows", -1, 7, 110, 249, 60 + AUTORADIOBUTTON "Ãppna varje mapp i sa&mma fÃ¶nster", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Ãppna varje mapp i sitt eget &fÃ¶nster", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 82, 140, 10 + GROUPBOX "Klicka pÃ¥ objekt enligt fÃ¶ljande", -1, 7, 110, 249, 60 CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 - AUTORADIOBUTTON "&Single-click to open an item (point to select)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 170, 10 - AUTORADIOBUTTON "Underline icon titles only when I &point at them", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 170, 10 - AUTORADIOBUTTON "&Double-click to open an item (single-click to select)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 170, 10 - PUSHBUTTON "&Restore Defaults", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "&Enkelklicka fÃ¶r att Ã¶ppna (markera genom att peka)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Stryk under ikontitlar som min &webblÃ¤sare", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 200, 10 + AUTORADIOBUTTON "Stryk under ikontitlar endast nÃ¤r jag &pekar pÃ¥ dem", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 + AUTORADIOBUTTON "&Dubbelklicka fÃ¶r att Ã¶ppna (markera genom att enkelklicka)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 200, 10 + PUSHBUTTON "&ÃterstÃ¤ll standardvÃ¤rde", 14011, 160, 180, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "View" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Folder views", -1, 7, 10, 249, 60 +CAPTION "Visa" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Mappvyer", -1, 7, 10, 249, 60 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 - LTEXT "You can apply the view(such as Details or Tiles) that\nyou are using for this folder to all folders.", -1, 60, 20, 180, 20 - PUSHBUTTON "Apply to A&ll Folders", 14001, 60, 50, 80, 14, WS_TABSTOP - PUSHBUTTON "&Reset All Folders", 14002, 150, 50, 80, 14, WS_TABSTOP - LTEXT "Advanced settings:", -1, 7, 80, 100, 10 + LTEXT "Du kan anvÃ¤nda den nuvarande vyn (t.ex. detaljer)\nsom anvÃ¤nds i den hÃ¤r mappen fÃ¶r alla mappar.", -1, 60, 20, 180, 20 + PUSHBUTTON "AnvÃ¤nd fÃ¶r a&lla mappar", 14001, 60, 50, 80, 14, WS_TABSTOP + PUSHBUTTON "&ÃterstÃ¤ll alla mappar", 14002, 150, 50, 80, 14, WS_TABSTOP + LTEXT "Avancerade instÃ¤llningar:", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 - PUSHBUTTON "Restore &Defaults", 14004, 180, 210, 80, 14, WS_TABSTOP + PUSHBUTTON "ÃterstÃ¤ll &standardvÃ¤rde", 14004, 160, 220, 90, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "File Types" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Registered file &types:", -1, 7, 10, 70, 10 +CAPTION "Filtyper" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Registrerade fil&typer:", -1, 7, 10, 70, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&New", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&Delete", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details for '%s' extension", 14003, 7, 130, 249, 70 - LTEXT "Opens with:", -1, 12, 140, 40, 10 + PUSHBUTTON "&Ny", 14001, 120, 110, 50, 14, WS_TABSTOP + PUSHBUTTON "&Ta bort", 14002, 180, 110, 50, 14, WS_TABSTOP + GROUPBOX "Detaljer fÃ¶r filÃ¤ndelsen '%s'", 14003, 7, 130, 249, 70 + LTEXT "Ãppnas med:", -1, 12, 140, 50, 10 //ICON - LTEXT "Appname", 14005, 100, 140, 40, 10 - PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP + LTEXT "Programnamn", 14005, 100, 140, 46, 10 + PUSHBUTTON "&Ãndra...", 14006, 180, 140, 50, 14, WS_TABSTOP LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP + PUSHBUTTON "A&vancerat", 14008, 180, 175, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Confirm File Replace" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 20, 122, 60, 14 - PUSHBUTTON "Yes to &All", 12807, 85, 122, 60, 14 - PUSHBUTTON "&No", IDNO, 150, 122, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 215, 122, 60, 14 +CAPTION "BekrÃ¤fta ersÃ¤ttning av fil" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Ja", IDYES, 20, 122, 60, 14 + PUSHBUTTON "Ja till &alla", 12807, 85, 122, 60, 14 + PUSHBUTTON "&Nej", IDNO, 150, 122, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "This folder already contains a file named '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX - LTEXT "This folder already contains a read-only file named '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "This folder already contains a system file named '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX - LTEXT "Would you like to replace the existing file", -1, 44, 35, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12302, 79, 51, 198, 20, SS_NOPREFIX + LTEXT "Den hÃ¤r mappen innehÃ¥ller redan en fil med namnet '%2'.", 12291, 44, 10, 231, 22, SS_NOPREFIX + LTEXT "Den hÃ¤r mappen innehÃ¥ller redan en skrivskyddad fil med namnet '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Den hÃ¤r mappen innehÃ¥ller redan en systemfil med namnet '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX + LTEXT "Vill du ersÃ¤tta filen", -1, 44, 35, 228, 10, SS_NOPREFIX + LTEXT "(okÃ¤nt datum och storlek)", 12302, 79, 51, 198, 20, SS_NOPREFIX ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL - LTEXT "with this one?", -1, 44, 75, 228, 10, SS_NOPREFIX - LTEXT "(unknown date and size)", 12303, 79, 91, 198, 20, SS_NOPREFIX + LTEXT "Med fÃ¶ljande fil?", -1, 44, 75, 228, 10, SS_NOPREFIX + LTEXT "(okÃ¤nt datum och storlek)", 12303, 79, 91, 198, 20, SS_NOPREFIX ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Log Off ReactOS" +CAPTION "Logga ut frÃ¥n ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 - LTEXT "Are you sure you want to log off?", -1, 49, 15, 131, 8 - DEFPUSHBUTTON "&Log Off", IDOK, 49, 38, 43, 14 - PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 + LTEXT "Ãr du sÃ¤ker pÃ¥ att du vill logga ut?", -1, 49, 15, 131, 8 + DEFPUSHBUTTON "&Logga ut", IDOK, 49, 38, 43, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 99, 38, 43, 14 END IDD_DISCONNECT DIALOGEX 0, 0, 190, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Disconnect ReactOS" +CAPTION "Koppla ifrÃ¥n ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 49, 14346, 10, 10, 21, 20, SS_REALSIZECONTROL - LTEXT "Are you sure you want to disconnect?", -1, 49, 12, 137, 23 - DEFPUSHBUTTON "&Disconnect", IDOK, 57, 40, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 123, 40, 60, 14 + LTEXT "Ãr du sÃ¤ker pÃ¥ att du vill koppla ifrÃ¥n?", -1, 49, 12, 137, 23 + DEFPUSHBUTTON "&Koppla ifrÃ¥n", IDOK, 57, 40, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 123, 40, 60, 14 END IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "AutoPlay" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "&Select a content type, then choose an action for ReactOS to perform automatically when that type is used in this device:", 1000, 7, 7, 215, 20 +CAPTION "Automatisk uppspelning" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&VÃ¤lj en innehÃ¥llstyp, och sedan en Ã¥tgÃ¤rd som ReactOS ska utfÃ¶ra automatiskt nÃ¤r den typen anvÃ¤nds i den hÃ¤r enheten:", 1000, 7, 7, 215, 20 CONTROL "", 1001, "COMBOBOXEX32", WS_TABSTOP | 0x00000043, 7, 27, 212, 200 - GROUPBOX "Actions", -1, 7, 45, 212, 146 - AUTORADIOBUTTON "Select an action to &perform:", 1005, 14, 54, 202, 10, WS_GROUP + GROUPBOX "ÃtgÃ¤rder", -1, 7, 45, 212, 146 + AUTORADIOBUTTON "VÃ¤lj en Ã¥tgÃ¤rd att &utfÃ¶ra:", 1005, 14, 54, 202, 10, WS_GROUP CONTROL "LIST2", 1002, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 22, 66, 192, 107 - AUTORADIOBUTTON "Prompt me each time to &choose an action", 1006, 14, 177, 202, 10 - PUSHBUTTON "&Restore Defaults", 1008, 108, 197, 110, 14, WS_DISABLED + AUTORADIOBUTTON "FrÃ¥ga mig varje gÃ¥ng vilken &Ã¥tgÃ¤rd som ska utfÃ¶ras", 1006, 14, 177, 202, 10 + PUSHBUTTON "&ÃterstÃ¤ll standardvÃ¤rde", 1008, 108, 197, 110, 14, WS_DISABLED END IDD_MIXED_CONTENT1 DIALOGEX 0, 0, 227, 207 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "Blandat innehÃ¥ll" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "This disk or device contains more than one type of content.", 1001, 32, 7, 191, 20 - LTEXT "What do you want ReactOS to do?", 1002, 32, 31, 188, 8 + LTEXT "Den hÃ¤r disken eller enheten innehÃ¥ller mer Ã¤n en typ av innehÃ¥ll.", 1001, 32, 7, 191, 20 + LTEXT "Vad vill du gÃ¶ra?", 1002, 32, 31, 188, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 188, 139 DEFPUSHBUTTON "OK", IDOK, 96, 186, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 186, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 160, 186, 60, 14 END IDD_MIXED_CONTENT2 DIALOGEX 0, 0, 227, 206 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Mixed Content" +CAPTION "Blandat innehÃ¥ll" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you insert a disk or connect a device with this kind of file:", 1001, 30, 7, 193, 20 + LTEXT "Samma Ã¥tgÃ¤rd kan utfÃ¶ras varje gÃ¥ng en du sÃ¤tter in en skiva eller ansluter en enhet med den hÃ¤r filtypen:", 1001, 30, 7, 193, 20 ICON "", 1005, 32, 27, 11, 10, SS_REALSIZECONTROL EDITTEXT 1006, 49, 28, 177, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "What do you want ReactOS to do?", 1002, 32, 41, 190, 8 + LTEXT "Vad vill du gÃ¶ra?", 1002, 32, 41, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 55, 188, 112 - AUTOCHECKBOX "Always do the selected action.", 1004, 32, 171, 190, 10 + AUTOCHECKBOX "UtfÃ¶r alltid den valda Ã¥tgÃ¤rden", 1004, 32, 171, 190, 10 DEFPUSHBUTTON "OK", IDOK, 96, 185, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 160, 185, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 160, 185, 60, 14 END IDD_AUTOPLAY2 DIALOGEX 0, 0, 227, 181 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION -CAPTION "Autoplay" +CAPTION "Automatisk uppspelning" FONT 8, "MS Shell Dlg" BEGIN ICON "", 1000, 5, 7, 21, 20 - LTEXT "ReactOS can perform the same action each time you connect this device.", 1001, 32, 7, 190, 22 - LTEXT "&What do you want ReactOS to do?", 1002, 32, 31, 190, 8 + LTEXT "Samma Ã¥tgÃ¤rd kan utfÃ¶ras varje gÃ¥ng du ansluter den hÃ¤r enheten.", 1001, 32, 7, 190, 22 + LTEXT "&Vad vill du gÃ¶ra?", 1002, 32, 31, 190, 8 CONTROL "", 1003, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x0000C04D, 32, 43, 187, 96 - AUTOCHECKBOX "&Always perform the selected action", 1004, 32, 143, 190, 8 + AUTOCHECKBOX "&UtfÃ¶r alltid den valda Ã¥tgÃ¤rden", 1004, 32, 143, 190, 8 DEFPUSHBUTTON "OK", IDOK, 94, 160, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 159, 160, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 159, 160, 60, 14 END IDD_SHUTDOWN DIALOGEX 0, 0, 211, 103 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Shut Down ReactOS" +CAPTION "StÃ¤ng av ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON 8240, -1, 6, 6, 21, 20, SS_REALSIZECONTROL | WS_GROUP - LTEXT "What do you want the computer to do?", -1, 39, 7, 167, 10 + LTEXT "Vad vill du gÃ¶ra?", -1, 39, 7, 167, 10 COMBOBOX 8224, 39, 20, 165, 200, CBS_DROPDOWNLIST | WS_VSCROLL - LTEXT "Maintains your session, keeping the computer running on low power with data still in memory. The computer wakes up when you press a key or move the mouse.", 8225, 39, 40, 167, 37 + LTEXT "Bevarar din session och hÃ¥ller datorn igÃ¥ng pÃ¥ lÃ¥g energi med minnet intakt. Datorn vaknar nÃ¤r du trycker en tangent eller rÃ¶r musen.", 8225, 39, 40, 167, 37 DEFPUSHBUTTON "OK", 1, 7, 82, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", IDCANCEL, 75, 82, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 75, 82, 60, 14 PUSHBUTTON "&Help", IDHELP, 144, 82, 60, 14 END IDD_FORMAT_DRIVE DIALOGEX 50, 50, 184, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Format" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Start", IDOK, 53, 198, 60, 14 - PUSHBUTTON "&Close", IDCANCEL, 118, 198, 60, 14 - LTEXT "Ca&pacity:", -1, 7, 6, 169, 9 +CAPTION "Formatering" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Starta", IDOK, 53, 198, 60, 14 + PUSHBUTTON "S&tÃ¤ng", IDCANCEL, 118, 198, 60, 14 + LTEXT "Ka&pacitet:", -1, 7, 6, 169, 9 COMBOBOX 28673, 7, 17, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&File system", -1, 7, 35, 170, 9 + LTEXT "&Filsystem", -1, 7, 35, 170, 9 COMBOBOX 28677, 7, 46, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", 28678, "MSCTLS_PROGRESS32", 0, 7, 181, 170, 8 - LTEXT "&Allocation unit size", -1, 7, 64, 170, 9 + LTEXT "&Allokeringsstorlek", -1, 7, 64, 170, 9 COMBOBOX 28680, 7, 75, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Volume &label", -1, 7, 93, 170, 9 + LTEXT "Volum&etikett", -1, 7, 93, 170, 9 EDITTEXT 28679, 7, 103, 170, 13, ES_AUTOHSCROLL - GROUPBOX "Format &options", 4610, 7, 121, 170, 49 - AUTOCHECKBOX "&Quick Format", 28674, 16, 135, 155, 10 - AUTOCHECKBOX "&Enable Compression", 28675, 16, 152, 155, 10 + GROUPBOX "Formaterings&alternativ", 4610, 7, 121, 170, 49 + AUTOCHECKBOX "&Snabbformatering", 28674, 16, 135, 155, 10 + AUTOCHECKBOX "&AnvÃ¤nd komprimering", 28675, 16, 152, 155, 10 END IDD_CHECK_DISK DIALOGEX 50, 50, 194, 115 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Check Disk" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Start", IDOK, 63, 95, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 40 - PUSHBUTTON "Cancel", IDCANCEL, 128, 95, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 12, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 +CAPTION "Diskkontroll" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Starta", IDOK, 63, 95, 60, 14 + GROUPBOX "Alternativ fÃ¶r diskkontroll", -1, 7, 6, 179, 40 + PUSHBUTTON "Avbryt", IDCANCEL, 128, 95, 60, 14 + AUTOCHECKBOX "Laga filsystemsfel automatiskt", 14000, 12, 15, 155, 10 + AUTOCHECKBOX "&SÃ¶k och fÃ¶rsÃ¶k laga trasiga sektorer", 14001, 16, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 50, 179, 8 LTEXT "", 14003, 60, 80, 170, 10 END IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Icon" +CAPTION "Ãndra ikon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 + LTEXT "Filnamn:", -1, 7, 14, 208, 10 + PUSHBUTTON "BlÃ¤ddra...", IDC_BUTTON_PATH, 148, 24, 67, 14 EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 + LTEXT "Ikoner:", -1, 7, 47, 208, 10 LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 167, 181, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Caution" +CAPTION "Varning" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_SYSTEM_FILE, IDI_SHELL_SYSTEM_FILE, 5, 5, 21, 20 - LTEXT "This file could either be used by the operating system or by\n\ -another application. Modifying this file might damage your\n\ -system or make it less functional.\n\n\ -Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 - DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 - PUSHBUTTON "No", IDNO, 180, 55, 50, 14 + LTEXT "Den hÃ¤r filen kan anvÃ¤ndas av operativsystemet eller av\n\ +ett annat program. Om du Ã¤ndrar den hÃ¤r filen kan du skada ditt\n\ +system eller pÃ¥verka funktionaliteten.\n\n\ +Ãr du sÃ¤ker pÃ¥ att du vill Ã¶ppna den hÃ¤r filen?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "Ja", IDYES, 125, 55, 50, 14 + PUSHBUTTON "Nej", IDNO, 180, 55, 50, 14 END STRINGTABLE BEGIN /* columns in the shellview */ - IDS_SHV_COLUMN1 "File" - IDS_SHV_COLUMN2 "Size" - IDS_SHV_COLUMN3 "Type" - IDS_SHV_COLUMN4 "Modified" - IDS_SHV_COLUMN5 "Attributes" - IDS_SHV_COLUMN6 "Size" - IDS_SHV_COLUMN7 "Size available" - IDS_SHV_COLUMN8 "Name" - IDS_SHV_COLUMN9 "Comments" - IDS_SHV_COLUMN10 "Owner" - IDS_SHV_COLUMN11 "Group" - IDS_SHV_COLUMN12 "Filename" - IDS_SHV_COLUMN13 "Category" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" - IDS_SHV_COLUMN_FONTTYPE "Fonttype" - IDS_SHV_COLUMN_WORKGROUP "Workgroup" - IDS_SHV_NETWORKLOCATION "Network Location" - IDS_SHV_COLUMN_DOCUMENTS "Documents" + IDS_SHV_COLUMN1 "Fil" + IDS_SHV_COLUMN2 "Storlek" + IDS_SHV_COLUMN3 "Typ" + IDS_SHV_COLUMN4 "Ãndrad" + IDS_SHV_COLUMN5 "Attribut" + IDS_SHV_COLUMN6 "Storlek" + IDS_SHV_COLUMN7 "TillgÃ¤nglig storlek" + IDS_SHV_COLUMN8 "Namn" + IDS_SHV_COLUMN9 "Kommentar" + IDS_SHV_COLUMN10 "Ãgare" + IDS_SHV_COLUMN11 "Grupp" + IDS_SHV_COLUMN12 "Filnamn" + IDS_SHV_COLUMN13 "Kategori" + IDS_SHV_COLUMN_DELFROM "Ursprungsplats" + IDS_SHV_COLUMN_DELDATE "Borttagningsdatum" + IDS_SHV_COLUMN_FONTTYPE "Teckensnittstyp" + IDS_SHV_COLUMN_WORKGROUP "Arbetsgrupp" + IDS_SHV_NETWORKLOCATION "NÃ¤tverksplats" + IDS_SHV_COLUMN_DOCUMENTS "Dokument" IDS_SHV_COLUMN_STATUS "Status" - IDS_SHV_COLUMN_COMMENTS "Comments" - IDS_SHV_COLUMN_LOCATION "Location" - IDS_SHV_COLUMN_MODEL "Model" + IDS_SHV_COLUMN_COMMENTS "Kommentar" + IDS_SHV_COLUMN_LOCATION "Plats" + IDS_SHV_COLUMN_MODEL "Modell" /* special folders */ - IDS_DESKTOP "Desktop" - IDS_MYCOMPUTER "My Computer" - IDS_RECYCLEBIN_FOLDER_NAME "Recycle Bin" - IDS_CONTROLPANEL "Control Panel" - IDS_ADMINISTRATIVETOOLS "Administrative Tools" + IDS_DESKTOP "Skrivbord" + IDS_MYCOMPUTER "Den hÃ¤r datorn" + IDS_RECYCLEBIN_FOLDER_NAME "Papperskorgen" + IDS_CONTROLPANEL "Kontrollpanelen" + IDS_ADMINISTRATIVETOOLS "Administrativa verktyg" /* context menus */ - IDS_VIEW_LARGE "Lar&ge Icons" - IDS_VIEW_SMALL "S&mall Icons" - IDS_VIEW_LIST "&List" - IDS_VIEW_DETAILS "&Details" - IDS_SELECT "Select" - IDS_OPEN "Open" - IDS_CREATELINK "Create &Link" - IDS_COPY "&Copy" - IDS_DELETE "Delete" - IDS_PROPERTIES "Properties" - IDS_CUT "C&ut" - IDS_RESTORE "Restore" - IDS_FORMATDRIVE "Format..." - IDS_RENAME "Rename" - IDS_PASTE "Paste" - - IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'" - IDS_CREATEFOLDER_CAPTION "Unable to create folder" - IDS_DELETEITEM_CAPTION "Confirm File Deletion" - IDS_DELETEFOLDER_CAPTION "Confirm Folder Deletion" - IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?" - IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?" - IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" - IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Recycle Bin?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Recycle Bin?" - IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Recycle Bin?" - IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Recycle Bin. Do you want to delete it instead?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" - IDS_OVERWRITEFILE_CAPTION "Confirm File Overwrite" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\nIf the files in the destination folder have the same names as files in the\nselected folder they will be replaced. Do you still want to move or copy\nthe folder?" - - IDS_FILEOOP_COPYING "Copying..." - IDS_FILEOOP_MOVING "Moving..." - IDS_FILEOOP_DELETING "Deleting..." - IDS_FILEOOP_FROM_TO "From %1 to %2" - IDS_FILEOOP_FROM "From %1" + IDS_VIEW_LARGE "Sto&ra ikoner" + IDS_VIEW_SMALL "S&mÃ¥ ikoner" + IDS_VIEW_LIST "&Lista" + IDS_VIEW_DETAILS "&Detaljer" + IDS_SELECT "VÃ¤lj" + IDS_OPEN "Ãppna" + IDS_CREATELINK "Skapa &genvÃ¤g" + IDS_COPY "&Kopiera" + IDS_DELETE "Ta bort" + IDS_PROPERTIES "Egenskaper" + IDS_CUT "K&lipp ut" + IDS_RESTORE "ÃterstÃ¤ll" + IDS_FORMATDRIVE "Formatera..." + IDS_RENAME "Byt namn" + IDS_PASTE "Klistra in" + + IDS_CREATEFOLDER_DENIED "Kunde inte skapa mappen '%1'" + IDS_CREATEFOLDER_CAPTION "Kunde inte skapa mapp" + IDS_DELETEITEM_CAPTION "BekrÃ¤fta borttagning av fil" + IDS_DELETEFOLDER_CAPTION "BekrÃ¤fta borttagning av mapp" + IDS_DELETEITEM_TEXT "Ãr du sÃ¤ker pÃ¥ att du vill ta bort '%1'?" + IDS_DELETEMULTIPLE_TEXT "Ãr du sÃ¤ker pÃ¥ att du vill ta bort de hÃ¤r %1 objekten?" + IDS_DELETESELECTED_TEXT "Ãr du sÃ¤ker pÃ¥ att du vill ta bort de valda objekten?" + IDS_TRASHITEM_TEXT "Ãr du sÃ¤ker pÃ¥ att du vill flytta '%1' till papperskogen?" + IDS_TRASHFOLDER_TEXT "Ãr du sÃ¤ker pÃ¥ att du vill flytta '%1' och hela dess innehÃ¥ll till papperskorgen?" + IDS_TRASHMULTIPLE_TEXT "Ãr du sÃ¤ker pÃ¥ att du vill flytta de hÃ¤r %1 objekten till papperskorgen?" + IDS_CANTTRASH_TEXT "Objektet '%1' kan inte flyttas till papperskorgen. Vill du ta bort det istÃ¤llet?" + IDS_OVERWRITEFILE_TEXT "Den hÃ¤r mappen innehÃ¥ller redan en fil med namnet '%1'.\n\nVill du ersÃ¤tta den?" + IDS_OVERWRITEFILE_CAPTION "BekrÃ¤fta ersÃ¤ttning av fil" + IDS_OVERWRITEFOLDER_TEXT "Den hÃ¤r mappen innehÃ¥ller redan en mapp med namnet '%1'.\n\nOm filerna i mÃ¥lmappen har samma namn som filerna i den\nvalda mappen kommer de ersÃ¤ttas. Vill du fortsÃ¤tta flytta eller kopiera\nmappen?" + + IDS_FILEOOP_COPYING "Kopierar..." + IDS_FILEOOP_MOVING "Flyttar..." + IDS_FILEOOP_DELETING "Tar bort..." + IDS_FILEOOP_FROM_TO "FrÃ¥n %1 till %2" + IDS_FILEOOP_FROM "FrÃ¥n %1" IDS_FILEOOP_PREFLIGHT "Preflight" /* message box strings */ - IDS_RESTART_TITLE "Restart" - IDS_RESTART_PROMPT "Do you want to restart the system?" - IDS_SHUTDOWN_TITLE "Shutdown" - IDS_SHUTDOWN_PROMPT "Do you want to shutdown?" + IDS_RESTART_TITLE "Starta om" + IDS_RESTART_PROMPT "Vill du starta om systemet?" + IDS_SHUTDOWN_TITLE "StÃ¤ng av" + IDS_SHUTDOWN_PROMPT "Vill du stÃ¤nga av?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Kunde inte visa dialogen KÃ¶r fil (internt fel)" + IDS_RUNDLG_BROWSE_ERROR "Kunde inte visa dialogen BlÃ¤ddra (internt fel)" + IDS_RUNDLG_BROWSE_CAPTION "BlÃ¤ddra" + IDS_RUNDLG_BROWSE_FILTER "KÃ¶rbara filer (*.exe)\0*.exe\0Alla filer (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Start-meny\\Program" @@ -761,71 +761,71 @@ IDS_OPEN_WITH_RECOMMENDED "Rekommenderade program:" IDS_OPEN_WITH_OTHER "Andra program:" - IDS_SHELL_ABOUT_AUTHORS "&Authors" - IDS_SHELL_ABOUT_BACK "< &Back" - FCIDM_SHVIEW_NEW "New" - FCIDM_SHVIEW_NEWFOLDER "New &Folder" - FCIDM_SHVIEW_NEWLINK "New &Link" - IDS_FOLDER_OPTIONS "Folder Options" - IDS_RECYCLEBIN_LOCATION "Recycle Bin Location" - IDS_RECYCLEBIN_DISKSPACE "Space Available" - IDS_EMPTY_BITBUCKET "Empty Recycle Bin" - IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Icon Files (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" - - IDS_DIRECTORY "Folder" - IDS_BAT_FILE "ReactOS Batch File" - IDS_CMD_FILE "ReactOS Command Script" - IDS_COM_FILE "DOS Application" - IDS_CPL_FILE "Control Panel Item" - IDS_CUR_FILE "Cursor" - IDS_DLL_FILE "Application Extension" - IDS_DRV_FILE "Device Driver" - IDS_EXE_FILE "Application" - IDS_FON_FILE "Font file" - IDS_TTF_FILE "TrueType Font file" - IDS_OTF_FILE "OpenType Font file" - IDS_HLP_FILE "Help File" - IDS_ICO_FILE "Icon" - IDS_INI_FILE "Configuration Settings" - IDS_LNK_FILE "Shortcut" - IDS_PIF_FILE "NT VDM Program Information File" - IDS_SCR_FILE "Screen Saver" - IDS_SYS_FILE "System File" - IDS_VXD_FILE "Virtual Device Driver" - - IDS_OPEN_VERB "Open" - IDS_EXPLORE_VERB "Explore" - IDS_RUNAS_VERB "Run as..." - IDS_EDIT_VERB "Edit" - IDS_FIND_VERB "Find" - IDS_PRINT_VERB "Print" - - IDS_FILE_FOLDER "%u Files, %u Folders" - IDS_PRINTERS "Printers" - IDS_FONTS "Fonts" - IDS_INSTALLNEWFONT "Install New Font..." - - IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" - IDS_COPY_OF "Copy of" - - IDS_SHLEXEC_NOASSOC "There is no ReactOS program configured to open this type of file." - - IDS_FILE_DETAILS "Details for '%s' extension" - IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." - IDS_FILE_TYPES "File Types" - IDS_COLUMN_EXTENSION "Extensions" + IDS_SHELL_ABOUT_AUTHORS "&Upphovsinformation" + IDS_SHELL_ABOUT_BACK "< &BakÃ¥t" + FCIDM_SHVIEW_NEW "Ny(tt)" + FCIDM_SHVIEW_NEWFOLDER "Ny &mapp" + FCIDM_SHVIEW_NEWLINK "Ny &genvÃ¤g" + IDS_FOLDER_OPTIONS "Mappalternativ" + IDS_RECYCLEBIN_LOCATION "Papperskorgens plats" + IDS_RECYCLEBIN_DISKSPACE "TillgÃ¤ngligt utrymme" + IDS_EMPTY_BITBUCKET "TÃ¶m Papperskorgen" + IDS_PICK_ICON_TITLE "VÃ¤lj ikon" + IDS_PICK_ICON_FILTER "Ikoner (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Alla filer (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "KÃ¶rbara filer (*.exe)\0*.exe\0Alla filer (*.*)\0*.*\0" + + IDS_DIRECTORY "Mapp" + IDS_BAT_FILE "ReactOS Batch-fil" + IDS_CMD_FILE "ReactOS Kommandoradsskript" + IDS_COM_FILE "DOS-program" + IDS_CPL_FILE "Kontrollpanelsprogram" + IDS_CUR_FILE "Pekare" + IDS_DLL_FILE "DLL-fil" + IDS_DRV_FILE "Enhetsdrivrutin" + IDS_EXE_FILE "Program" + IDS_FON_FILE "Teckensnittsfil" + IDS_TTF_FILE "TrueType teckensnittsfil" + IDS_OTF_FILE "OpenType teckensnittsfil" + IDS_HLP_FILE "HjÃ¤lpfil" + IDS_ICO_FILE "Ikon" + IDS_INI_FILE "KonfigurationsinstÃ¤llningar" + IDS_LNK_FILE "GenvÃ¤g" + IDS_PIF_FILE "NT VDM-programinformationsfil" + IDS_SCR_FILE "SkÃ¤rmslÃ¤ckare" + IDS_SYS_FILE "Systemfil" + IDS_VXD_FILE "Virtuell enhetsdrivruting" + + IDS_OPEN_VERB "Ãppna" + IDS_EXPLORE_VERB "Utforska" + IDS_RUNAS_VERB "KÃ¶r som..." + IDS_EDIT_VERB "Redigera" + IDS_FIND_VERB "Hitta" + IDS_PRINT_VERB "Skriv ut" + + IDS_FILE_FOLDER "%u filer, %u mappar" + IDS_PRINTERS "Skrivare" + IDS_FONTS "Teckensnitt" + IDS_INSTALLNEWFONT "Installera nytt teckensnitt..." + + IDS_DEFAULT_CLUSTER_SIZE "Standard allokeringsstorlek" + IDS_COPY_OF "Kopia av" + + IDS_SHLEXEC_NOASSOC "Det finns inget ReactOS-program konfigurerat fÃ¶r att Ã¶ppna filer av den hÃ¤r typen." + + IDS_FILE_DETAILS "Detaljer fÃ¶r filÃ¤ndelsen '%s'" + IDS_FILE_DETAILSADV "Filer med filÃ¤ndelsen '%s' Ã¤r av typen '%s'. Klicka pÃ¥ Avancerat om du vill Ã¤ndra instÃ¤llningar som pÃ¥verkar alla '%s'-filer." + IDS_FILE_TYPES "Filtyper" + IDS_COLUMN_EXTENSION "FilÃ¤ndelse" /* As in 'INI File' or 'WAV File', fallback string for no-name extensions used in the _File type_ tab of the _Folder Options_ dialog */ - IDS_FILE_EXT_TYPE "%s File" - - IDS_BYTES_FORMAT "bytes" - IDS_UNKNOWN_APP "Unknown application" - IDS_EXE_DESCRIPTION "Description:" - - IDS_MENU_EMPTY "(Empty)" - IDS_OBJECTS "%d Objects" - IDS_OBJECTS_SELECTED "%d Objects Selected" -END + IDS_FILE_EXT_TYPE "%s-fil" + + IDS_BYTES_FORMAT "byte" + IDS_UNKNOWN_APP "OkÃ¤nt program" + IDS_EXE_DESCRIPTION "Beskrivning:" + + IDS_MENU_EMPTY "(tom)" + IDS_OBJECTS "%d objekt" + IDS_OBJECTS_SELECTED "%d markerade objekt" +END

7 years, 11 months

[jgardou] 72806: [KDGDB] - Fix a stupid typo, causing all threads to have the same backtrace.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 25 22:33:48 2016 New Revision: 72806 URL: http://svn.reactos.org/svn/reactos?rev=72806&view=rev Log: [KDGDB] - Fix a stupid typo, causing all threads to have the same backtrace. Modified: trunk/reactos/drivers/base/kdgdb/i386_sup.c Modified: trunk/reactos/drivers/base/kdgdb/i386_sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdgdb/i386_su… ============================================================================== --- trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdgdb/i386_sup.c [iso-8859-1] Sun Sep 25 22:33:48 2016 @@ -196,7 +196,6 @@ RegisterPtr = thread_to_reg(DbgThread, i, &size); if (RegisterPtr) { - RegisterPtr = ctx_to_reg(&CurrentContext, i, &size); RegisterStr[0] = hex_chars[RegisterPtr[0] >> 4]; RegisterStr[1] = hex_chars[RegisterPtr[0] & 0xF]; RegisterStr[2] = hex_chars[RegisterPtr[1] >> 4];

7 years, 11 months

[bfreisen] 72805: [ATL] atlpath.h: This looked like a bug.

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sun Sep 25 21:14:23 2016 New Revision: 72805 URL: http://svn.reactos.org/svn/reactos?rev=72805&view=rev Log: [ATL] atlpath.h: This looked like a bug. Modified: trunk/reactos/sdk/lib/atl/atlpath.h Modified: trunk/reactos/sdk/lib/atl/atlpath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlpath.h?rev=… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlpath.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlpath.h [iso-8859-1] Sun Sep 25 21:14:23 2016 @@ -181,10 +181,11 @@ BOOL CompactPathEx(UINT nMaxChars, DWORD dwFlags = 0) { - StringType result; - PXSTR str = result.GetBuffer(nMaxChars); - PathCompactPathExX(str, m_strPath, nMaxChars, dwFlags); - result.ReleaseBuffer(); + StringType strTemp; + PXSTR str = strTemp.GetBuffer(nMaxChars); + BOOL result = PathCompactPathExX(str, m_strPath, nMaxChars, dwFlags); + strTemp.ReleaseBuffer(); + m_strPath = strTemp; return result; }

7 years, 11 months

[bfreisen] 72804: [ATL] Add atlpath.h, which provides the CPathT class template and the classes CPath, CPathA and CPathW. CORE-12034

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Sun Sep 25 19:58:22 2016 New Revision: 72804 URL: http://svn.reactos.org/svn/reactos?rev=72804&view=rev Log: [ATL] Add atlpath.h, which provides the CPathT class template and the classes CPath, CPathA and CPathW. CORE-12034 Added: trunk/reactos/sdk/lib/atl/atlpath.h (with props) Added: trunk/reactos/sdk/lib/atl/atlpath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlpath.h?rev=… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlpath.h (added) +++ trunk/reactos/sdk/lib/atl/atlpath.h [iso-8859-1] Sun Sep 25 19:58:22 2016 @@ -0,0 +1,388 @@ +// PROJECT: ReactOS ATL CPathT +// LICENSE: Public Domain +// PURPOSE: Provides compatibility to Microsoft ATL +// PROGRAMMERS: Benedikt Freisen + +#ifndef __ATLPATH_H__ +#define __ATLPATH_H__ + +// WARNING: Untested code + +#pragma once + +#include <atlcore.h> +#include <atlstr.h> +#include <shlwapi.h> + +namespace ATL +{ + +template<typename StringType> +class CPathT +{ + // const + inline BOOL PathFileExistsX(LPCSTR pszPath) { return PathFileExistsA(pszPath); } + inline BOOL PathFileExistsX(LPCWSTR pszPath) { return PathFileExistsW(pszPath); } + inline int PathFindExtensionX(LPCSTR pszPath) { return PathFindExtensionA(pszPath); } + inline int PathFindExtensionX(LPCWSTR pszPath) { return PathFindExtensionW(pszPath); } + inline int PathFindFileNameX(LPCSTR pszPath) { return PathFindFileNameA(pszPath); } + inline int PathFindFileNameX(LPCWSTR pszPath) { return PathFindFileNameW(pszPath); } + inline int PathGetDriveNumberX(LPCSTR pszPath) { return PathGetDriveNumberA(pszPath); } + inline int PathGetDriveNumberX(LPCWSTR pszPath) { return PathGetDriveNumberW(pszPath); } + inline BOOL PathIsDirectoryX(LPCSTR pszPath) { return PathIsDirectoryA(pszPath); } + inline BOOL PathIsDirectoryX(LPCWSTR pszPath) { return PathIsDirectoryW(pszPath); } + inline BOOL PathIsFileSpecX(LPCSTR pszPath) { return PathIsFileSpecA(pszPath); } + inline BOOL PathIsFileSpecX(LPCWSTR pszPath) { return PathIsFileSpecW(pszPath); } + inline BOOL PathIsPrefixX(LPCSTR pszPath, LPCSTR pszPrefix) { return PathIsPrefixA(pszPath, pszPrefix); } + inline BOOL PathIsPrefixX(LPCWSTR pszPath, LPCWSTR pszPrefix) { return PathIsPrefixW(pszPath, pszPrefix); } + inline BOOL PathIsRelativeX(LPCSTR pszPath) { return PathIsRelativeA(pszPath); } + inline BOOL PathIsRelativeX(LPCWSTR pszPath) { return PathIsRelativeW(pszPath); } + inline BOOL PathIsRootX(LPCSTR pszPath) { return PathIsRootA(pszPath); } + inline BOOL PathIsRootX(LPCWSTR pszPath) { return PathIsRootW(pszPath); } + inline BOOL PathIsSameRootX(LPCSTR pszPath, LPCSTR pszOther) { return PathIsSameRootA(pszPath, pszOther); } + inline BOOL PathIsSameRootX(LPCWSTR pszPath, LPCWSTR pszOther) { return PathIsSameRootW(pszPath, pszOther); } + inline BOOL PathIsUNCX(LPCSTR pszPath) { return PathIsUNCA(pszPath); } + inline BOOL PathIsUNCX(LPCWSTR pszPath) { return PathIsUNCW(pszPath); } + inline BOOL PathIsUNCServerX(LPCSTR pszPath) { return PathIsUNCServerA(pszPath); } + inline BOOL PathIsUNCServerX(LPCWSTR pszPath) { return PathIsUNCServerW(pszPath); } + inline BOOL PathIsUNCServerShareX(LPCSTR pszPath) { return PathIsUNCServerShareA(pszPath); } + inline BOOL PathIsUNCServerShareX(LPCWSTR pszPath) { return PathIsUNCServerShareW(pszPath); } + inline BOOL PathMatchSpecX(LPCSTR pszPath, LPCSTR pszSpec) { return PathMatchSpecA(pszPath, pszSpec); } + inline BOOL PathMatchSpecX(LPCWSTR pszPath, LPCWSTR pszSpec) { return PathMatchSpecW(pszPath, pszSpec); } + inline int PathSkipRootX(LPCSTR pszPath) { return PathSkipRootA(pszPath); } + inline int PathSkipRootX(LPCWSTR pszPath) { return PathSkipRootW(pszPath); } + + // non-const + inline void PathAddBackslashX(LPSTR pszPath) { return PathAddBackslashA(pszPath); } + inline void PathAddBackslashX(LPWSTR pszPath) { return PathAddBackslashW(pszPath); } + inline BOOL PathAddExtensionX(LPSTR pszPath, LPCSTR pszExt) { return PathAddExtensionA(pszPath, pszExt); } + inline BOOL PathAddExtensionX(LPWSTR pszPath, LPCWSTR pszExt) { return PathAddExtensionW(pszPath, pszExt); } + inline BOOL PathAppendX(LPSTR pszPath, LPCSTR pszMore) { return PathAppendA(pszPath, pszMore); } + inline BOOL PathAppendX(LPWSTR pszPath, LPCWSTR pszMore) { return PathAppendW(pszPath, pszMore); } + inline void PathBuildRootX(LPSTR pszRoot, int iDrive) { return PathBuildRootA(pszRoot, iDrive); } + inline void PathBuildRootX(LPWSTR pszRoot, int iDrive) { return PathBuildRootW(pszRoot, iDrive); } + inline void PathCanonicalizeX(LPSTR pszDst, LPCSTR pszSrc) { return PathCanonicalizeA(pszDst, pszSrc); } + inline void PathCanonicalizeX(LPWSTR pszDst, LPCWSTR pszSrc) { return PathCanonicalizeW(pszDst, pszSrc); } + inline void PathCombineX(LPSTR pszPathOut, LPCSTR pszPathIn, LPCSTR pszMore) { return PathCombineA(pszPathOut, pszPathIn, pszMore); } + inline void PathCombineX(LPWSTR pszPathOut, LPCWSTR pszPathIn, LPCWSTR pszMore) { return PathCombineW(pszPathOut, pszPathIn, pszMore); } + inline CPathT<StringType> PathCommonPrefixX(LPCSTR pszFile1, LPCSTR pszFile2, LPSTR pszPath) { return PathCommonPrefixA(pszFile1, pszFile2, pszPath); } + inline CPathT<StringType> PathCommonPrefixX(LPCWSTR pszFile1, LPCWSTR pszFile2, LPWSTR pszPath) { return PathCommonPrefixW(pszFile1, pszFile2, pszPath); } + inline BOOL PathCompactPathX(HDC hDC, LPSTR pszPath, UINT dx) { return PathCompactPathA(hDC, pszPath, dx); } + inline BOOL PathCompactPathX(HDC hDC, LPWSTR pszPath, UINT dx) { return PathCompactPathW(hDC, pszPath, dx); } + inline BOOL PathCompactPathExX(LPSTR pszOut, LPCSTR pszSrc, UINT cchMax, DWORD dwFlags) { return PathCompactPathExA(pszOut, pszSrc, cchMax, dwFlags); } + inline BOOL PathCompactPathExX(LPWSTR pszOut, LPCWSTR pszSrc, UINT cchMax, DWORD dwFlags) { return PathCompactPathExW(pszOut, pszSrc, cchMax, dwFlags); } + inline BOOL PathMakePrettyX(LPSTR pszPath) { return PathMakePrettyA(pszPath); } + inline BOOL PathMakePrettyX(LPWSTR pszPath) { return PathMakePrettyW(pszPath); } + inline void PathQuoteSpacesX(LPSTR pszPath) { return PathQuoteSpacesA(pszPath); } + inline void PathQuoteSpacesX(LPWSTR pszPath) { return PathQuoteSpacesW(pszPath); } + inline BOOL PathRelativePathToX(LPSTR pszPath, LPCSTR pszFrom, DWORD dwAttrFrom, LPCSTR pszTo, DWORD dwAttrTo) { return PathRelativePathToA(pszPath, pszFrom, dwAttrFrom, pszTo, dwAttrTo); } + inline BOOL PathRelativePathToX(LPWSTR pszPath, LPCWSTR pszFrom, DWORD dwAttrFrom, LPCWSTR pszTo, DWORD dwAttrTo) { return PathRelativePathToW(pszPath, pszFrom, dwAttrFrom, pszTo, dwAttrTo); } + inline void PathRemoveArgsX(LPSTR pszPath) { return PathRemoveArgsA(pszPath); } + inline void PathRemoveArgsX(LPWSTR pszPath) { return PathRemoveArgsW(pszPath); } + inline void PathRemoveBackslashX(LPSTR pszPath) { return PathRemoveBackslashA(pszPath); } + inline void PathRemoveBackslashX(LPWSTR pszPath) { return PathRemoveBackslashW(pszPath); } + inline void PathRemoveBlanksX(LPSTR pszPath) { return PathRemoveBlanksA(pszPath); } + inline void PathRemoveBlanksX(LPWSTR pszPath) { return PathRemoveBlanksW(pszPath); } + inline void PathRemoveExtensionX(LPSTR pszPath) { return PathRemoveExtensionA(pszPath); } + inline void PathRemoveExtensionX(LPWSTR pszPath) { return PathRemoveExtensionW(pszPath); } + inline BOOL PathRemoveFileSpecX(LPSTR pszPath) { return PathRemoveFileSpecA(pszPath); } + inline BOOL PathRemoveFileSpecX(LPWSTR pszPath) { return PathRemoveFileSpecW(pszPath); } + inline BOOL PathRenameExtensionX(LPSTR pszPath, LPCSTR pszExt) { return PathRenameExtensionA(pszPath, pszExt); } + inline BOOL PathRenameExtensionX(LPWSTR pszPath, LPCWSTR pszExt) { return PathRenameExtensionW(pszPath, pszExt); } + inline void PathStripPathX(LPSTR pszPath) { return PathStripPathA(pszPath); } + inline void PathStripPathX(LPWSTR pszPath) { return PathStripPathW(pszPath); } + inline BOOL PathStripToRootX(LPSTR pszPath) { return PathStripToRootA(pszPath); } + inline BOOL PathStripToRootX(LPWSTR pszPath) { return PathStripToRootW(pszPath); } + inline void PathUnquoteSpacesX(LPSTR pszPath) { return PathUnquoteSpacesA(pszPath); } + inline void PathUnquoteSpacesX(LPWSTR pszPath) { return PathUnquoteSpacesW(pszPath); } + +public: + typedef typename StringType::PCXSTR PCXSTR; + typedef typename StringType::PXSTR PXSTR; + typedef typename StringType::XCHAR XCHAR; + + StringType m_strPath; + + CPathT(PCXSTR pszPath) + { + m_strPath = StringType(pszPath); + } + + CPathT(const CPathT<StringType>& path) + { + m_strPath = path.m_strPath; + } + + CPathT() throw() + { + // do nothing, m_strPath initializes itself + } + + void AddBackslash() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + PathAddBackslashX(str); + m_strPath.ReleaseBuffer(); + } + + BOOL AddExtension(PCXSTR pszExtension) + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + BOOL result = PathAddExtensionX(str, pszExtension); + m_strPath.ReleaseBuffer(); + return result; + } + + BOOL Append(PCXSTR pszMore) + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + BOOL result = PathAppendX(str, pszMore); + m_strPath.ReleaseBuffer(); + return result; + } + + void BuildRoot(int iDrive) + { + PXSTR str = m_strPath.GetBuffer(4); + PathBuildRootX(str, iDrive); + m_strPath.ReleaseBuffer(); + } + + void Canonicalize() + { + StringType strTemp; + PXSTR str = strTemp.GetBuffer(MAX_PATH); + PathCanonicalizeX(str, m_strPath); + strTemp.ReleaseBuffer(); + m_strPath = strTemp; + } + + void Combine(PCXSTR pszDir, PCXSTR pszFile) + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + PathCombineX(str, pszDir, pszFile); + m_strPath.ReleaseBuffer(); + } + + CPathT<StringType> CommonPrefix(PCXSTR pszOther) + { + StringType result; + result.SetString(m_strPath, PathCommonPrefixX(m_strPath, pszOther, NULL)); + return result; + } + + BOOL CompactPath(HDC hDC, UINT nWidth) + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + BOOL result = PathCompactPathX(hDC, str, nWidth); + m_strPath.ReleaseBuffer(); + return result; + } + + BOOL CompactPathEx(UINT nMaxChars, DWORD dwFlags = 0) + { + StringType result; + PXSTR str = result.GetBuffer(nMaxChars); + PathCompactPathExX(str, m_strPath, nMaxChars, dwFlags); + result.ReleaseBuffer(); + return result; + } + + BOOL FileExists() const + { + return PathFileExistsX(m_strPath); + } + + int FindExtension() const + { + return PathFindExtensionX(m_strPath); + } + + int FindFileName() const + { + return PathFindFileNameX(m_strPath); + } + + int GetDriveNumber() const + { + return PathGetDriveNumberX(m_strPath); + } + + StringType GetExtension() const + { + return StringType(PathFindExtensionX(m_strPath)); + } + + BOOL IsDirectory() const + { + return PathIsDirectoryX(m_strPath); + } + + BOOL IsFileSpec() const + { + return PathIsFileSpecX(m_strPath); + } + + BOOL IsPrefix(PCXSTR pszPrefix) const + { + return PathIsPrefixX(m_strPath); + } + + BOOL IsRelative() const + { + return PathIsRelativeX(m_strPath); + } + + BOOL IsRoot() const + { + return PathIsRootX(m_strPath); + } + + BOOL IsSameRoot(PCXSTR pszOther) const + { + return PathIsSameRootX(m_strPath, pszOther); + } + + BOOL IsUNC() const + { + return PathIsUNCX(m_strPath); + } + + BOOL IsUNCServer() const + { + return PathIsUNCServerX(m_strPath); + } + + BOOL IsUNCServerShare() const + { + return PathIsUNCServerShareX(m_strPath); + } + + BOOL MakePretty() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + BOOL result = PathMakePrettyX(str); + m_strPath.ReleaseBuffer(); + return result; + } + + BOOL MatchSpec(PCXSTR pszSpec) const + { + return PathMatchSpecX(m_strPath, pszSpec); + } + + void QuoteSpaces() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + PathQuoteSpacesX(str); + m_strPath.ReleaseBuffer(); + } + + BOOL RelativePathTo(PCXSTR pszFrom, DWORD dwAttrFrom, PCXSTR pszTo, DWORD dwAttrTo) + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + BOOL result = PathRelativePathToX(str, pszFrom, dwAttrFrom, pszTo, dwAttrTo); + m_strPath.ReleaseBuffer(); + return result; + } + + void RemoveArgs() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + PathRemoveArgsX(str); + m_strPath.ReleaseBuffer(); + } + + void RemoveBackslash() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + PathRemoveBackslashX(str); + m_strPath.ReleaseBuffer(); + } + + void RemoveBlanks() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + PathRemoveBlanksX(str); + m_strPath.ReleaseBuffer(); + } + + void RemoveExtension() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + PathRemoveExtensionX(str); + m_strPath.ReleaseBuffer(); + } + + BOOL RemoveFileSpec() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + BOOL result = PathRemoveFileSpecX(str); + m_strPath.ReleaseBuffer(); + return result; + } + + BOOL RenameExtension(PCXSTR pszExtension) + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + BOOL result = PathRenameExtensionX(str, pszExtension); + m_strPath.ReleaseBuffer(); + return result; + } + + int SkipRoot() const + { + return PathSkipRootX(m_strPath); + } + + void StripPath() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + PathStripPathX(str); + m_strPath.ReleaseBuffer(); + } + + BOOL StripToRoot() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + BOOL result = PathStripToRootX(str); + m_strPath.ReleaseBuffer(); + return result; + } + + void UnquoteSpaces() + { + PXSTR str = m_strPath.GetBuffer(MAX_PATH); + PathUnquoteSpacesX(str); + m_strPath.ReleaseBuffer(); + } + + operator const StringType&() const throw() + { + return m_strPath; + } + + operator PCXSTR() const throw() + { + return m_strPath; + } + + operator StringType&() throw() + { + return m_strPath; + } + + CPathT<StringType>& operator+=(PCXSTR pszMore) + { + m_strPath += pszMore; + } + +}; + +typedef CPathT<CString> CPath; +typedef CPathT<CStringA> CPathA; +typedef CPathT<CStringW> CPathW; + +} // namespace ATL + +#endif Propchange: trunk/reactos/sdk/lib/atl/atlpath.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/sdk/lib/atl/atlpath.h ------------------------------------------------------------------------------ svn:mime-type = text/plain

7 years, 11 months

[jgardou] 72803: [SDK/GCC_INTRIN] - Update __invlpg instrinsic for x86_64 compatibility

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 25 18:35:52 2016 New Revision: 72803 URL: http://svn.reactos.org/svn/reactos?rev=72803&view=rev Log: [SDK/GCC_INTRIN] - Update __invlpg instrinsic for x86_64 compatibility Modified: trunk/reactos/sdk/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/sdk/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/crt/mingw32/in… ============================================================================== --- trunk/reactos/sdk/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Sep 25 18:35:52 2016 @@ -1757,7 +1757,7 @@ __INTRIN_INLINE void __invlpg(void *Address) { - __asm__("invlpg %[Address]" : : [Address] "m" (*((unsigned char *)(Address))) : "memory"); + __asm__ __volatile__ ("invlpg (%[Address])" : : [Address] "b" (Address) : "memory"); }

7 years, 11 months

[dchapyshev] 72802: [RTL] Capture parameters with using SEH. Fixes new test for ntdll:RtlAllocateHeap

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Sep 25 17:05:52 2016 New Revision: 72802 URL: http://svn.reactos.org/svn/reactos?rev=72802&view=rev Log: [RTL] Capture parameters with using SEH. Fixes new test for ntdll:RtlAllocateHeap Modified: trunk/reactos/sdk/lib/rtl/heap.c Modified: trunk/reactos/sdk/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/heap.c?rev=728… ============================================================================== --- trunk/reactos/sdk/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/heap.c [iso-8859-1] Sun Sep 25 17:05:52 2016 @@ -1256,8 +1256,23 @@ Flags &= HEAP_CREATE_VALID_MASK; } - /* TODO: Capture parameters, once we decide to use SEH */ - if (!Parameters) Parameters = &SafeParams; + /* Capture parameters */ + if (Parameters) + { + _SEH2_TRY + { + /* If size of structure correct, then copy it */ + if (Parameters->Length == sizeof(RTL_HEAP_PARAMETERS)) + RtlCopyMemory(&SafeParams, Parameters, sizeof(RTL_HEAP_PARAMETERS)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return NULL); + } + _SEH2_END; + } + + Parameters = &SafeParams; /* Check global flags */ if (NtGlobalFlags & FLG_HEAP_DISABLE_COALESCING) @@ -1960,7 +1975,7 @@ /* Add settable user flags, if any */ EntryFlags |= (Flags & HEAP_SETTABLE_USER_FLAGS) >> 4; - Index = AllocationSize >> HEAP_ENTRY_SHIFT; + Index = AllocationSize >> HEAP_ENTRY_SHIFT; /* Acquire the lock if necessary */ if (!(Flags & HEAP_NO_SERIALIZE))

7 years, 11 months

[dchapyshev] 72801: [NTDLL_APITEST] Add test for invalid pointer

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Sep 25 16:57:55 2016 New Revision: 72801 URL: http://svn.reactos.org/svn/reactos?rev=72801&view=rev Log: [NTDLL_APITEST] Add test for invalid pointer Modified: trunk/rostests/apitests/ntdll/RtlAllocateHeap.c Modified: trunk/rostests/apitests/ntdll/RtlAllocateHeap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlAllocat… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlAllocateHeap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlAllocateHeap.c [iso-8859-1] Sun Sep 25 16:57:55 2016 @@ -62,4 +62,16 @@ RtlDestroyHeap(hHeap); ok(Aligned == TRUE, "Unaligned address returned\n"); + + _SEH2_TRY + { + hHeap = RtlCreateHeap(HEAP_CREATE_ALIGN_16, NULL, 0, 0, NULL, (PRTL_HEAP_PARAMETERS)0xdeadbeef); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + hHeap = INVALID_HANDLE_VALUE; + } + _SEH2_END; + + ok(hHeap == NULL, "Unexpected heap value: %p\n", hHeap); }

7 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2016