Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELL32_APITEST] Rename TestShellFolder, test_data and Tests. #179
by Amine Khaldi 25 Dec '17

25 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a66bbfa92c536453578ac… commit a66bbfa92c536453578ac20cdbbdd3d31044affc Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 25 13:33:33 2017 +0100 [SHELL32_APITEST] Rename TestShellFolder, test_data and Tests. #179 --- modules/rostests/apitests/shell32/CShellDesktop.cpp | 4 ++-- modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rostests/apitests/shell32/CShellDesktop.cpp b/modules/rostests/apitests/shell32/CShellDesktop.cpp index 7b1fd34adb..764e150881 100644 --- a/modules/rostests/apitests/shell32/CShellDesktop.cpp +++ b/modules/rostests/apitests/shell32/CShellDesktop.cpp @@ -145,7 +145,7 @@ TestCompareIDList(IShellFolder* psf) static VOID -TestShellFolder( +TestDesktopFolder( _In_ IShellFolder2 *psf2) { HRESULT hr; @@ -243,7 +243,7 @@ START_TEST(CShellDesktop) ok(hr == S_OK, "hr = %lx\n", hr); ok(psf == static_cast<IShellFolder *>(psf2), "Expected %p == %p\n", static_cast<PVOID>(psf), static_cast<PVOID>(psf2)); - TestShellFolder(psf2); + TestDesktopFolder(psf2); TestCompareIDList(psf); TestInitialize(psf); } diff --git a/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp b/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp index e6103385d0..b48054ee86 100644 --- a/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp +++ b/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp @@ -15,13 +15,13 @@ ULONG DbgPrint(PCH Format,...); HRESULT (STDAPICALLTYPE *pSHCreateFileExtractIconW)(LPCWSTR pszFile, DWORD dwFileAttributes, REFIID riid, void **ppv); -struct test_data +struct TestData { const WCHAR* Name; DWORD dwFlags; }; -static test_data Tests[] = +static TestData IconTests[] = { { L"xxx.zip", FILE_ATTRIBUTE_NORMAL }, { L"xxx.zip", FILE_ATTRIBUTE_DIRECTORY }, @@ -101,9 +101,9 @@ START_TEST(SHCreateFileExtractIconW) return; } - for (size_t n = 0; n < _countof(Tests); ++n) + for (size_t n = 0; n < _countof(IconTests); ++n) { - test_data& cur = Tests[n]; + TestData& cur = IconTests[n]; bool useMyIcon = false; if (cur.Name == NULL)

1 0

[reactos] 01/01: [SHELL32] Deduplicate MAX_PROPERTY_SHEET_PAGE and AddPropSheetPageCallback(). #179
by Amine Khaldi 25 Dec '17

25 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3797dba7a3bbb1eb4507… commit a3797dba7a3bbb1eb45076bb49ca9cc6d3adc332 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Mon Dec 25 13:22:03 2017 +0100 [SHELL32] Deduplicate MAX_PROPERTY_SHEET_PAGE and AddPropSheetPageCallback(). #179 --- dll/win32/shell32/CShellLink.cpp | 1 - dll/win32/shell32/dialogs/drive.cpp | 14 -------------- dll/win32/shell32/dialogs/folder_options.cpp | 2 -- dll/win32/shell32/dialogs/fprop.cpp | 16 ---------------- dll/win32/shell32/folders/CRecycleBin.cpp | 2 -- dll/win32/shell32/precomp.h | 18 ++++++++++++++++++ 6 files changed, 18 insertions(+), 35 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index 918c98e610..5b7b84dc41 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -144,7 +144,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); #define SHLINK_LOCAL 0 #define SHLINK_REMOTE 1 -#define MAX_PROPERTY_SHEET_PAGE 32 /* link file formats */ diff --git a/dll/win32/shell32/dialogs/drive.cpp b/dll/win32/shell32/dialogs/drive.cpp index 3afbe80d8c..679afe6a57 100644 --- a/dll/win32/shell32/dialogs/drive.cpp +++ b/dll/win32/shell32/dialogs/drive.cpp @@ -21,8 +21,6 @@ #include "precomp.h" -#define MAX_PROPERTY_SHEET_PAGE 32 - WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct @@ -109,18 +107,6 @@ GetDefaultClusterSize(LPWSTR szFs, PDWORD pClusterSize, PULARGE_INTEGER TotalNum return TRUE; } -static BOOL CALLBACK -AddPropSheetPageCallback(HPROPSHEETPAGE hPage, LPARAM lParam) -{ - PROPSHEETHEADER *ppsh = (PROPSHEETHEADER *)lParam; - if (ppsh->nPages < MAX_PROPERTY_SHEET_PAGE) - { - ppsh->phpage[ppsh->nPages++] = hPage; - return TRUE; - } - return FALSE; -} - typedef struct _DRIVE_PROP_PAGE { LPCSTR resname; diff --git a/dll/win32/shell32/dialogs/folder_options.cpp b/dll/win32/shell32/dialogs/folder_options.cpp index 45908ff521..3bb39977ad 100644 --- a/dll/win32/shell32/dialogs/folder_options.cpp +++ b/dll/win32/shell32/dialogs/folder_options.cpp @@ -23,8 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL (fprop); -#define MAX_PROPERTY_SHEET_PAGE (32) - /// Folder Options: /// CLASSKEY = HKEY_CLASSES_ROOT\CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF} /// DefaultIcon = %SystemRoot%\system32\SHELL32.dll,-210 diff --git a/dll/win32/shell32/dialogs/fprop.cpp b/dll/win32/shell32/dialogs/fprop.cpp index 989a9ce6c1..784d6ec505 100644 --- a/dll/win32/shell32/dialogs/fprop.cpp +++ b/dll/win32/shell32/dialogs/fprop.cpp @@ -22,26 +22,10 @@ #include "precomp.h" -#define MAX_PROPERTY_SHEET_PAGE 32 - WINE_DEFAULT_DEBUG_CHANNEL(shell); EXTERN_C HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_iface, IDataObject *pDataObj); -static BOOL CALLBACK -AddPropSheetPageCallback(HPROPSHEETPAGE hPage, LPARAM lParam) -{ - PROPSHEETHEADERW *pHeader = (PROPSHEETHEADERW *)lParam; - - if (pHeader->nPages < MAX_PROPERTY_SHEET_PAGE) - { - pHeader->phpage[pHeader->nPages++] = hPage; - return TRUE; - } - - return FALSE; -} - static UINT LoadPropSheetHandlers(LPCWSTR pwszPath, PROPSHEETHEADERW *pHeader, UINT cMaxPages, HPSXA *phpsxa, IDataObject *pDataObj) { diff --git a/dll/win32/shell32/folders/CRecycleBin.cpp b/dll/win32/shell32/folders/CRecycleBin.cpp index 51be9662cd..fb8c1d8dc1 100644 --- a/dll/win32/shell32/folders/CRecycleBin.cpp +++ b/dll/win32/shell32/folders/CRecycleBin.cpp @@ -24,8 +24,6 @@ #include <mmsystem.h> #include <ntquery.h> -#define MAX_PROPERTY_SHEET_PAGE 32 - WINE_DEFAULT_DEBUG_CHANNEL(CRecycleBin); typedef struct diff --git a/dll/win32/shell32/precomp.h b/dll/win32/shell32/precomp.h index dbea414a17..03166e37e6 100644 --- a/dll/win32/shell32/precomp.h +++ b/dll/win32/shell32/precomp.h @@ -93,4 +93,22 @@ extern const GUID CLSID_UnixDosFolder; extern const GUID SHELL32_AdvtShortcutProduct; extern const GUID SHELL32_AdvtShortcutComponent; +#define MAX_PROPERTY_SHEET_PAGE 32 + +extern inline +BOOL +CALLBACK +AddPropSheetPageCallback(HPROPSHEETPAGE hPage, LPARAM lParam) +{ + PROPSHEETHEADERW *pHeader = (PROPSHEETHEADERW *)lParam; + + if (pHeader->nPages < MAX_PROPERTY_SHEET_PAGE) + { + pHeader->phpage[pHeader->nPages++] = hPage; + return TRUE; + } + + return FALSE; +} + #endif /* _PRECOMP_H__ */

1 0

[reactos] 01/01: [INCLUDE/CRT] Add some throw() annotations. #179 #210
by Amine Khaldi 25 Dec '17

25 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d35ee7aded95355e5e54… commit 0d35ee7aded95355e5e54244eb267de8a182ce6c Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Dec 24 12:59:12 2017 +0100 [INCLUDE/CRT] Add some throw() annotations. #179 #210 --- sdk/include/crt/crtdbg.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/include/crt/crtdbg.h b/sdk/include/crt/crtdbg.h index 142de49827..1033f3a16c 100644 --- a/sdk/include/crt/crtdbg.h +++ b/sdk/include/crt/crtdbg.h @@ -212,9 +212,9 @@ extern "C" { void *__cdecl operator new[](size_t _Size); inline void *__cdecl operator new(size_t _Size,int,const char *,int) { return ::operator new(_Size); } inline void *__cdecl operator new[](size_t _Size,int,const char *,int) { return ::operator new[](_Size); } - void __cdecl operator delete[](void *); - inline void __cdecl operator delete(void *_P,int,const char *,int) { ::operator delete(_P); } - inline void __cdecl operator delete[](void *_P,int,const char *,int) { ::operator delete[](_P); } + void __cdecl operator delete[](void *) throw(); + inline void __cdecl operator delete(void *_P,int,const char *,int) throw() { ::operator delete(_P); } + inline void __cdecl operator delete[](void *_P,int,const char *,int) throw() { ::operator delete[](_P); } #endif #pragma pack(pop)

1 0

[reactos] 01/01: Improve swedish translations and add new translations to swedish.
by Markus Gothe 25 Dec '17

25 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2e699118fce8da24018c… commit e2e699118fce8da24018c6e3a1f339b1c138ebcc Author: Markus Gothe <nietzsche(a)lysator.liu.se> AuthorDate: Mon Dec 25 03:39:34 2017 +0100 Improve swedish translations and add new translations to swedish. --- base/applications/cacls/lang/sv-SE.rc | 4 +- base/applications/calc/lang/sv-SE.rc | 128 +++++----- base/applications/charmap/lang/sv-SE.rc | 10 +- base/applications/cmdutils/chcp/lang/sv-SE.rc | 6 +- base/applications/cmdutils/help/lang/sv-SE.rc | 32 +-- base/applications/cmdutils/reg/lang/sv-SE.rc | 2 +- base/applications/fontview/lang/sv-SE.rc | 8 +- base/applications/magnify/lang/sv-SE.rc | 2 +- base/applications/mplay32/lang/sv-SE.rc | 12 +- base/applications/mscutils/eventvwr/lang/sv-SE.rc | 2 +- base/applications/mspaint/lang/sv-SE.rc | 4 +- base/applications/network/ipconfig/lang/sv-SE.rc | 16 +- base/applications/shutdown/lang/sv-SE.rc | 6 +- base/shell/cmd/lang/no-NO.rc | 2 +- base/shell/cmd/lang/sv-SE.rc | 280 +++++++++++----------- base/system/userinit/lang/sv-SE.rc | 2 +- dll/cpl/inetcpl/lang/sv-SE.rc | 18 +- dll/cpl/timedate/lang/sv-SE.rc | 2 +- dll/shellext/acppage/lang/sv-SE.rc | 2 +- dll/win32/syssetup/lang/sv-SE.rc | 6 +- 20 files changed, 272 insertions(+), 272 deletions(-) diff --git a/base/applications/cacls/lang/sv-SE.rc b/base/applications/cacls/lang/sv-SE.rc index a09b438fd0..4337229412 100644 --- a/base/applications/cacls/lang/sv-SE.rc +++ b/base/applications/cacls/lang/sv-SE.rc @@ -47,7 +47,7 @@ Förkortningar:\n\ IDS_ABBR_WRITE "W" IDS_ABBR_CHANGE "C" IDS_ABBR_NONE "N" - IDS_ALLOW "" + IDS_ALLOW "(TILLÅT)" IDS_DENY "(NEKA)" IDS_SPECIAL_ACCESS "(speciell rättighet:)" IDS_GENERIC_READ "GENERISK_LÄSNING" @@ -73,7 +73,7 @@ Förkortningar:\n\ IDS_SYNCHRONIZE "SYNKRONISERA" IDS_WRITE_OWNER "SKRIVA_ÄGARE" IDS_WRITE_DAC "SKRIVA_DAC" - IDS_READ_CONTROL "LÄSE_KONTROLL" + IDS_READ_CONTROL "LÄSKONTROLL" IDS_DELETE "RADERA" IDS_STANDARD_RIGHTS_ALL "STANDARD_RÄTTIGHETER_ALLT" END diff --git a/base/applications/calc/lang/sv-SE.rc b/base/applications/calc/lang/sv-SE.rc index d5ba88aa1f..f9363a3843 100644 --- a/base/applications/calc/lang/sv-SE.rc +++ b/base/applications/calc/lang/sv-SE.rc @@ -299,7 +299,7 @@ END IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Statistik box" +CAPTION "Statistikbox" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_LIST_STAT, 4, 4, 156, 40, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP @@ -445,37 +445,37 @@ END STRINGTABLE BEGIN IDS_AREA_ACRES "Tunnland" - IDS_AREA_ACRES_BRAZIL "Tunnland (Brasil)" - IDS_AREA_ACRES_FRANCE "Tunnland (France)" - IDS_AREA_ACRES_SCOTS "Tunnland (Scots)" + IDS_AREA_ACRES_BRAZIL "Tunnland (Brasilien)" + IDS_AREA_ACRES_FRANCE "Tunnland (Frankrike)" + IDS_AREA_ACRES_SCOTS "Tunnland (Skottland)" IDS_AREA_ACRES_US "Tunnland (US)" IDS_AREA_ARES "Tunnland" IDS_AREA_CHOU "Chou" IDS_AREA_DANBO "Danbo" IDS_AREA_HECTARES "Hektar" IDS_AREA_JEONGBO "Jeongbo" - IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + IDS_AREA_MORGEN_HUNGARY "Morgen (Ungern)" IDS_AREA_MU "Mu" IDS_AREA_PING "Ping" IDS_AREA_PYEONG "Pyeong" IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_RAI "Rai" IDS_AREA_SE "Se" - IDS_AREA_SQUARE_CENTIMETERS "Kvadrat centimeter" - IDS_AREA_SQUARE_CHR "Kvadrat chr" - IDS_AREA_SQUARE_FATHOMS "Kvadrat fathoms" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Kvadrat fathoms (Hungary)" - IDS_AREA_SQUARE_FEET "Kvadrat fot" - IDS_AREA_SQUARE_INCHES "Kvadrat tum" - IDS_AREA_SQUARE_KILOMETERS "Kvadrat kilometer" + IDS_AREA_SQUARE_CENTIMETERS "Kvadratcentimeter" + IDS_AREA_SQUARE_CHR "Kvadrat-chr" + IDS_AREA_SQUARE_FATHOMS "Kvadrat-fathoms" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Kvadrat-fathoms (Ungern)" + IDS_AREA_SQUARE_FEET "Kvadratfot" + IDS_AREA_SQUARE_INCHES "Kvadrattum" + IDS_AREA_SQUARE_KILOMETERS "Kvadratkilometer" IDS_AREA_SQUARE_LAR "kvadrat lar" - IDS_AREA_SQUARE_METER "Kvadrat meter" - IDS_AREA_SQUARE_MILES "Kvadrat mil" - IDS_AREA_SQUARE_MILLIMETERS "Kvadrat millimeter" - IDS_AREA_SQUARE_SHAKU "Kvadrat shaku" - IDS_AREA_SQUARE_TSUEN "Kvadrat tsuen" - IDS_AREA_SQUARE_VA "Kvadrat va" - IDS_AREA_SQUARE_YARD "Kvadrat yard" + IDS_AREA_SQUARE_METER "Kvadratmeter" + IDS_AREA_SQUARE_MILES "Kvadratmil" + IDS_AREA_SQUARE_MILLIMETERS "Kvadratmillimeter" + IDS_AREA_SQUARE_SHAKU "Kvadrat-shaku" + IDS_AREA_SQUARE_TSUEN "Kvadrat-tsuen" + IDS_AREA_SQUARE_VA "Kvadrat-va" + IDS_AREA_SQUARE_YARD "Kvadratisk imperieyard" IDS_AREA_TAN "Tan" IDS_AREA_TSUBO "Tsubo" END @@ -492,37 +492,37 @@ END /* Currencies */ STRINGTABLE BEGIN - IDS_CURRENCY_AUSTRIAN_SCHILLING "Österriksk schilling" + IDS_CURRENCY_AUSTRIAN_SCHILLING "Österrikisk schilling" IDS_CURRENCY_BELGIAN_FRANC "Belgisk franc" - IDS_CURRENCY_CYPRIOT_POUND "Cypriotisk pound" + IDS_CURRENCY_CYPRIOT_POUND "Cypriotisk pund" IDS_CURRENCY_CZECH_KORUNA "Tjeckisk koruna" - IDS_CURRENCY_DEUTSCHE_MARK "Tysk Mark" - IDS_CURRENCY_DUTCH_GUILDER "Nederlänsk guilder" - IDS_CURRENCY_ESTONIAN_KROON "Estonian kroon" + IDS_CURRENCY_DEUTSCHE_MARK "Tysk mark" + IDS_CURRENCY_DUTCH_GUILDER "Nederlänsk gulden" + IDS_CURRENCY_ESTONIAN_KROON "Estländsk kroon" IDS_CURRENCY_EURO "Euro" - IDS_CURRENCY_FINNISH_MARKKA "Finisk mark" + IDS_CURRENCY_FINNISH_MARKKA "Finsk mark" IDS_CURRENCY_FRENCH_FRANC "Fransk franc" - IDS_CURRENCY_GREEK_DRACHMA "Gresk Drachma" - IDS_CURRENCY_IRISH_POUND "Irisk pound" - IDS_CURRENCY_ITALIAN_LIRA "Italiask lire" - IDS_CURRENCY_LATVIAN_LATS "Latvian lats" - IDS_CURRENCY_LITHUANIAN_LITAS "Lithuanian litas" + IDS_CURRENCY_GREEK_DRACHMA "Grekisk Drachma" + IDS_CURRENCY_IRISH_POUND "Irländskt pund" + IDS_CURRENCY_ITALIAN_LIRA "Italiensk lire" + IDS_CURRENCY_LATVIAN_LATS "Lettisk lats" + IDS_CURRENCY_LITHUANIAN_LITAS "Litauenisk litas" IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" IDS_CURRENCY_MALTESE_LIRA "Maltesisk lire" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portogisisk escudo" - IDS_CURRENCY_SLOVAK_KORUNA "Slovansk koruna" - IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenansk tolar" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugisisk escudo" + IDS_CURRENCY_SLOVAK_KORUNA "Slovakisk koruna" + IDS_CURRENCY_SLOVENIAN_TOLAR "Slovensk tolar" IDS_CURRENCY_SPANISH_PESETA "Spansk peseta" END /* Energies */ STRINGTABLE BEGIN - IDS_ENERGY_15_C_CALORIES "15 °C calories" - IDS_ENERGY_BTUS "Britisk värme-enhet" + IDS_ENERGY_15_C_CALORIES "15 °C kalorier" + IDS_ENERGY_BTUS "Brittisk värme-enhet" IDS_ENERGY_ERGS "Ergs" - IDS_ENERGY_EVS "Electron-Volt" - IDS_ENERGY_FOOT_POUNDS "Fot-Pound" + IDS_ENERGY_EVS "Elektron-Volt" + IDS_ENERGY_FOOT_POUNDS "Fot-Pund" IDS_ENERGY_IT_CALORIES "International Table calories" IDS_ENERGY_IT_KILOCALORIES "International Table kilocalories" IDS_ENERGY_JOULES "Joule" @@ -536,7 +536,7 @@ END STRINGTABLE BEGIN IDS_LENGTH_ANGSTROMS "Ångström" - IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomical units" + IDS_LENGTH_ASTRONOMICAL_UNITS "Astronomiska enheter" IDS_LENGTH_BARLEYCORNS "Barleycorns" IDS_LENGTH_CENTIMETERS "Centimeter" IDS_LENGTH_CHAINS_UK "Chains (UK)" @@ -545,7 +545,7 @@ BEGIN IDS_LENGTH_CHR "Chr" IDS_LENGTH_CUN "Cun" IDS_LENGTH_FATHOMS "Fathoms" - IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Ungarn)" + IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Ungern)" IDS_LENGTH_FEET "Fot" IDS_LENGTH_FURLONGS "Furlongs" IDS_LENGTH_GAN "Gan" @@ -559,13 +559,13 @@ BEGIN IDS_LENGTH_KEUB "Keub" IDS_LENGTH_KILOMETERS "Kilometer" IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LIGHT_YEARS "Ljus år" + IDS_LENGTH_LIGHT_YEARS "Ljusår" IDS_LENGTH_LINKS_UK "Linker (UK)" IDS_LENGTH_METERS "Meter" IDS_LENGTH_MICRONS "Micron" IDS_LENGTH_MILES "Mil" IDS_LENGTH_MILLIMETERS "Millimeter" - IDS_LENGTH_NAUTICAL_MILES "Nautisk mil" + IDS_LENGTH_NAUTICAL_MILES "Nautiska mil" IDS_LENGTH_NIEU "Nieu" IDS_LENGTH_PARSECS "Parsecs" IDS_LENGTH_PICAS "Picas" @@ -587,9 +587,9 @@ END /* Powers */ STRINGTABLE BEGIN - IDS_POWER_BTUS_PER_MINUTE "Britisk värme-enhet per minut" + IDS_POWER_BTUS_PER_MINUTE "Brittisk värme-enhet per minut" IDS_POWER_FPS_PER_MINUTE "Fot-pund per minut" - IDS_POWER_HORSEPOWER "Hästekrafter" + IDS_POWER_HORSEPOWER "Hästkrafter" IDS_POWER_KILOWATTS "Kilowatt" IDS_POWER_MEGAWATTS "Megawatt" IDS_POWER_WATTS "Watt" @@ -600,11 +600,11 @@ STRINGTABLE BEGIN IDS_PRESSURE_ATMOSPHERES "Atmosfär" IDS_PRESSURE_BARS "Bar" - IDS_PRESSURE_HECTOPASCALS "Hectopascal" + IDS_PRESSURE_HECTOPASCALS "Hektopascal" IDS_PRESSURE_KILOPASCALS "Kilopascal" - IDS_PRESSURE_MM_OF_MERCURY "Millimeters kvicksilver" + IDS_PRESSURE_MM_OF_MERCURY "Millimeter kvicksilver" IDS_PRESSURE_PASCALS "Pascal" - IDS_PRESSURE_PSI "Pond per kvadrattum" + IDS_PRESSURE_PSI "Pund per kvadrattum" END /* Temperatures */ @@ -619,26 +619,26 @@ END /* Time */ STRINGTABLE BEGIN - IDS_TIME_DAYS "Days" - IDS_TIME_HOURS "Hours" - IDS_TIME_NANOSECONDS "Nanoseconds" - IDS_TIME_MICROSECONDS "Microseconds" - IDS_TIME_MILLISECONDS "Milliseconds" - IDS_TIME_MINUTES "Minutes" - IDS_TIME_SECONDS "Seconds" - IDS_TIME_WEEKS "Weeks" - IDS_TIME_YEARS "Years" + IDS_TIME_DAYS "Dagar" + IDS_TIME_HOURS "Timmar" + IDS_TIME_NANOSECONDS "Nanosekunder" + IDS_TIME_MICROSECONDS "Microsekunder" + IDS_TIME_MILLISECONDS "Millisekunder" + IDS_TIME_MINUTES "Minuter" + IDS_TIME_SECONDS "Sekunder" + IDS_TIME_WEEKS "Veckor" + IDS_TIME_YEARS "År" END /* Velocities */ STRINGTABLE BEGIN - IDS_VELOCITY_CMS_SECOND "Centimeter/time" + IDS_VELOCITY_CMS_SECOND "Centimeter/timme" IDS_VELOCITY_FEET_HOUR "Fot/timme" IDS_VELOCITY_FEET_SECOND "Fot/sekund" IDS_VELOCITY_KILOMETERS_HOUR "Kilometer/timme" IDS_VELOCITY_KNOTS "Knop" - IDS_VELOCITY_MACH "Mach" + IDS_VELOCITY_MACH "Machtal" IDS_VELOCITY_METERS_SECOND "Meter/sekund" IDS_VELOCITY_MILES_HOUR "Mil/timme" END @@ -646,8 +646,8 @@ END /* Volumes */ STRINGTABLE BEGIN - IDS_VOLUME_BARRELS_UK "Barrels (UK)" - IDS_VOLUME_BARRELS_OIL "Barrels oil" + IDS_VOLUME_BARRELS_UK "Fat (UK)" + IDS_VOLUME_BARRELS_OIL "Fat (olja)" IDS_VOLUME_BUN "Bun" IDS_VOLUME_BUSHELS_UK "Bushels (UK)" IDS_VOLUME_BUSHELS_US "Bushels (US)" @@ -655,7 +655,7 @@ BEGIN IDS_VOLUME_CUBIC_FEET "Kubikfot" IDS_VOLUME_CUBIC_INCHES "Kubiktumm" IDS_VOLUME_CUBIC_METERS "Kubikmeter" - IDS_VOLUME_CUBIC_YARDS "Kubikyards" + IDS_VOLUME_CUBIC_YARDS "Kubikyard" IDS_VOLUME_DOE "Doe" IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" @@ -686,7 +686,7 @@ END STRINGTABLE BEGIN IDS_WEIGHT_BAHT "Baht" - IDS_WEIGHT_CARATS "Carats" + IDS_WEIGHT_CARATS "Karat" IDS_WEIGHT_CHUNG "Chung" IDS_WEIGHT_DON "Don" IDS_WEIGHT_GEUN "Geun" @@ -694,17 +694,17 @@ BEGIN IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_HARB "Harb" IDS_WEIGHT_JIN_CHINA "Jin (Kina)" - IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwaner)" + IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" IDS_WEIGHT_KAN "Kan" IDS_WEIGHT_KILOGRAMS "Kilogram" IDS_WEIGHT_KIN "Kin" IDS_WEIGHT_LIANG_CHINA "Liang (Kina)" - IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwaner)" + IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" IDS_WEIGHT_MONME "Monme" IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Ounces, avoirdupois" IDS_WEIGHT_OUNCES_TROY "Ounces, troy" IDS_WEIGHT_POUNDS "Pund" - IDS_WEIGHT_QUINTAL_METRIC "Quintal (metric)" + IDS_WEIGHT_QUINTAL_METRIC "Quintal (metrisk)" IDS_WEIGHT_SALOUNG "Saloung" IDS_WEIGHT_STONES "Sten" IDS_WEIGHT_TAMLUNG "Tamlung" diff --git a/base/applications/charmap/lang/sv-SE.rc b/base/applications/charmap/lang/sv-SE.rc index 091609ccd8..6ea641fef0 100644 --- a/base/applications/charmap/lang/sv-SE.rc +++ b/base/applications/charmap/lang/sv-SE.rc @@ -22,7 +22,7 @@ BEGIN WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Välj", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Kopiera", IDC_COPY, 242, 186, 44, 13, WS_DISABLED - CONTROL "Avansert visning",IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | + CONTROL "Avancerad visning",IDC_CHECK_ADVANCED, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 END @@ -30,13 +30,13 @@ IDD_ADVANCED DIALOGEX 0, 0, 292, 64 STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Charset:", IDC_STATIC, 8, 8, 48, 8 + LTEXT "Teckenuppsättning:", IDC_STATIC, 8, 8, 48, 8 COMBOBOX IDC_COMBO_CHARSET, 72, 4, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Group by:", IDC_STATIC, 8, 28, 50, 8 + LTEXT "Gruppera efter:", IDC_STATIC, 8, 28, 50, 8 COMBOBOX IDC_COMBO_GROUPBY, 72, 24, 116, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Search", IDC_BUTTON_SEARCH, 200, 44, 50, 14 + PUSHBUTTON "Sök", IDC_BUTTON_SEARCH, 200, 44, 50, 14 EDITTEXT IDC_EDIT_SEARCH, 72, 44, 116, 14, ES_AUTOHSCROLL - LTEXT "Search for:", IDC_STATIC, 8, 48, 42, 8 + LTEXT "Sök efter:", IDC_STATIC, 8, 48, 42, 8 LTEXT "Unicode:", IDC_STATIC, 200, 8, 30, 8 EDITTEXT IDC_EDIT_UNICODE, 236, 4, 28, 12, ES_AUTOHSCROLL END diff --git a/base/applications/cmdutils/chcp/lang/sv-SE.rc b/base/applications/cmdutils/chcp/lang/sv-SE.rc index bef2f067c5..00b0c6e1f7 100644 --- a/base/applications/cmdutils/chcp/lang/sv-SE.rc +++ b/base/applications/cmdutils/chcp/lang/sv-SE.rc @@ -6,7 +6,7 @@ BEGIN CHCP [nnn]\n\n\ nnn Anger nummer på teckentabell.\n\n\ Skriv CHCP utan parametrar för att visa aktiv teckentabellnummer.\n" - STRING_CHCP_ERROR1 "Aktiv tegntabell: %u\n" - STRING_CHCP_ERROR4 "Ugyldig tegntabell\n" - STRING_ERROR_INVALID_PARAM_FORMAT "Ugyldig parameter format - %s\n" + STRING_CHCP_ERROR1 "Aktiv teckentabell: %u\n" + STRING_CHCP_ERROR4 "Ogiltif teckentabell\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Ogiltigt parameterformat - %s\n" END diff --git a/base/applications/cmdutils/help/lang/sv-SE.rc b/base/applications/cmdutils/help/lang/sv-SE.rc index d6599c6175..56bb23f1a3 100644 --- a/base/applications/cmdutils/help/lang/sv-SE.rc +++ b/base/applications/cmdutils/help/lang/sv-SE.rc @@ -10,19 +10,19 @@ BEGIN IDS_USAGE "Provides Help information for ReactOS commands.\n\n\ HELP [command]\n\n\ command - Display help information for this command.\n" - IDS_HELP1 "Liste av alle tilgjengelige kommandoer (+ beskrivelse)\n\n\ + IDS_HELP1 "Lista av alla tillgängeliga kommandon (+ beskrivning)\n\n\ help kommando\n\ kommando /? For mer informasjon om en bestemt kommando\n\n\ ? Lister alle tilgjengelige kommando uten beskrivelse).\n\ -ALIAS Sett, fjern eller vis alias.\n\ -ATTRIB Viser eller ändra fil attributter.\n\ -BEEP Piper i høyttaleren.\n\ -CALL Starte et satsvis program fra et annet.\n\ -CD Vis namnet på eller endrer aktuell mapp.\n\ -CHCP Viser eller anger nummer på aktiv tegntabell.\n\ -CHOICE Venter til bruken väljer en av et sett av val.\n\ -CLS Tømmer skjermen.\n\ -CMD Start en ny forekomst av ReactOS kommandotolk.\n\ +ALIAS Sätt, ta bort eller visa alias.\n\ +ATTRIB Viser eller ändra filattribut.\n\ +BEEP Piper i högttalaren.\n\ +CALL Starta en batch-fil från ett annat.\n\ +CD Visa namnet på eller ändrar aktuell mapp.\n\ +CHCP Visar eller anger nummer på aktiv teckentabell.\n\ +CHOICE Väntar tills användaren väljer en av antal specifierade val.\n\ +CLS Tömmer skämen.\n\ +CMD Startar en ny instans av ReactOS kommandotolk.\n\ COLOR Anger standard forgrunn- och bakgrunnsfargr for konsollen.\n\ COPY Kopierer en eller flere filer til en annen plassering.\n\ DATE Viser eller anger datoen.\n\ @@ -53,17 +53,17 @@ RD Fjerner en mapp.\n\ REM Anger kommentarer i satsvise filer.\n\ REN Gir nytt namn til en eller flere filer.\n\ RENAME Gir nytt namn til en eller flere filer.\n\ -RMDIR Fjerner en mapp.\n\ -SCREEN Flytter markør.\n\ -SET Vis, sett, eller fjern ReactOS miljøvariabel.\n\ +RMDIR Tar bort en mapp.\n\ +SCREEN Flyttar markör.\n\ +SET Visa, sätt, eller ta bort ReactOS miljövariabel.\n\ SHIFT Shift plass for erstattelige parameter i satsvise filer.\n" IDS_HELP2 "START Start et separat vindu til att kjøre et spesifisert program eller kommando.\n\ Utfører kommando.\n\ -TIME Vis eller sett system tid.\n\ +TIME Visa eller sätt systemtid.\n\ TIMER Håndtere stoppeklokker (maks 10 stk).\n\ TITLE Sett vindustittel for CMD.EXE sesjon.\n\ -TYPE Vis innholdet i en text fil.\n\ -VER Viser ReactOS version.\n\ +TYPE Visa innhållet i en textfil.\n\ +VER Visar ReactOS version.\n\ VERIFY Forteller ReactOS om att bekrefte om dine filer är skrevet\n\ riktig til disk.\n\ VOL Vis et volums namn och serienummer.\n" diff --git a/base/applications/cmdutils/reg/lang/sv-SE.rc b/base/applications/cmdutils/reg/lang/sv-SE.rc index 24443ae299..774bf95814 100644 --- a/base/applications/cmdutils/reg/lang/sv-SE.rc +++ b/base/applications/cmdutils/reg/lang/sv-SE.rc @@ -20,7 +20,7 @@ STRINGTABLE STRING_YES, "Y" STRING_NO, "N" STRING_CANCELLED, "The registry operation was cancelled\n" - STRING_DEFAULT_VALUE, "(Default)" + STRING_DEFAULT_VALUE, "(Standard)" STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?" STRING_DELETE_SUBKEY, "Are you sure you want to delete the registry key '%1'?" diff --git a/base/applications/fontview/lang/sv-SE.rc b/base/applications/fontview/lang/sv-SE.rc index 475caf4999..07eefcf19b 100644 --- a/base/applications/fontview/lang/sv-SE.rc +++ b/base/applications/fontview/lang/sv-SE.rc @@ -9,10 +9,10 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_INSTALL "&Install" + IDS_INSTALL "&Installera" IDS_PRINT "&Skriv ut" IDS_STRING "Jackdaws love my big sphinx of quartz. 1234567890" - IDS_OPEN "Open Font..." + IDS_OPEN "Öppna font..." IDS_ERROR "Fel" IDS_ERROR_NOMEM "Det er inte nog minne för att slutföre operationen." IDS_ERROR_NOFONT "Filen %1 är inte en giltig typsnittsfil." @@ -24,6 +24,6 @@ TrueType Font Collection (*.ttc)\0*.ttc\0\ OpenType Font (*.otf)\0*.otf\0\ OpenType Font Collection (*.otc)\0*.otc\0\ All Files (*.*)\0*.*\0" - IDS_PREVIOUS "< P&revious" - IDS_NEXT "&Next >" + IDS_PREVIOUS "< F&öregående" + IDS_NEXT "&Nästa >" END diff --git a/base/applications/magnify/lang/sv-SE.rc b/base/applications/magnify/lang/sv-SE.rc index 25469b8c65..e9af6a1ed1 100644 --- a/base/applications/magnify/lang/sv-SE.rc +++ b/base/applications/magnify/lang/sv-SE.rc @@ -38,7 +38,7 @@ BEGIN LTEXT "Forstorings &nivå:", IDC_STATIC, 6, 8, 68, 8 COMBOBOX IDC_ZOOM, 72, 6, 63, 66, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP GROUPBOX "Spårning", IDC_STATIC, 7, 25, 139, 59 - GROUPBOX "Precentation", IDC_STATIC, 7, 87, 139, 57 + GROUPBOX "Presentation", IDC_STATIC, 7, 87, 139, 57 CONTROL "Följ &muspekaren", IDC_FOLLOWMOUSECHECK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 18, 42, 114, 10 CONTROL "Följ tangentmar&kören", IDC_FOLLOWKEYBOARDCHECK, "Button", diff --git a/base/applications/mplay32/lang/sv-SE.rc b/base/applications/mplay32/lang/sv-SE.rc index 3a61372870..331eb92ac0 100644 --- a/base/applications/mplay32/lang/sv-SE.rc +++ b/base/applications/mplay32/lang/sv-SE.rc @@ -51,13 +51,13 @@ END STRINGTABLE BEGIN - IDS_MODE_UNKNOWN "Unknown" - IDS_MODE_OPEN "Opened" - IDS_MODE_STOP "Stopped" - IDS_MODE_PLAY "Playing" - IDS_MODE_PAUSE "Paused" + IDS_MODE_UNKNOWN "Okänt" + IDS_MODE_OPEN "Öppnad" + IDS_MODE_STOP "Stoppad" + IDS_MODE_PLAY "Spelar" + IDS_MODE_PAUSE "Pausead" IDS_MODE_RECORD "Recording" - IDS_MODE_SEEK "Seeking" + IDS_MODE_SEEK "Söker" IDS_MODE_NOT_READY "Not ready" IDS_ALL_TYPES_FILTER "Alla kompaktibla filer" IDS_TOOLTIP_PLAY "Spela upp" diff --git a/base/applications/mscutils/eventvwr/lang/sv-SE.rc b/base/applications/mscutils/eventvwr/lang/sv-SE.rc index 170cd23c27..b06daf20fb 100644 --- a/base/applications/mscutils/eventvwr/lang/sv-SE.rc +++ b/base/applications/mscutils/eventvwr/lang/sv-SE.rc @@ -21,7 +21,7 @@ BEGIN MENUITEM "&Newest first", IDM_LIST_NEWEST MENUITEM "&Oldest first", IDM_LIST_OLDEST MENUITEM SEPARATOR - MENUITEM "&Details...\tEnter", IDM_EVENT_DETAILS + MENUITEM "&Detaljer...\tEnter", IDM_EVENT_DETAILS MENUITEM SEPARATOR MENUITEM "&Uppdatera\tF5", IDM_REFRESH END diff --git a/base/applications/mspaint/lang/sv-SE.rc b/base/applications/mspaint/lang/sv-SE.rc index e666445e08..de83110c08 100644 --- a/base/applications/mspaint/lang/sv-SE.rc +++ b/base/applications/mspaint/lang/sv-SE.rc @@ -13,7 +13,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Page View", IDM_FILEPAGEVIEW MENUITEM "Page Setup...", IDM_FILEPAGESETUP - MENUITEM "Print...\tCtrl+P", IDM_FILEPRINT + MENUITEM "Skriv ut...\tCtrl+P", IDM_FILEPRINT MENUITEM SEPARATOR MENUITEM "Send...", IDM_FILESEND MENUITEM SEPARATOR @@ -21,7 +21,7 @@ BEGIN MENUITEM "Ange som skrivbordsbakgrund (centrerad)", IDM_FILEASWALLPAPERCENTERED MENUITEM "Ange som skrivbordsbakgrund (utsträckt)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR - MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED + MENUITEM "Senast använda fil", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED MENUITEM SEPARATOR MENUITEM "&Avsluta\tAlt+F4", IDM_FILEEXIT END diff --git a/base/applications/network/ipconfig/lang/sv-SE.rc b/base/applications/network/ipconfig/lang/sv-SE.rc index da98a074b6..a4fd8cd6a6 100644 --- a/base/applications/network/ipconfig/lang/sv-SE.rc +++ b/base/applications/network/ipconfig/lang/sv-SE.rc @@ -10,7 +10,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN IDS_BCAST "Broadcast" - IDS_P2P "Peer To Peer" + IDS_P2P "Peer-till-Peer" IDS_MIXED "Mixad" IDS_HYBRID "Hybrid" IDS_UNKNOWN "Okänd" @@ -18,13 +18,13 @@ END STRINGTABLE BEGIN - IDS_OTHER "Annan Typ av Adapter" - IDS_ETH "Ethernet Adapter" - IDS_TOKEN "Token Ring Adapter" - IDS_FDDI "FDDI Adapter" - IDS_PPP "PPP Adapter" - IDS_LOOP "Loopback Adapter" - IDS_SLIP "SLIP Adapter" + IDS_OTHER "Annan typ av adapter" + IDS_ETH "Ethernet-adapter" + IDS_TOKEN "Tokenring-adapter" + IDS_FDDI "FDDI-adapter" + IDS_PPP "PPP-adapter" + IDS_LOOP "Loopback-adapter" + IDS_SLIP "SLIP-adapter" END STRINGTABLE diff --git a/base/applications/shutdown/lang/sv-SE.rc b/base/applications/shutdown/lang/sv-SE.rc index 1a66a40357..7b186b479a 100644 --- a/base/applications/shutdown/lang/sv-SE.rc +++ b/base/applications/shutdown/lang/sv-SE.rc @@ -10,8 +10,8 @@ BEGIN PUSHBUTTON "&Cancel", IDC_CANCEL, 178, 232, 50, 14 LTEXT "Co&mputers:", IDC_STATIC, 9, 9, 35, 36 LISTBOX IDC_COMPUTER_LIST, 8, 19, 162, 55 - PUSHBUTTON "&Add...", IDC_ADD_SYSTEM, 179, 19, 50, 14 - PUSHBUTTON "&Remove", IDC_REMOVE_SYSTEM, 179, 36, 50, 14, WS_DISABLED + PUSHBUTTON "&Lägg till...", IDC_ADD_SYSTEM, 179, 19, 50, 14 + PUSHBUTTON "&Ta bort", IDC_REMOVE_SYSTEM, 179, 36, 50, 14, WS_DISABLED PUSHBUTTON "&Browse...", IDC_BROWSE_SYSTEM, 179, 53, 50, 14 LTEXT "Action", IDC_ACTION, 11, 81, 20, 14 COMBOBOX IDC_ACTION_TYPE, 37, 79, 129, 14, WS_TABSTOP | CBS_DROPDOWN @@ -20,7 +20,7 @@ BEGIN EDITTEXT IDC_SHOW_WARN, 78, 97, 41, 14 LTEXT "second(s)", IDC_SHOW_WARN_TWO, 124, 99, 32, 10 GROUPBOX "Shutdown Event Tracker", IDC_STATIC, 5, 114, 224, 114 - LTEXT "Reason:", IDC_STATIC, 16, 130, 27, 8 + LTEXT "Anledning:", IDC_STATIC, 16, 130, 27, 8 CHECKBOX "Planned", IDC_PLANNED, 175, 130, 40, 12, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_REASON_CODE, 17, 142, 198, 13, WS_TABSTOP | CBS_DROPDOWN LTEXT "Comm&ent:", IDC_COMMENT_CAPTION, 16, 159, 38, 8 diff --git a/base/shell/cmd/lang/no-NO.rc b/base/shell/cmd/lang/no-NO.rc index 08ee2659d9..631a413806 100644 --- a/base/shell/cmd/lang/no-NO.rc +++ b/base/shell/cmd/lang/no-NO.rc @@ -511,7 +511,7 @@ tittel ny tittel\n" STRING_FOR_ERROR4 "ingen kommando etter 'gjøre'." STRING_FREE_ERROR1 "Ugyldig driver" STRING_FREE_ERROR2 "utmerket" - STRING_GOTO_ERROR1 "Ingen merke spesifisert for GÅTIL" + STRING_GOTO_ERROR1 "Ingen merke spesifisert for GOTO" STRING_GOTO_ERROR2 "merke '%s' ikke funnet\n" STRING_MD_ERROR "En undermappe eller fil finnes allerede.\n" STRING_MD_ERROR2 "Stien til den nye mappen eksisterer ikke.\n" diff --git a/base/shell/cmd/lang/sv-SE.rc b/base/shell/cmd/lang/sv-SE.rc index c1ea602ac0..8725c9d9d0 100644 --- a/base/shell/cmd/lang/sv-SE.rc +++ b/base/shell/cmd/lang/sv-SE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_ASSOC_HELP "Ändra assossierad filextention.\n\n\ + STRING_ASSOC_HELP "Ändra assossierad filändelse.\n\n\ assoc [.ext[=[FileType]]]\n\ \n\ assoc (print all associations)\n\ @@ -33,7 +33,7 @@ För att sätta ett nytt eller ändra ett befintligt alias:\n\ För att ta bort ett alias från listan:\n\ kortnamn da=" STRING_BEEP_HELP "Skickar en ljudsignal genom högtalaren.\n\nPIP\n" - STRING_CALL_HELP "Kallar ett batchprogram från ett annat.\n\n\ + STRING_CALL_HELP "Anropa ett batchprogram från ett annat.\n\n\ CALL [enhet:][mapp]filnamn [batch-parameter]\n\n\ batch-parameter Specificerar en kommandoradsinformation som batchprogrammet \n\ behöver." @@ -46,48 +46,48 @@ CD[..|.]\n\n\ . aktuell mapp\n\ /D Vill ändra aktuell enhet och aktuell mapp.\n\n\ Skriv CD enhet: för att visa aktuell mapp på specificerad enhet.\n\ -Skriv CD uten parametere för att visa aktuell enhet och mapp.\n" +Skriv CD utan parametrar för att visa aktuell enhet och mapp.\n" STRING_CHOICE_HELP "Väntar på att användaren skall ange ett av alternativen.\n\n\ CHOICE [/C[:]val][/N][/S][/T[:]c,nn][text]\n\n\ /C[:]Val Anger lista med alternativ. Standard är JN.\n\ /N Visa inte alternativen och ? vid slutet av frågan.\n\ - /S Behandle valgt alternativ med skiftlägeskänslighet.\n\ + /S Behandla valt alternativ med skiftlägeskänslighet.\n\ /T[:]c,nn Standardval sätts till c efter nn sekunder.\n\ text Textsträng som visas.\n\n\ ERRORLEVEL sätts till nummer för knappen användaren väljer.\n" STRING_CLS_HELP "Tömmer skärmen.\n\nCLS\n" STRING_CMD_HELP1 "\nInterna kommandon som är tillgängliga:\n" - STRING_CMD_HELP2 "\nFunksjoner som är tillgängliga:" + STRING_CMD_HELP2 "\nFunktioner som är tillgängliga:" STRING_CMD_HELP3 " [alias:er]" STRING_CMD_HELP4 " [historik]" - STRING_CMD_HELP5 " [Bash filnamnsavslutning]" + STRING_CMD_HELP5 " [Bash filnamnändelse]" STRING_CMD_HELP6 " [mapplista]" STRING_CMD_HELP7 " [omadressering och datakanaler]" - STRING_CMD_HELP8 "Start ett ny instans av ReactOS kommandotolk.\n\n\ + STRING_CMD_HELP8 "Starta en ny instans av ReactOS kommandotolk.\n\n\ CMD [/[C|K] kommando][/P][/Q][/T:bf]\n\n\ /C kommando Kör angivet kommando och avslutar.\n\ /K kommando Kör angivet kommando men avslutar inte.\n\ - /P CMD körs permanent och starter autoexec.bat\n\ - (kan inte avsluttes).\n\ - /T:bf Ställer in bakgrunn/forgrunn färg (se COLOR kommando).\n" - STRING_COLOR_HELP1 "Ställer in standard forgrunns- och bakgrunnsfarger.\n\n\ + /P CMD körs permanent och startar autoexec.bat\n\ + (kan inte avslutas).\n\ + /T:bf Ställer in bakgrunds-/förgrundsfärg (se COLOR kommandot).\n" + STRING_COLOR_HELP1 "Ställer in standard förgrunds- och bakgrundsfärger.\n\n\ COLOR [attr [/-F]]\n\n\ - attr Anger fargeattributter for konsollteksten.\n\ - /-F Fyller inte blank plass med fargeattributter.\n\n\ + attr Anger färgattribut för konsolltexten.\n\ + /-F Fyller inte tom plats med färgeattribut.\n\n\ Det finns tre sätt att ange färgerna:\n\ 1) [bright] namn på [bright] namn (bara de tre första bokstäverna krävs)\n\ 2) decimal på decimal\n\ -3) to hexadecimala siffror\n\n\ +3) två hexadecimala siffror\n\n\ Färgerna är:\n\ dec hex namn dec hex namn\n\ -0 0 Svart 8 8 Grå(ljus Svart)\n\ -1 1 Blå 9 9 Ljus Blå\n\ -2 2 Grön 10 A Ljus Grönn\n\ -3 3 Cyan 11 B Ljus Cyan\n\ -4 4 Röd 12 C Ljus Röd\n\ -5 5 Magenta 13 D Ljus Magenta\n\ -6 6 Gul 14 E Ljus Gult\n\ -7 7 Vit 15 F Ljus Vit\n" +0 0 Svart 8 8 Grå(ljus svart)\n\ +1 1 Blå 9 9 Ljus blå\n\ +2 2 Grön 10 A Ljus grön\n\ +3 3 Cyan 11 B Ljus cyan\n\ +4 4 Röd 12 C Ljus röd\n\ +5 5 Magenta 13 D Ljus magenta\n\ +6 6 Gul 14 E Ljus gul\n\ +7 7 Vit 15 F Ljus vit\n" STRING_COPY_HELP1 "Vill du erstätta %s (Ja/Nej/Alla)? " STRING_COPY_HELP2 "Kopierar en eller flera filer till annan plats.\n\n\ COPY [/V][/Y|/-Y][/A|/B] källa [/A|/B]\n\ @@ -138,7 +138,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attribut]] fil ...\n\n\ S System filer\n\ A Arkiv filer\n\ H Dolda filer\n\ - - prefiks som betyder INTE. (f.eks -R)\n" + - prefix som betyder INTE. (t.ex. -R)\n" STRING_DEL_HELP2 "Alla filer i mappen kommer att bli raderade!\nÄr du säker (J/N)? " STRING_DEL_HELP3 " %lu fil raderade\n" STRING_DEL_HELP4 " %lu filer raderade\n" @@ -153,7 +153,7 @@ DELAY [/m]n\n\n\ /A Vis filer ved att ange attributter.\n\ attribut D mappar R Skrivskyddade filer\n\ H Dolda filer A Filer klara för arkivering\n\ - S System filer - Prefiks som betyder INTE\n\ + S System filer - Prefix som betyder INTE\n\ /B Använder rent filnamnformat (utan överskrift och summering).\n\ /C Visar tusenavskiljare i filstorleken. Dette är standard-\n\ inställningen. Avnänd /-C för att deaktivera visning av skiljetecken.\n\ @@ -290,13 +290,13 @@ MOVE [/N][enhet:][mapp]mappnamn1 mappnamn2\n\n\ /N Ingenting. Gör allt utom att flytta filer eller mappar.\n\n\ aktuell begränsningar:\n\ - Du kan inte flytta en fil eller mapp från en enhet till en annan.\n" - STRING_MSGBOX_HELP "vis en meldingsboks och returner brukers svar\n\n\ + STRING_MSGBOX_HELP "Visa en meddelanderutan och returnera brukers svar\n\n\ MSGBOX type ['tittel'] melding\n\n\ type knapp vises\n\ mulige verdier är: OK, OKCANCEL,\n\ YESNO, YESNOCANCEL\n\ -tittel tittel på meldingsboks\n\ -melding text som vises i meldingsboks\n\n\n\ +tittel tittel på meldingsbox\n\ +melding text som vises i meldingsbox\n\n\n\ ERRORLEVEL settes avhengig av hvilken knapp som trykkes:\n\n\ JA : 10 | NEI : 11\n\ OK : 10 | AVBRYT : 12\n" @@ -305,10 +305,10 @@ PATH [[enhet:]mapp[;...]]\nPATH ;\n\n\ Skriv PATH; för att tømme alle søkemappar inställninar och angi at kommandoskallet\n\ kun skal søke aktuell mapp.\n\ Skriv PATH uten parameter för att visa aktuell søkesti.\n" - STRING_PROMPT_HELP1 "Ändra kommandoledetekst.\n\n\ + STRING_PROMPT_HELP1 "Ändra kommandoledetext.\n\n\ PROMPT [text]\n\n\ - text Anger en nytt kommandoledetekst.\n\n\ -Ledeteksten kan bli satt sammen av normale tegn och følgende spesielle koder:\n\n\ + text Anger en nytt kommandoledetext.\n\n\ +Ledetexten kan bli satt sammen av normale tegn och følgende spesielle koder:\n\n\ $A & (och-tegnet)\n\ $B | (loddrett strek)\n\ $C ( (venstreparentes)\n\ @@ -324,15 +324,15 @@ Ledeteksten kan bli satt sammen av normale tegn och følgende spesielle koder:\n $Q = (likhetstegn)\n\ $S (space)\n\ $T aktuell klokkeslett\n\ - $V Versjonsnummer for ReactOS\n\ + $V Versionsnummer för ReactOS\n\ $_ Retur och linjeskift\n\ $$ $ (dollar tegn)\n" - STRING_PAUSE_HELP1 "Stoppar eksekvering av satsvis fil och vis følgende melding:\n\ -'Tryck valfri tangent för att fortsette...' eller en användaren definert melding.\n\n\ + STRING_PAUSE_HELP1 "Stoppar exekvering av batch-fil och visa följande mening:\n\ +'Tryck valfri tangent för att fortsätta...' eller en användaren definerad mening.\n\n\ PAUSE [melding]" - STRING_PROMPT_HELP2 " $+ Vis aktuell dybde av mappstakken" - STRING_PROMPT_HELP3 "\nSkriv PROMPT uten parameter för att resette ledeteksten." - STRING_REM_HELP "Start en kommentarlinje i en satsvis fil.\n\nREM [Kommentar]" + STRING_PROMPT_HELP2 " $+ Visa aktuell dybde av mappstakken" + STRING_PROMPT_HELP3 "\nSkriv PROMPT uten parameter för att resette ledetexten." + STRING_REM_HELP "Start en kommentarlinje i en batch-fil.\n\nREM [Kommentar]" STRING_RMDIR_HELP "Flytter en mapp.\n\n\ RMDIR [enhet:]mapp\nRD [enhet:]mapp\n\ /S Sletter alle filer och mappar innenfor målet\n\ @@ -341,20 +341,20 @@ RMDIR [enhet:]mapp\nRD [enhet:]mapp\n\ STRING_REN_HELP1 "Ändra namn på fil/mapp eller filer/mappar.\n\n\ ENDRE NAVN [/E /N /P /Q /S /T] gammelt_namn ... nytt_namn\n\ REN [/E /N /P /Q /S /T] gammelt_namn ... nytt_namn\n\n\ - /E Ingen feilmeldinger.\n\ + /E Inget felmeddelande.\n\ /N Ingenting.\n\ - /P spørsmål om godkjenning før endring av namn på hver fil.\n\ - (Inte implementert enda!)\n\ - /Q Stille.\n\ + /P Frågar om godkännande för ändring av namn på varje fil.\n\ + (Inte implementerat!)\n\ + /Q Tyst.\n\ /S Ändra namn på undermapp.\n\ - /T Vis totalt antall endrede filer.\n\n\ + /T Visa totalt antal ändrade filer.\n\n\ NB; du kan inte ange en ny destinasjon for filen/mappen. Bruk\n\ MOVE kommando for det formålet.\n" - STRING_REN_HELP2 " %lu fil endret namn\n" - STRING_REN_HELP3 " %lu filer endret namn\n" - STRING_REPLACE_HELP1 "Replaces files.\n\n\ -REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\ -REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ + STRING_REN_HELP2 " %lu fil ändrade namn\n" + STRING_REN_HELP3 " %lu filer ändrade namn\n" + STRING_REPLACE_HELP1 "Ersätter filer.\n\n\ +REPLACE [drive1:][path1]filnamn [drive2:][path2] [/A] [/P] [/R] [/W]\n\ +REPLACE [drive1:][path1]filnamn [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ [drive1:][path1]filename Specifies the source file or files.\n\ [drive2:][path2] Specifies the directory where files are to be\n\ replaced.\n\ @@ -380,18 +380,18 @@ REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ STRING_REPLACE_HELP9 "Add %s (Y/N)? " STRING_REPLACE_HELP10 "Replace %s (Y/N)? " STRING_REPLACE_HELP11 "Adding %s\n" - STRING_SHIFT_HELP "Ändra posisjon for erstattelig parameter i et satsvis fil.\n\n\ + STRING_SHIFT_HELP "Ändra position för erstattelig parametrar i en batch-fil.\n\n\ SHIFT [NED]" - STRING_SCREEN_HELP "flytt markør och potensielt skriv ut text\n\n\ + STRING_SCREEN_HELP "flytta markör och skriv ut text\n\n\ SCREEN rad kol [text]\n\n\ - rad rad markør flyttes til\n\ - kol kolonne markør flyttes til" - STRING_SET_HELP "Vis, sett, eller fjern miljøvariabel.\n\n\ + rad radmarkör flyttas till\n\ + kol kolumnmarkör flyttas till" + STRING_SET_HELP "Visa, sätt, eller ändra miljövariabel.\n\n\ SET [variabel[=][streng]]\n\n\ - variabel Anger miljøvariabel namn.\n\ - string Anger en serie av tegn til bestemme variabel.\n\n\ -Skriv SET uten parameter för att visa aktuell miljøvariabler.\n" - STRING_START_HELP1 "Start en kommando.\n\n\ + variabel Anger miljövariabel namn.\n\ + string Anger en serie av tecken till bestemme variabel.\n\n\ +Skriv SET utan parametrar för att visa aktuell miljövariabler.\n" + STRING_START_HELP1 "Starta ett kommando.\n\n\ START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ [command/program] [parameters]\n\n\ ""title"" Title of the window.\n\ @@ -402,49 +402,49 @@ START [""title""] [/D path] [/I] [/B] [/MIN] [/MAX] [/WAIT]\n\ MIN Starts with a minimized window.\n\ MAX Starts with a maximized window.\n\ WAIT Starts the command or program and waits for its termination.\n\ - kommando Anger kommando för att kjøre.\n\ + kommando Anger kommando att köra.\n\ parameters Specifies the parameters to be given to the command or program.\n" - STRING_TITLE_HELP "Velg vindustittel for kommandotolkvindu.\n\n\ + STRING_TITLE_HELP "Välj fönstertitel for kommandotolsfönstet.\n\n\ TITLE [streng]\n\n\ -streng Anger tittel for kommandotolkvindu.\n" - STRING_TIME_HELP1 "Vis eller sett system tid.\n\n\ +streng Anger titel for kommandotolsfönstet.\n" + STRING_TIME_HELP1 "Visa eller sätt systemtid.\n\n\ TIME [/T][tid]\n\n\ - /T vis bare\n\n\ + /T visa endast\n\n\ Skriv TIME uten parametere för att visa aktuell tidsinställninar och et\n\ -spørsmål om en ny en. Tryck ENTER för att beholde samme tid.\n" - STRING_TIME_HELP2 "Velg ny tid: " - STRING_TIMER_HELP1 "Forløpt %d msecs\n" - STRING_TIMER_HELP2 "Forløpt %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "Tillater bruk av inntil ti stoppeklokker.\n\n\ +spørsmål om en ny en. Tryck ENTER för att behålla samma tid.\n" + STRING_TIME_HELP2 "Välj ny tid: " + STRING_TIMER_HELP1 "Förlöpt %d msecs\n" + STRING_TIMER_HELP2 "Förlöpt %02d%c%02d%c%02d%c%02d\n" + STRING_TIMER_HELP3 "Tillåter bruk av inntill ti stoppeklokker.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ ON start stoppeklokke\n\ OFF Stoppar stoppeklokke\n\ /S Del tiden. Retur stoppeklokke\n\ tid uten att ändra dens verdi\n\ /n Anger stoppeklokke nummer.\n\ - Stoppeklokke är tilgjengelig fra 0 til 9\n\ + Stoppeklokke är tilgjengelig fra 0 till 9\n\ Hvis inte det är spesifisert är standard lik 1\n\ /Fn Format for utgående\n\ n kan bli:\n\ 0 mikrosekunder\n\ 1 hh%cmm%css%cdd\n\n\ hvis hverken ON, OFF eller /S är spesifisert\n\ -vil status for stoppeklokken veksles.\n\n" - STRING_TYPE_HELP1 "Vis innholdet av tekstfiler.\n\nSkriv [enhet:][mapp]filnamn \n\ +vil status for stoppeklokken växla.\n\n" + STRING_TYPE_HELP1 "Visa innehållet av textfiler.\n\nSkriv [enhet:][mapp]filnamn \n\ /P Vis en full skjerm om gangen.\n" STRING_VERIFY_HELP1 "Denne kommandoen är bare en etterlikning!!\n\ -Anger om det skal bekreftes at dine filer är skrevet korrekt til disk \n\n\ +Anger om det skal bekreftes at dine filer är skrevet korrekt till disk \n\n\ VERIFY [ON | OFF]\n\n\ Skriv VERIFY uten parametre för att visa aktuell VERIFY inställninar.\n" STRING_VERIFY_HELP2 "VERIFY är %s.\n" - STRING_VERIFY_HELP3 "Må ange ON eller OFF." - STRING_VERSION_HELP1 "Vis ReactOS versjonen\n\n\ + STRING_VERIFY_HELP3 "Måste ange ON eller OFF." + STRING_VERSION_HELP1 "Visa ReactOS versionen\n\n\ VER [/C][/R][/W]\n\n\ - /C Vis anerkjennelse.\n\ - /R Vis videreformidlingsinformasjon.\n\ - /W Vis garantiinformasjon." + /C Visa anerkjennelse.\n\ + /R Visa videreformidlingsinformasjon.\n\ + /W Visa garantiinformasjon." STRING_VERSION_HELP2 " kommer med ABSOLUTT INGEN GARANTI; for detaljer\n\ -Skriv: `ver /w'. Dette är gratis programvare, och du är velkommen til videreformidle\n\ +Skriv: `ver /w'. Dette är gratis programvare, och du är velkommen till videreformidle\n\ det under gitte betingelser; Skriv `ver /r' for detaljer. Skriv `ver /c' for en\n\ liste av anerkjennelser." STRING_VERSION_HELP3 "\n Dette programet är fordelt i håpet som det vil bli brukbar,\n\ @@ -455,111 +455,111 @@ liste av anerkjennelser." formidle det och/eller modifisere det under betingelser av Generell Publikum \n\ Lisens som utgivelses av Free Software Foundation; enten version 2 av \n\ Lisens, eller (ved din mulighet) andre nyere version.\n" - STRING_VERSION_HELP5 "\nSend bug rapporter til <ros-dev(a)reactos.org>.\n\ + STRING_VERSION_HELP5 "\nSend bug rapporter till <ros-dev(a)reactos.org>.\n\ oppdateringer är tilgjengelig her: http://www.reactos.org" - STRING_VERSION_HELP6 "\nFreeDOS version skrevet av:\n" - STRING_VERSION_HELP7 "\nReactOS version skrevet av:\n" - STRING_VOL_HELP1 " Volumet i enhet %c är %s\n" - STRING_VOL_HELP2 " Volumet i enhet %c har ingen namn.\n" - STRING_VOL_HELP3 " Volumet Serie nummer är %04X-%04X\n" - STRING_VOL_HELP4 "Vis disk volumet merke och serie nummer, hvis det eksisterer.\n\nVOL [enhet:]" + STRING_VERSION_HELP6 "\nFreeDOS version skruvet av:\n" + STRING_VERSION_HELP7 "\nReactOS version skrivet av:\n" + STRING_VOL_HELP1 " Volymen i enhet %c är %s\n" + STRING_VOL_HELP2 " Volymen i enhet %c har inget namn.\n" + STRING_VOL_HELP3 " Volymens serienummer är %04X-%04X\n" + STRING_VOL_HELP4 "Visa diskvolymens märke och serienummer, om de existerar.\n\nVOL [enhet:]" STRING_WINDOW_HELP1 "ändra konsoll vindu aspekt\n\n\ WINDOW [/POS[=]venstre,topp,bredde,høyde]\n\ - [MINI|MAKS|GJENOPPRETT] ['tittel']\n\n\ + [MINI|MAX|GJENOPPRETT] ['tittel']\n\n\ /POS ange vindusposisjon och størrelse\n\ MINI minimer vinduet\n\ -MAKS maksimer vinduet\n\ +MAX maximerar vinduet\n\ GJENOPPRETT gjenopprett vinduet" STRING_WINDOW_HELP2 "ändra konsoll vindu aspekt\n\n\ ACTIVATE 'window' [/POS[=]venstre,topp,bredde,høyde]\n\ - [MINI|MAKS|GJENOPPRETT] ['tittel']\n\n\ + [MINI|MAX|GJENOPPRETT] ['tittel']\n\n\ vindu tittel av vindu på stad fullføre handlinger\n\ /POS ange vindu plass och størrelse\n\ MIN minimer vinduet\n\ -MAX maksimer vinduet\n\ +MAX maximerar vinduet\n\ RESTORE gjenopprett vinduet\n\ tittel ny tittel\n" STRING_CHOICE_OPTION "YN" STRING_COPY_OPTION "YNA" - STRING_ALIAS_ERROR "Kommando linje for lang etter alias utvidelse!\n" - STRING_ASSOC_ERROR "Fil association ble inte funnet for utvidelsen %s\n" - STRING_BATCH_ERROR "Feil ved åpning av satsvis fil\n" - STRING_CHOICE_ERROR "Ugyldig val. Forventet format: /C[:]val" - STRING_CHOICE_ERROR_TXT "Ugyldig val. Forventet format: /T[:]c,nn" + STRING_ALIAS_ERROR "Kommandorad för lång efter alias utvidelse!\n" + STRING_ASSOC_ERROR "Fil-association ble inte funnet for utvidelsen %s\n" + STRING_BATCH_ERROR "Fel vid öppning av batch-fil\n" + STRING_CHOICE_ERROR "Ogiltigt val. Förväntet format: /C[:]val" + STRING_CHOICE_ERROR_TXT "Ogiltigt val. Förväntet format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Ulovlig operasjon: %s" STRING_CMD_ERROR1 "Kan inte videreføre inndata fra fil %s\n" - STRING_CMD_ERROR2 "Feil under oppretting av temporær fil for datakanal\n" - STRING_CMD_ERROR3 "Kan inte videreføre til fil %s\n" + STRING_CMD_ERROR2 "Fel under oppretting av temporær fil for datakanal\n" + STRING_CMD_ERROR3 "Kan inte videreføre till fil %s\n" STRING_CMD_ERROR4 "Kör %s...\n" STRING_CMD_ERROR5 "Kör cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Samme farge feil! (Bakgrunn och forgrunn kan inte ha samme farge)" - STRING_COLOR_ERROR2 "Feil i farge spesifikasjon" - STRING_CONSOLE_ERROR "Ukjent feil: %d\n" - STRING_COPY_ERROR1 "Feil: kan inte åpne kilden - %s!\n" - STRING_COPY_ERROR2 "Feil: kan inte kopiere til seg selv!\n" - STRING_COPY_ERROR3 "Feil ved skriving til destinasjon!\n" - STRING_COPY_ERROR4 "Feil: Inte implementert enda!\n" - STRING_DATE_ERROR "Ugyldig dato." - STRING_DEL_ERROR5 "Filen %s vil bli slettet! " - STRING_DEL_ERROR6 "Er du sikker (J/N)? " + STRING_COLOR_ERROR1 "Samma färg fel! (Bakgrunn och forgrunn kan inte ha samme farge)" + STRING_COLOR_ERROR2 "Fel i färgspecifikation" + STRING_CONSOLE_ERROR "Okänt fel: %d\n" + STRING_COPY_ERROR1 "Fel: kan inte öppna källan - %s!\n" + STRING_COPY_ERROR2 "Fel: kan inte kopiera till sig själv!\n" + STRING_COPY_ERROR3 "Fel vid skriving till destinationen!\n" + STRING_COPY_ERROR4 "Fel: Inte implementert!\n" + STRING_DATE_ERROR "Ogiltuft datum." + STRING_DEL_ERROR5 "Filen %s vill bli slettet! " + STRING_DEL_ERROR6 "Är du säker (J/N)? " STRING_DEL_ERROR7 "Sletter: %s\n" - STRING_ERROR_ERROR1 "Ukjent feil! Feilkode: 0x%lx\n" - STRING_ERROR_ERROR2 "Syntaks feil" + STRING_ERROR_ERROR1 "Okänt fel! Felkod: 0x%lx\n" + STRING_ERROR_ERROR2 "Syntaxfel" STRING_FOR_ERROR1 "'in' tapt i FOR kommando." STRING_FOR_ERROR2 "ingen brakett funnet." - STRING_FOR_ERROR3 "'gjøre' tapt." - STRING_FOR_ERROR4 "ingen kommando etter 'gjøre'." - STRING_FREE_ERROR1 "Ugyldig driver" - STRING_FREE_ERROR2 "utmerket" - STRING_GOTO_ERROR1 "Ingen merke spesifisert for GÅTIL" - STRING_GOTO_ERROR2 "merke '%s' inte funnet\n" - STRING_MD_ERROR "En undermapp eller fil finnes allerede.\n" - STRING_MD_ERROR2 "Stien til den nye mappen eksisterer inte.\n" + STRING_FOR_ERROR3 "'do' tapt." + STRING_FOR_ERROR4 "inget kommando etter 'gjøre'." + STRING_FREE_ERROR1 "Ogiltig drivrutin" + STRING_FREE_ERROR2 "utmärkt" + STRING_GOTO_ERROR1 "Inget märke specifiserat för GOTO" + STRING_GOTO_ERROR2 "märke '%s' finns inte\n" + STRING_MD_ERROR "En undermapp eller fil finns redan.\n" + STRING_MD_ERROR2 "Stien till den nye mappen exsisterar inte.\n" STRING_MOVE_ERROR1 "[OK]\n" - STRING_MOVE_ERROR2 "[Feil]\n" - STRING_REN_ERROR1 "MoveFile() mislykkes. Feil: %lu\n" - STRING_TIME_ERROR1 "Ugyldig tid." - STRING_TYPE_ERROR1 "Ugyldig alternativ '/%s'\n" - STRING_WINDOW_ERROR1 "vinduet ble inte funnet" + STRING_MOVE_ERROR2 "[Fel]\n" + STRING_REN_ERROR1 "MoveFile() mislyckades. Fel: %lu\n" + STRING_TIME_ERROR1 "Ogiltig tid." + STRING_TYPE_ERROR1 "Ogiltigt alternativ '/%s'\n" + STRING_WINDOW_ERROR1 "fönstret hittades inte" STRING_ERROR_PARAMETERF_ERROR "Parameter format inte riktig - %c\n" - STRING_ERROR_INVALID_SWITCH "Ugyldig bryter - /%c\n" + STRING_ERROR_INVALID_SWITCH "Ogiltig växel - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS "For mange parametere - %s\n" STRING_ERROR_PATH_NOT_FOUND "Stien ble inte funnet\n" STRING_ERROR_FILE_NOT_FOUND "Filen ble inte funnet\n" STRING_ERROR_REQ_PARAM_MISSING "Obligatorisk parameter mangler\n" - STRING_ERROR_INVALID_DRIVE "Ugyldig enhet angitt\n" - STRING_ERROR_INVALID_PARAM_FORMAT "Ugyldig parameter format - %s\n" - STRING_ERROR_BADCOMMAND "Feil kommando eller filnamn - %s\n" - STRING_ERROR_OUT_OF_MEMORY "Feil: Minne fullt.\n" - STRING_ERROR_CANNOTPIPE "Feil! Kan inte bruke datakanal! Kan inte åpne midlertidig fil!\n" - STRING_ERROR_D_PAUSEMSG "Tryck valfri tangent för att fortsette . . ." + STRING_ERROR_INVALID_DRIVE "Ogiltig enhet angiven\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Ogiltigt parameterformat - %s\n" + STRING_ERROR_BADCOMMAND "Fel kommando eller filnamn - %s\n" + STRING_ERROR_OUT_OF_MEMORY "Fel: Minnet fullt.\n" + STRING_ERROR_CANNOTPIPE "Fel! Kan inte bruke datakanal! Kan inte åpne midlertidig fil!\n" + STRING_ERROR_D_PAUSEMSG "Tryck på valfri tangent för att fortsätta . . ." STRING_ERROR_DRIVER_NOT_READY "enheten är inte klar" - STRING_PATH_ERROR "CMD: Inte i miljøet '%s'\n" - STRING_REPLACE_ERROR1 "Invalid switch - %s\n" + STRING_PATH_ERROR "CMD: Inte i miljön '%s'\n" + STRING_REPLACE_ERROR1 "Felaktig växel - %s\n" STRING_REPLACE_ERROR2 "Mappen ble inte funnet - %s\n" STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" STRING_REPLACE_ERROR4 "Invalid parameter combination\n" - STRING_REPLACE_ERROR5 "Tilgang nektet - %s\n" - STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n" + STRING_REPLACE_ERROR5 "Tillgång nekas - %s\n" + STRING_REPLACE_ERROR6 "Ingna filer hittades - %s\n" STRING_REPLACE_ERROR7 "Extended Error 32\n" STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help " - STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s %s]\n" - STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s" + STRING_REACTOS_VERSION "ReactOS Operativsystem [Version %s %s]\n" + STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersion %s %s" STRING_VERSION_RUNNING_ON "Körs på: " STRING_VERSION_RUNVER "%s [Version %d.%d.%d] %s" - STRING_COPY_FILE " %d file(r) kopiert\n" + STRING_COPY_FILE " %d file(r) kopierades\n" STRING_DELETE_WIPE "slettet" - STRING_FOR_ERROR "ugyldig variabel spesifikasjon." - STRING_SCREEN_COL "ugyldig verdi for kolonne" - STRING_SCREEN_ROW "ugyldig verdi for rad" + STRING_FOR_ERROR "ogiltig variabelspecifikastion." + STRING_SCREEN_COL "ogiltigt värde för kolumn" + STRING_SCREEN_ROW "ogiltigr värde för rad" STRING_TIMER_TIME "Stoppeklokke %d är %s: " STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" STRING_MORE "More? " - STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break trykket. Avbryt batch filen? (Ja/Nei/Alt) " - STRING_INVALID_OPERAND "Ugyldig operand." - STRING_EXPECTED_CLOSE_PAREN "Forventet ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Forventet nummer eller variabel namn." - STRING_SYNTAX_COMMAND_INCORRECT "Syntaks for kommandoen är feil." + STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break tryckt. Avbryt batch-filen? (Ja/Nej/Alla) " + STRING_INVALID_OPERAND "Ogiltig operand." + STRING_EXPECTED_CLOSE_PAREN "Forväntat ')'." + STRING_EXPECTED_NUMBER_OR_VARIABLE "Förväntat nummer eller variabelnamn." + STRING_SYNTAX_COMMAND_INCORRECT "Syntaxen för kommandot är fel." END diff --git a/base/system/userinit/lang/sv-SE.rc b/base/system/userinit/lang/sv-SE.rc index ae178475f5..bfe379278e 100644 --- a/base/system/userinit/lang/sv-SE.rc +++ b/base/system/userinit/lang/sv-SE.rc @@ -44,5 +44,5 @@ END STRINGTABLE BEGIN - IDS_SPAIN "Spanish (Spain)" + IDS_SPAIN "Spanska (Spanien)" END diff --git a/dll/cpl/inetcpl/lang/sv-SE.rc b/dll/cpl/inetcpl/lang/sv-SE.rc index 3be10e0942..63ccf4e603 100644 --- a/dll/cpl/inetcpl/lang/sv-SE.rc +++ b/dll/cpl/inetcpl/lang/sv-SE.rc @@ -27,13 +27,13 @@ STRINGTABLE BEGIN IDS_CPL_NAME "Internet Settings" IDS_CPL_INFO "Configure WINE Internet Explorer and related settings." - IDS_SEC_SETTINGS "Security settings for zone: " - IDS_SEC_LEVEL0 "Custom" - IDS_SEC_LEVEL1 "Very Low" - IDS_SEC_LEVEL2 "Low" - IDS_SEC_LEVEL3 "Medium" - IDS_SEC_LEVEL4 "Increased" - IDS_SEC_LEVEL5 "High" + IDS_SEC_SETTINGS "Säkerhetsinställningar för zon: " + IDS_SEC_LEVEL0 "Valt" + IDS_SEC_LEVEL1 "Väldigt låg" + IDS_SEC_LEVEL2 "Låg" + IDS_SEC_LEVEL3 "Medel" + IDS_SEC_LEVEL4 "Ökad" + IDS_SEC_LEVEL5 "Hög" END /* "General" propsheet */ @@ -77,8 +77,8 @@ BEGIN IDC_DELETE_FORM_DATA, 10, 128, 230, 40, BS_TOP | BS_MULTILINE AUTOCHECKBOX "Passwords\nSaved passwords you have entered into forms.", IDC_DELETE_PASSWORDS, 10, 168, 230, 40, BS_TOP | BS_MULTILINE - DEFPUSHBUTTON "Cancel", IDCANCEL, 185, 230, 60, 15, WS_GROUP - PUSHBUTTON "Delete", IDOK, 120, 230, 60, 15, WS_GROUP + DEFPUSHBUTTON "Avbryt", IDCANCEL, 185, 230, 60, 15, WS_GROUP + PUSHBUTTON "Ta bort", IDOK, 120, 230, 60, 15, WS_GROUP END diff --git a/dll/cpl/timedate/lang/sv-SE.rc b/dll/cpl/timedate/lang/sv-SE.rc index c010bfb90e..8f400273ea 100644 --- a/dll/cpl/timedate/lang/sv-SE.rc +++ b/dll/cpl/timedate/lang/sv-SE.rc @@ -39,7 +39,7 @@ BEGIN AUTOCHECKBOX "Automatically synchronize with an Internet time server", IDC_AUTOSYNC, 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP LTEXT "Server:", IDC_SERVERTEXT, 34, 22, 28, 13 - PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + PUSHBUTTON "Updatera nu", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 diff --git a/dll/shellext/acppage/lang/sv-SE.rc b/dll/shellext/acppage/lang/sv-SE.rc index e1eb306fd8..24e62c0e28 100644 --- a/dll/shellext/acppage/lang/sv-SE.rc +++ b/dll/shellext/acppage/lang/sv-SE.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_TABTITLE "Kompabilitet" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index f7014a4dbb..3466d1c586 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -162,7 +162,7 @@ BEGIN IDS_DATETIMETITLE "Date and Time" IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" - IDS_PROCESSSUBTITLE "Please wait..." + IDS_PROCESSSUBTITLE "Vänligen vänta..." IDS_THEMESELECTIONTITLE "Appearance" IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer." END @@ -170,7 +170,7 @@ END STRINGTABLE BEGIN IDS_REACTOS_SETUP "ReactOS Setup" - IDS_UNKNOWN_ERROR "Unknown error" + IDS_UNKNOWN_ERROR "Okänt fel" IDS_REGISTERING_COMPONENTS "Registering components..." IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " IDS_GETPROCADDR_FAILED "GetProcAddr failed: " @@ -201,7 +201,7 @@ END STRINGTABLE BEGIN - IDS_STATUS_INSTALL_DEV "Installing devices..." + IDS_STATUS_INSTALL_DEV "Installerar enheter..." END /* ATTENTION: Synchronize the translation of these strings with shell32 */

1 0

[reactos] 02/02: [FASTFAT] Revert bd1e7bf: our VPB swapout implementation in FastFAT is buggy and leaves volumes in half-(dis)mounted state and thus they get remounted while not completely dismounted. This can lead to major breakage and data corruption. This requires deeper fixes (let's just drop that driver!).
by Pierre Schweitzer 25 Dec '17

25 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=453e42beb503ca70e93d4… commit 453e42beb503ca70e93d4854bc15a2b14850425e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Dec 25 11:22:00 2017 +0100 [FASTFAT] Revert bd1e7bf: our VPB swapout implementation in FastFAT is buggy and leaves volumes in half-(dis)mounted state and thus they get remounted while not completely dismounted. This can lead to major breakage and data corruption. This requires deeper fixes (let's just drop that driver!). CORE-14124 CORE-14126 CORE-14133 --- drivers/filesystems/fastfat/vfat.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 50b83b1afb..b84b320573 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -13,7 +13,11 @@ #endif #define USE_ROS_CC_AND_FS +#if 0 +#ifndef _MSC_VER #define ENABLE_SWAPOUT +#endif +#endif #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l))

1 0

[reactos] 01/02: [NTOSKRNL] Revert 4ef0887: experiments show that our FastFAT is not ready yet to live on its own. So, bring back the infamous IopParseDevice() hack. Dismounting is to be fixed in FastFAT. Even though it might not be the last remaining bug...
by Pierre Schweitzer 25 Dec '17

25 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc5a61d8b76a0b3eca172… commit fc5a61d8b76a0b3eca172f6de9497d91ead47397 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Dec 25 11:20:15 2017 +0100 [NTOSKRNL] Revert 4ef0887: experiments show that our FastFAT is not ready yet to live on its own. So, bring back the infamous IopParseDevice() hack. Dismounting is to be fixed in FastFAT. Even though it might not be the last remaining bug... CORE-14124 CORE-14126 CORE-14133 --- ntoskrnl/io/iomgr/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 11ad0529b3..71863ccb42 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -533,7 +533,7 @@ IopParseDevice(IN PVOID ParseObject, /* Check if we can simply use a dummy file */ UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly)); -#if 0 +#if 1 /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. */

1 0

[reactos] 01/01: [USER32] Implement the index -1 for GetWindowLong which returns a pointer to WW We don't have this struct but WND already contains the same fields in the right order so we can just return the pointer to the first one.
by Giannis Adamopoulos 24 Dec '17

24 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5db5399dc0864b51d3b7… commit c5db5399dc0864b51d3b761eaadd9d8bb640e181 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Dec 25 00:12:45 2017 +0200 [USER32] Implement the index -1 for GetWindowLong which returns a pointer to WW We don't have this struct but WND already contains the same fields in the right order so we can just return the pointer to the first one. The meaning of the -1 index was found here: http://www.geoffchappell.com/studies/windows/win32/user32/structs/wnd/index… --- win32ss/include/ntuser.h | 6 ++++++ win32ss/user/user32/windows/class.c | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 5482ac690f..0195b08d8d 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -657,6 +657,11 @@ typedef struct _SBINFOEX typedef struct _WND { THRDESKHEAD head; +#if 0 + WW ww; +#else + /* These fields should be moved in the WW at some point. */ + /* Plese do not change them to keep the same layout with WW. */ DWORD state; DWORD state2; /* Extended style. */ @@ -666,6 +671,7 @@ typedef struct _WND /* Handle of the module that created the window. */ HINSTANCE hModule; DWORD fnid; +#endif struct _WND *spwndNext; struct _WND *spwndPrev; struct _WND *spwndParent; diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c index c0ad6a65d3..f12788fd22 100644 --- a/win32ss/user/user32/windows/class.c +++ b/win32ss/user/user32/windows/class.c @@ -1116,6 +1116,15 @@ LONG_PTR IntGetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicode ) case GWL_EXSTYLE: retvalue = wndPtr->ExStyle; break; case GWLP_ID: retvalue = wndPtr->IDMenu; break; case GWLP_HINSTANCE: retvalue = (ULONG_PTR)wndPtr->hModule; break; +#if 0 + /* -1 is an undocumented case which returns WW* */ + /* source: http://www.geoffchappell.com/studies/windows/win32/user32/structs/wnd/index… + case -1: retvalue = (ULONG_PTR)&wndPtr->ww; break; +#else + /* We don't have a WW but WND already contains the same fields in the right order, */ + /* so we can return a pointer to its first field */ + case -1: retvalue = (ULONG_PTR)&wndPtr->state; break; +#endif case GWLP_WNDPROC: { if (!TestWindowProcess(wndPtr))

1 0

[reactos] 01/01: [UXTHEME] EnableThemeDialogTexture: Update window theme only when ETDT_USETABTEXTURE is used
by Giannis Adamopoulos 24 Dec '17

24 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5e707ec1f0ea489a6335… commit c5e707ec1f0ea489a6335e544e39455cc15251b4 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Dec 24 23:52:10 2017 +0200 [UXTHEME] EnableThemeDialogTexture: Update window theme only when ETDT_USETABTEXTURE is used --- dll/win32/uxtheme/draw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/uxtheme/draw.c b/dll/win32/uxtheme/draw.c index dd37ad2cc1..c18a5986c4 100644 --- a/dll/win32/uxtheme/draw.c +++ b/dll/win32/uxtheme/draw.c @@ -47,8 +47,8 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) if (dwFlags & ETDT_USETABTEXTURE) return SetWindowTheme (hwnd, NULL, szTab); else - return SetWindowTheme (hwnd, NULL, NULL); - } + return S_OK; +} /*********************************************************************** * IsThemeDialogTextureEnabled (UXTHEME.@)

1 0

[reactos] 01/01: [DISK] Properly implement querying partition information for partition 0. In spite of what was implemented in our NT DDK sample, this is a legit operation.
by Pierre Schweitzer 24 Dec '17

24 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b9b461bde95804f3dcf14… commit b9b461bde95804f3dcf1455a1bfbf25cfdb8aedc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 24 21:54:09 2017 +0100 [DISK] Properly implement querying partition information for partition 0. In spite of what was implemented in our NT DDK sample, this is a legit operation. This may have been turned legit starting NT5 (reminder, our implementation is NT4 based...). So, in this situation, just return the information about the whole disk (and not a random size) and also, mark everything with default values. See disk_new for an example of how it works in NT5+. CORE-14124 --- drivers/storage/class/disk/disk.c | 71 ++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/drivers/storage/class/disk/disk.c b/drivers/storage/class/disk/disk.c index e0c775688d..cb84565691 100644 --- a/drivers/storage/class/disk/disk.c +++ b/drivers/storage/class/disk/disk.c @@ -2235,58 +2235,69 @@ Return Value: sizeof(PARTITION_INFORMATION)) { status = STATUS_INFO_LENGTH_MISMATCH; - + break; } -#if 0 // HACK: ReactOS partition numbers must be wrong - else if (diskData->PartitionNumber == 0) { + + // + // Update the geometry in case it has changed. + // + + status = UpdateRemovableGeometry (DeviceObject, Irp); + + if (!NT_SUCCESS(status)) { // - // Partition zero is not a partition so this is not a - // reasonable request. + // Note the drive is not ready. // - status = STATUS_INVALID_DEVICE_REQUEST; - + diskData->DriveNotReady = TRUE; + break; } -#endif - else { - PPARTITION_INFORMATION outputBuffer; + // + // Note the drive is now ready. + // - if (diskData->PartitionNumber == 0) { - DPRINT1("HACK: Handling partition 0 request!\n"); - //ASSERT(FALSE); - } + diskData->DriveNotReady = FALSE; - // - // Update the geometry in case it has changed. - // + // + // Handle the case were we query the whole disk + // - status = UpdateRemovableGeometry (DeviceObject, Irp); + if (diskData->PartitionNumber == 0) { - if (!NT_SUCCESS(status)) { + PPARTITION_INFORMATION outputBuffer; - // - // Note the drive is not ready. - // + outputBuffer = + (PPARTITION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; - diskData->DriveNotReady = TRUE; - break; - } + outputBuffer->PartitionType = PARTITION_ENTRY_UNUSED; + outputBuffer->StartingOffset = deviceExtension->StartingOffset; + outputBuffer->PartitionLength.QuadPart = deviceExtension->PartitionLength.QuadPart; + outputBuffer->HiddenSectors = 0; + outputBuffer->PartitionNumber = diskData->PartitionNumber; + outputBuffer->BootIndicator = FALSE; + outputBuffer->RewritePartition = FALSE; + outputBuffer->RecognizedPartition = FALSE; + + status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(PARTITION_INFORMATION); + + } else { + + PPARTITION_INFORMATION outputBuffer; // - // Note the drive is now ready. + // We query a single partition here + // FIXME: this can only work for MBR-based disks, check for this! // - diskData->DriveNotReady = FALSE; - outputBuffer = (PPARTITION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; outputBuffer->PartitionType = diskData->PartitionType; outputBuffer->StartingOffset = deviceExtension->StartingOffset; - outputBuffer->PartitionLength.QuadPart = (diskData->PartitionNumber) ? - deviceExtension->PartitionLength.QuadPart : 0x1FFFFFFFFFFFFFFFLL; // HACK + outputBuffer->PartitionLength.QuadPart = deviceExtension->PartitionLength.QuadPart; outputBuffer->HiddenSectors = diskData->HiddenSectors; outputBuffer->PartitionNumber = diskData->PartitionNumber; outputBuffer->BootIndicator = diskData->BootIndicator;

1 0

[reactos] 06/06: [NTDLL_APITEST] -Add a hacky Microsoft.Windows.GdiPlus.manifest.
by Giannis Adamopoulos 24 Dec '17

24 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1db8bd46d6d1eff589a20… commit 1db8bd46d6d1eff589a20f6ec7e57047bc9b3a05 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Dec 24 19:22:42 2017 +0200 [NTDLL_APITEST] -Add a hacky Microsoft.Windows.GdiPlus.manifest. This is needed because ntdlltest.manifest has a dependency on gdiplus and won't load because we don't have it in winsxs. Eventually this must be removed. --- modules/rostests/apitests/ntdll/CMakeLists.txt | 2 ++ modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index c1a3aead68..3ac0b604f1 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -77,4 +77,6 @@ add_rostests_file(TARGET ntdll_apitest SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdll_apitest.exe.local" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/shell32.dll" SUBDIR testdata) add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/test.dll" SUBDIR testdata) + add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/ntdlltest.manifest" SUBDIR testdata) +add_rostests_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Windows.GdiPlus.manifest" SUBDIR testdata) diff --git a/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest b/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest new file mode 100644 index 0000000000..ba815f4c7b --- /dev/null +++ b/modules/rostests/apitests/ntdll/Microsoft.Windows.GdiPlus.manifest @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.100.0" processorArchitecture="x86" /> + <file name="gdiplus.dll"/> +</assembly> + \ No newline at end of file

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs