Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 35459: forgot this one
by tkreuzer＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: tkreuzer Date: Tue Aug 19 14:08:45 2008 New Revision: 35459 URL: http://svn.reactos.org/svn/reactos?rev=35459&view=rev Log: forgot this one Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/ke.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/arch/ke.h [iso-8859-1] Tue Aug 19 14:08:45 2008 @@ -33,6 +33,8 @@ #error "Unknown processor" #endif +VOID KiArchInitSystem(VOID); + #endif /* __NTOSKRNL_INCLUDE_INTERNAL_ARCH_KE_H */ /* EOF */

1 0

[tkreuzer] 35458: Move some architecture specific code from KiRosPrepareForSystemStartup into KiArchInitSystem, defined for each architecture. Enable KiRosBuildReservedMemoryMap for _M_AMD64
by tkreuzer＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: tkreuzer Date: Tue Aug 19 14:07:13 2008 New Revision: 35458 URL: http://svn.reactos.org/svn/reactos?rev=35458&view=rev Log: Move some architecture specific code from KiRosPrepareForSystemStartup into KiArchInitSystem, defined for each architecture. Enable KiRosBuildReservedMemoryMap for _M_AMD64 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Tue Aug 19 14:07:13 2008 @@ -949,7 +949,7 @@ /* Build entries for ReactOS memory ranges, which uses ARC Descriptors */ KiRosBuildOsMemoryMap(); -#ifdef _M_IX86 +#if defined(_M_IX86) || defined(_M_AMD64) /* Build entries for the reserved map, which uses ARC Descriptors */ KiRosBuildReservedMemoryMap(); #endif @@ -1266,42 +1266,15 @@ { PLOADER_PARAMETER_BLOCK NtLoaderBlock; ULONG size, i = 0, *ent; -#if defined(_M_IX86) - PKTSS Tss; - PKGDTENTRY TssEntry; - - /* Load the GDT and IDT */ - Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); - Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); - - /* Initialize the boot TSS */ - Tss = &KiBootTss; - TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; - TssEntry->HighWord.Bits.Type = I386_TSS; - TssEntry->HighWord.Bits.Pres = 1; - TssEntry->HighWord.Bits.Dpl = 0; - TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); - TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); - TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); -#endif - -#if defined(_M_PPC) - // Zero bats. We might have residual bats set that will interfere with - // our mapping of ofwldr. - for (i = 0; i < 4; i++) - { - SetBat(i, 0, 0, 0); SetBat(i, 1, 0, 0); - } - KiSetupSyscallHandler(); - DbgPrint("Kernel Power (%08x)\n", LoaderBlock); - DbgPrint("ArchExtra (%08x)!\n", LoaderBlock->ArchExtra); -#endif /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; /* Get debugging function */ FrLdrDbgPrint = LoaderBlock->FrLdrDbgPrint; + + /* Per architecture initialisazion code */ + KiArchInitSystem(); /* Save memory manager data */ KeMemoryMapRangeCount = 0; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Tue Aug 19 14:07:13 2008 @@ -1036,3 +1036,24 @@ /* Capture the control state */ KiSaveProcessorControlState(State); } + +VOID +KiArchInitSystem() +{ + PKTSS Tss; + PKGDTENTRY TssEntry; + + /* Load the GDT and IDT */ + Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); + Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); + + /* Initialize the boot TSS */ + Tss = &KiBootTss; + TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; + TssEntry->HighWord.Bits.Type = I386_TSS; + TssEntry->HighWord.Bits.Pres = 1; + TssEntry->HighWord.Bits.Dpl = 0; + TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); + TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); + TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); +} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/powerpc/cpu.c [iso-8859-1] Tue Aug 19 14:07:13 2008 @@ -275,3 +275,19 @@ /* Capture the control state */ KiSaveProcessorControlState(State); } + +VOID +KiArchInitSystem() +{ + ULONG i; + + // Zero bats. We might have residual bats set that will interfere with + // our mapping of ofwldr. + for (i = 0; i < 4; i++) + { + SetBat(i, 0, 0, 0); SetBat(i, 1, 0, 0); + } + KiSetupSyscallHandler(); + DbgPrint("Kernel Power (%08x)\n", KeRosLoaderBlock); + DbgPrint("ArchExtra (%08x)!\n", KeRosLoaderBlock->ArchExtra); +}

1 0

[cgutman] 35457: - Make sure we have an mdl and a buffer
by cgutman＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: cgutman Date: Tue Aug 19 12:45:53 2008 New Revision: 35457 URL: http://svn.reactos.org/svn/reactos?rev=35457&view=rev Log: - Make sure we have an mdl and a buffer Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Tue Aug 19 12:45:53 2008 @@ -50,6 +50,8 @@ } VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { + if( !IrpSp->Parameters.DeviceIoControl.Type3InputBuffer || !Irp->MdlAddress ) return; + MmUnmapLockedPages( IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, Irp->MdlAddress ); MmUnlockPages( Irp->MdlAddress );

1 0

[dreimer] 35456: Bug 3661: Bulgarian Update by CCTAHEB Bug 3668: Shell32 Update by Javier Remacha
by dreimer＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: dreimer Date: Tue Aug 19 12:00:40 2008 New Revision: 35456 URL: http://svn.reactos.org/svn/reactos?rev=35456&view=rev Log: Bug 3661: Bulgarian Update by CCTAHEB Bug 3668: Shell32 Update by Javier Remacha Added: trunk/reactos/dll/win32/kernel32/lang/bg-BG.mc (with props) Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/win32/aclui/aclui_Bg.rc trunk/reactos/dll/win32/netid/lang/es-ES.rc trunk/reactos/dll/win32/newdev/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… Modified: trunk/reactos/dll/win32/aclui/aclui_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Bg.r… Added: trunk/reactos/dll/win32/kernel32/lang/bg-BG.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/bg… Modified: trunk/reactos/dll/win32/netid/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/es-ES… Modified: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/bg-B… 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/subsystems/win32/csrss/win32csr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…

1 0

[dreimer] 35455: Bug 3631 Translate file/patch by Lars Martin Hambro (shell32 was outdated) Bug 3659 shell32 pl-PL update by Maciej Bialas Bug 3664 Italian resources update by Paolo Devoti Bug 3665 Some translations
by dreimer＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: dreimer Date: Tue Aug 19 11:32:35 2008 New Revision: 35455 URL: http://svn.reactos.org/svn/reactos?rev=35455&view=rev Log: Bug 3631 Translate file/patch by Lars Martin Hambro (shell32 was outdated) Bug 3659 shell32 pl-PL update by Maciej Bialas Bug 3664 Italian resources update by Paolo Devoti Bug 3665 Some translations Added: trunk/reactos/base/applications/screensavers/3dtext/lang/ko-KR.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/ko-KR.rc (with props) trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc (with props) trunk/reactos/dll/cpl/telephon/lang/no-NO.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/msconfig/lang/no-NO.rc trunk/reactos/base/applications/mstsc/lang/no-NO.rc trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/sndvol32/rsrc.rc trunk/reactos/dll/cpl/access/lang/no-NO.rc trunk/reactos/dll/cpl/appwiz-new/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/main/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/win32/netid/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -9,14 +9,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Heks",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Des",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Okt",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Heks",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Des",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Okt",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 @@ -150,7 +146,7 @@ CONTROL "Radianer",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, 24,42,10 CONTROL "Gradienter",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, - 236,24,44,10 + 236,24,48,10 PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | @@ -227,6 +223,84 @@ PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Kalkulator" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Konverter",IDC_BUTTON_CONVERT,35,105,76,17 + COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Kategori:",IDC_STATIC,4,20,56,8 + COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Konverter fra:",IDC_STATIC,4,49,56,8 + COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "Konverter til:",IDC_STATIC,4,76,56,8 + CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 + CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 + CONTROL "Tilbake",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, + 40,17 + RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17 + CONTROL "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17 + CONTROL "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17 + CONTROL "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17 + CONTROL "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17 + CONTROL "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17 + CONTROL "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17 + CONTROL "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17 + CONTROL "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17 + CONTROL "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17 + CONTROL "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17 + CONTROL ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17 + CONTROL "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17 + CONTROL "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17 + CONTROL "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17 + CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17 + CONTROL "Sqrt",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17 + CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17 + CONTROL "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17 + CONTROL "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17 + CTEXT "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17 + CONTROL "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17 + CONTROL "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17 + CONTROL "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17 + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE END IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 @@ -321,7 +395,7 @@ MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED MENUITEM "Tegn\tF4", IDM_VIEW_BYTE, CHECKED MENUITEM SEPARATOR - MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED + MENUITEM "Digital gruppe", IDM_VIEW_GROUP, CHECKED END POPUP "Hjelp" BEGIN @@ -363,3 +437,229 @@ IDS_QUICKHELP "Rask hjelp" END +// types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_AREA "Område" + IDS_CONV_CONSUMPTION "Forbruk (maskin)" + IDS_CONV_CURRENCY "Valuta" + IDS_CONV_ENERGY "Energi" + IDS_CONV_LENGTH "Lengde" + IDS_CONV_POWER "Strøm" + IDS_CONV_PRESSURE "Trykk" + IDS_CONV_TEMPERATURE "Temperatur" + IDS_CONV_VELOCITY "Hastighet" + IDS_CONV_VOLUME "Volum" + IDS_CONV_WEIGHT "Vekt" +END + +// TYPES OF AREAS +STRINGTABLE DISCARDABLE +BEGIN + IDS_AREA_ACRES "Acres" + IDS_AREA_ACRES_BRAZIL "Acres (Brazil)" + IDS_AREA_ACRES_FRANCE "Acres (France)" + IDS_AREA_ACRES_SCOTS "Acres (Scots)" + IDS_AREA_ACRES_US "Acres (US)" + IDS_AREA_ARES "Ares" + IDS_AREA_CHOU "Chou" + IDS_AREA_DANBO "Danbo" + IDS_AREA_HECTARES "Hectares" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "Morgen (Hungary)" + 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 "Square centimeters" + IDS_AREA_SQUARE_CHR "Square chr" + IDS_AREA_SQUARE_FATHOMS "Square fathoms" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Square fathoms (Hungary)" + IDS_AREA_SQUARE_FEET "Square feet" + IDS_AREA_SQUARE_INCHES "Square inches" + IDS_AREA_SQUARE_KILOMETERS "Square kilometers" + IDS_AREA_SQUARE_LAR "Square lar" + IDS_AREA_SQUARE_METER "Square meter" + IDS_AREA_SQUARE_MILES "Square miles" + IDS_AREA_SQUARE_MILLIMETERS "Square millimeters" + IDS_AREA_SQUARE_SHAKU "Square shaku" + IDS_AREA_SQUARE_TSUEN "Square tsuen" + IDS_AREA_SQUARE_VA "Square va" + IDS_AREA_SQUARE_YARD "Square yard" + IDS_AREA_TAN "Tan" + IDS_AREA_TSUBO "Tsubo" +END + +// TYPES OF COMSUMPTIONS +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "Kilometer/liter" + IDS_CONSUMPTION_L_PER_100_KM "Liters/100 kilometers" + IDS_CONSUMPTION_MILES_GALLON_UK "Miles/gallon (UK)" + IDS_CONSUMPTION_MILES_GALLON_US "Miles/gallon (US)" +END + +// TYPES OF CURRENCIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "Austrian schilling" + IDS_CURRENCY_BELGIAN_FRANC "Belgian franc" + IDS_CURRENCY_CYPRIOT_POUND "Cypriot pound" + IDS_CURRENCY_DEUTSCHE_MARK "Deutsche Mark" + IDS_CURRENCY_DUTCH_GUILDER "Dutch guilder" + IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_FINNISH_MARKKA "Finnish markka" + IDS_CURRENCY_FRENCH_FRANC "French franc" + IDS_CURRENCY_GREEK_DRACHMA "Greek Drachma" + IDS_CURRENCY_IRISH_POUND "Irish pound" + IDS_CURRENCY_ITALIAN_LIRA "Italian lira" + IDS_CURRENCY_LUXEMBOURG_FRANC "Luxembourg franc" + IDS_CURRENCY_MALTESE_LIRA "Maltese lira" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Portoguese escudo" + IDS_CURRENCY_SLOVENIAN_TOLAR "Slovenian tolar" + IDS_CURRENCY_SPANISH_PESETA "Spanish peseta" +END + +// TYPES OF ENERGIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "15 ^C calories" + IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_IT_CALORIES "International Table calories" + IDS_ENERGY_JOULES "Joules" + IDS_ENERGY_KILOJOULES "Kilojoules" + IDS_ENERGY_KILOWATT_HOURS "Kilowatt hours" + IDS_ENERGY_NUTRITION_CALORIES "Nutrition calories" + IDS_ENERGY_TH_CALORIES "Thermochemical calorie" +END + +// TYPES OF LENGTHS +STRINGTABLE DISCARDABLE +BEGIN + IDS_LENGTH_ANGSTROMS "Angstroms" + IDS_LENGTH_ASTRONOMILA_UNITS "Astronomila units" + IDS_LENGTH_BARLEYCORNS "Barleycorns" + IDS_LENGTH_CENTIMETERS "Centimeters" + IDS_LENGTH_CHAINS_UK "Chains (UK)" + IDS_LENGTH_CHI "Chi" + IDS_LENGTH_CHOU "Chou" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "Cun" + IDS_LENGTH_FATHOMS "Fathoms" + IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Hungary)" + IDS_LENGTH_FEET "Feet" + IDS_LENGTH_FURLONGS "Furlongs" + IDS_LENGTH_GAN "Gan" + IDS_LENGTH_HANDS "Hands" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "Inches" + IDS_LENGTH_JA "Ja" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "Kilometers" + IDS_LENGTH_LAR "Lar" + IDS_LENGTH_LIGHT_YEARS "Light years" + IDS_LENGTH_LINKS_UK "Links (UK)" + IDS_LENGTH_METERS "Meters" + IDS_LENGTH_MILES "Miles" + IDS_LENGTH_MILLIMETERS "Millimeters" + IDS_LENGTH_NAUTICAL_MILES "Nautical miles" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PICAS "Picas" + IDS_LENGTH_RI_JAPAN "Ri (Japan)" + IDS_LENGTH_RI_KOREA "Ri (Korea)" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "Shaku" + IDS_LENGTH_SPAN "Span" + IDS_LENGTH_SUN "Sun" + IDS_LENGTH_TSUEN "Tsuen" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "Yards" + IDS_LENGTH_YOTE "Yote" + IDS_LENGTH_ZHANG "Zhang" +END + +// TYPES OF POWERS +STRINGTABLE DISCARDABLE +BEGIN + IDS_POWER_HORSEPOWER "hestekrefter" + IDS_POWER_KILOWATTS "Kilowatt" + IDS_POWER_MEGAWATTS "Megawatt" + IDS_POWER_WATTS "Watt" +END + +// TYPE OF PRESSURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "Atmosfæretrykk" + IDS_PRESSURE_BARS "Bars" + IDS_PRESSURE_MM_OF_MERCURY "Millimeters of mercury" + IDS_PRESSURE_PASCALS "Pascals" + IDS_PRESSURE_PSI "Pounds-force per square inch" +END + +// TYPES OF TEMPERATURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "Celsius" + IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit" + IDS_TEMPERATURE_KELVIN "Kelvin" + IDS_TEMPERATURE_RANKINE "Rankine" +END + +// TYPES OF VELOCITIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VELOCITY_FEET_HOUR "Feet/time" + IDS_VELOCITY_KILOMETERS_HOUR "kilometer/time" + IDS_VELOCITY_KNOTS "Knot" + IDS_VELOCITY_MACH "Mach" + IDS_VELOCITY_METERS_SECOND "Meter/sekunder" + IDS_VELOCITY_MILES_HOUR "Mil/time" +END + +// TYPES OF VOLUMES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VOLUME_BARRELS_UK "Barrels (UK)" + IDS_VOLUME_BARRELS_OIL "Barrels oil" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "Bushels (UK)" + IDS_VOLUME_BUSHELS_US "Bushels (US)" + IDS_VOLUME_CUBIC_CENTIMETERS "Cubic centimeters" + IDS_VOLUME_CUBIC_FEET "Cubic feet" + IDS_VOLUME_CUBIC_INCHES "Cubic inches" + IDS_VOLUME_CUBIC_METERS "Cubic meters" + IDS_VOLUME_CUBIC_YARDS "Cubic yards" + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (UK)" + IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (US)" + IDS_VOLUME_GALLONS_UK "Gallons (UK)" + IDS_VOLUME_GALLONS_DRY_US "Gallons, dry (US)" + IDS_VOLUME_GALLONS_LIQUID_US "Gallons, liquid (US)" + IDS_VOLUME_GOU "Gou" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "Liters" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "Milliliters" + IDS_VOLUME_PINTS_UK "Pints (UK)" + IDS_VOLUME_PINTS_DRY_US "Pints, dry (US)" + IDS_VOLUME_PINTS_LIQUID_US "Pints, liquid (US)" + IDS_VOLUME_QUARTS_UK "Quarts (UK)" + IDS_VOLUME_QUARTS_DRY_US "Quarts, dry (US)" + IDS_VOLUME_QUARTS_LIQUID_US "Quarts, liquid (US)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "To" +END + Modified: trunk/reactos/base/applications/msconfig/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -38,8 +38,8 @@ PUSHBUTTON "&Ny", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 PUSHBUTTON "Re&diger", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 - PUSHBUTTON "A&ktiver Alt", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 - PUSHBUTTON "Dektiver A&lt",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 + PUSHBUTTON "A&ktiver alt", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "D&eaktiver alt",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 END IDD_TOOLS_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 @@ -64,13 +64,13 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Oppstarts utvalg", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT - CONTROL "&Normal oppstart - laste inn alle enhetsdrivere og tjenester", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 - CONTROL "&Diagnose oppstart - last bare inn grunnleggende enheter og tjenester", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + GROUPBOX "Oppstarts valg", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "&Normal oppstart - last inn alle enhetsdrivere og tjenester", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 236, 10 + CONTROL "&Diagnose oppstart - last bare inn grunnleggende enheter og tjenester", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 236, 10 CONTROL "&Selektiv oppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 AUTOCHECKBOX "L&ast inn SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 - AUTOCHECKBOX "&Last inn System tjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 - AUTOCHECKBOX "Las&t inn oppstartselementet", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 + AUTOCHECKBOX "&Last inn Systemtjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10 + AUTOCHECKBOX "Las&t inn oppstartselementet", IDC_CBX_STARTUP_ITEM, 30, 110, 105, 10 END IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 @@ -78,20 +78,20 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 - PUSHBUTTON "&Sjekk alle oppstartsbaner", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&Sjekk oppstartsbaner", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 75, 12 PUSHBUTTON "&Sett som standard", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 - PUSHBUTTON "Flytt &Opp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 - PUSHBUTTON "Flytt &Ned", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 - GROUPBOX "Oppstarts alternativer", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT - CHECKBOX "/Sik&ker oppstart", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 - CHECKBOX "/&Ingen grafisk oppstart", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10 - CHECKBOX "/&Oppstart logg", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 - CHECKBOX "/Enkel& grafikk", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + PUSHBUTTON "Flytt &opp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "Flytt &ned", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "Oppstarts alternativer", -1, 10, 80, 250, 95,0,WS_EX_TRANSPARENT + CHECKBOX "/Sik&ker oppstart", IDC_CBX_SAFE_BOOT, 15, 90, 95, 10 + CHECKBOX "/&Ingen grafisk oppstart", IDC_CBX_NO_GUI_BOOT, 15, 105, 95, 10 + CHECKBOX "/&Oppstart logg", IDC_CBX_BOOT_LOG, 15, 120, 80, 10 + CHECKBOX "/Enkel &grafikk", IDC_CBX_BASE_VIDEO, 15, 135, 95, 10 CHECKBOX "/H&jelp", IDC_CBX_SOS, 15, 150, 50, 10 - PUSHBUTTON "Av&anserte alternativer...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 - LTEXT "&Tidsavbrudd:", -1, 280, 91, 30, 10 - EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sek.", -1, 340, 91, 15, 10 + PUSHBUTTON "Av&anserte alternativer...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 93, 12 + LTEXT "&Tidsavbrudd:", -1, 280, 91, 70, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 100, 25, 12, ES_LEFT + LTEXT "sekunder", -1, 310, 100, 85, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX DISCARDABLE 0, 0, 175, 175 Modified: trunk/reactos/base/applications/mstsc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -31,8 +31,8 @@ COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 LTEXT "OBS: Innstillingen på den eksterne datamaskinen kan overstyre denne innstillingen.",IDC_STATIC,56,143,165,18 - LTEXT "Mindre",IDC_STATIC,35,42,15,8 - LTEXT "Større",IDC_STATIC,189,42,17,8 + LTEXT "Mindre",IDC_STATIC,35,42,22,8 + LTEXT "Større",IDC_STATIC,189,42,19,8 LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER END Modified: trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -53,7 +53,7 @@ \n \ For Setclassid, fjernes ClassId hvis det ikke angis en ClassId.\n \ \n \ - Examples:\n \ + Eksempler:\n \ > ipconfig ... Vis informasjon.\n \ > ipconfig /all ... Vis detaljert informasjon\n \ > ipconfig /renew ... Forny alle kort\n \ Added: trunk/reactos/base/applications/screensavers/3dtext/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/ko-KR.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/ko-KR.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -1,0 +1,21 @@ +/* + *Korean Translation by Seungju Kim(www.manatails007.org) manatails007* + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "3D ÅØ½ºÆ® È¸é º¸È£±â ¼³Á¤" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "È®ÀÎ",IDOK,216,7,50,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "Ä¿½ºÅÒ ÅØ½ºÆ®",IDC_STATIC,18,17,65,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "3D ÅØ½ºÆ® È¸é º¸È£±â" +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/ko-KR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -18,6 +18,7 @@ #include "lang/eu-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/applications/screensavers/logon/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/ko-KR.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/ko-KR.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -1,0 +1,11 @@ +/* + *Korean Translation by Seungju Kim(www.manatails007.org) manatails007* + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "·Î±×¿Â È¸é º¸È£±â" + IDS_TEXT "¼³Á¤ÇÒ °ÍÀÌ ¾ø½À´Ï´Ù." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/ko-KR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -20,6 +20,7 @@ #include "lang/es-ES.rc" #include "lang/eu-ES.rc" #include "lang/fr-FR.rc" +#include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Added: trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc (added) +++ trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -1,0 +1,46 @@ +/* + *Korean Translation by Seungju Kim(www.manatails007.org) manatails007* + */ +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "¿É¼Ç(&P)" + BEGIN + MENUITEM "¼Ó¼º(&R)", IDC_PROPERTIES + MENUITEM "°í±Þ ÄÁÆ®·Ñ(&A)", IDC_ADVANCED_CONTROLS + MENUITEM SEPARATOR + MENUITEM "Á¾·á(&X)", IDC_EXIT + END + POPUP "µµ¿ò¸»(&H)" + BEGIN + MENUITEM "µµ¿ò¸» Ç×¸ñ(&H)", IDC_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "º¼·ý ÄÁÆ®·Ñ Á¤º¸(&A)", IDC_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SNDVOL32 "º¼·ý ÄÁÆ®·Ñ" + IDS_NOMIXERDEVICES "»ç¿ë °¡´ÉÇÑ ¹Í¼ ÀåÄ¡°¡ ¾ø½À´Ï´Ù! ÀÌ ÇÁ·Î±×·¥Àº Á¾·áµË´Ï´Ù." +END + +IDD_PREFERENCES DIALOGEX 0, 0, 224, 250 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "¼Ó¼º" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¹Í¼ ÀåÄ¡(&M):", -1, 7,8,48,9 + COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP + GROUPBOX "º¼·ý Á¶Àý:", -1, 7,25,211,77 + PUSHBUTTON "Àç»ý(&P)", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "³ìÀ½(&R)", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON + PUSHBUTTON "±âÅ¸(&O):", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED + COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + LTEXT "´ÙÀ½ º¼·ý ÄÁÆ®·Ñ Ç¥½Ã:", IDC_LABELCONTROLS, 7, 109, 162, 8 + CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96 + + PUSHBUTTON "È®ÀÎ", IDOK, 114,226,50,14 + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 168,226,50,14 +END Propchange: trunk/reactos/base/applications/sndvol32/lang/ko-KR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/rsrc.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -17,6 +17,7 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/lt-LT.rc" +#include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/dll/cpl/access/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -223,7 +223,7 @@ CAPTION "Avanserte innstillinger for filtertaster" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Bounce Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + GROUPBOX "Gjentatt taster",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) LTEXT "&Ignorer tastetrykk som gjentas raskere enn:",-1,PROPSHEETPADDING(2),LABELLINE(2)+1,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) COMBOBOX IDC_BOUNCE_TIME_COMBO, PROPSHEETPADDING(2), LABELLINE(3)+5, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -241,7 +241,7 @@ CAPTION "Avanserte innstillinger for filtertaster" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Repeat Keys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) + GROUPBOX "Repetisjontaster",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(12) LTEXT "Overstyr innstillingene under tastatur i kontrollpanel:",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) AUTORADIOBUTTON "&Ingen repetisjon",IDC_REPEAT_NOREPEAT_RADIO,PROPSHEETPADDING(2),LABELLINE(3)+3,78,LABELLINE(1),WS_GROUP Modified: trunk/reactos/dll/cpl/appwiz-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz-new/lang/no… ============================================================================== --- trunk/reactos/dll/cpl/appwiz-new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz-new/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -26,8 +26,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "This wizard helps you to create shortcuts to local or network programs, files, folders, computers, or Internet addresses.", -1, 97, 7, 195, 28 - LTEXT "&Type the location of the item:", IDC_LOCATIONITEM, 98, 46, 196, 8 + LTEXT "Denne veiviseren vil hjelpe deg med å opprette en snarvei til lokale programmer eller nettverksprogrammer, filer, mapper, datamaskiner, eller internett addresser.", -1, 97, 7, 195, 28 + LTEXT "&Velg plasseringen for enheten:", IDC_LOCATIONITEM, 98, 46, 196, 8 EDITTEXT IDC_LOCITEMEDIT, 97, 58, 133, 14, ES_AUTOHSCROLL PUSHBUTTON "B&la gjennom...", IDC_LOCBROWSE, 233, 58, 60, 14 LTEXT "Klikk på neste for å forsette.", -1, 97, 95, 198, 8 @@ -46,10 +46,10 @@ IDD_SELPROGTITLE DIALOGEX 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Select a Title for the Program" +CAPTION "Velg en tittel for programmet" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Type a name for this shortcut:", -1, 100, 10, 194, 10 + LTEXT "&Velg et navn for denne snarveien:", -1, 100, 10, 194, 10 EDITTEXT IDC_NAMESCEDIT, 100, 23, 194, 14, ES_AUTOHSCROLL CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT LTEXT "Klikk fullført for å opprette snarveien.", -1, 100, 61, 194, 8 @@ -94,18 +94,18 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "You have the option to make this new program available to every User.", 1012, 101, 5, 194, 40 + LTEXT "Du har valget for å gjøre dette nye programmet tilgjengelig for alle brukere.", 1012, 101, 5, 194, 40 AUTORADIOBUTTON "Installere", IDC_INSTALLRB, 108, 51, 146, 14, BS_MULTILINE | WS_GROUP AUTORADIOBUTTON "Kjør", IDC_LOCATIONITEM, 108, 74, 146, 14, BS_MULTILINE | NOT WS_TABSTOP END IDD_FINISHADMINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Finish Admin Install" +CAPTION "Fullføre admin installasjon" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDB_WATERMARK, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 0, 0, WATERMARK_WIDTH, SHORTCUTDLG_HEIGHT - LTEXT "Change ini mapping back by clicking Finish.", IDC_HEADTEXT, 98, 7, 196, 40 + LTEXT "Endre ini mapper tilbake ved å trykke på Fullført.", IDC_HEADTEXT, 98, 7, 196, 40 END IDD_AFTERINST DIALOG 0, 0, SHORTCUTDLG_WIDTH, SHORTCUTDLG_HEIGHT @@ -122,8 +122,8 @@ CAPTION "Kjør installasjons program" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Please specify the uninstall program location.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 - LTEXT "&Command line for the uninstall program:", IDC_LOCATIONITEM, 9, 57, 237, 8 + LTEXT "Vennligst velg avinnstalleringsprogram plassering.", IDC_UNINSTLOCTEXT, 9, 8, 235, 37 + LTEXT "&Komando linje for avinnstalleringsprogrammet:", IDC_LOCATIONITEM, 9, 57, 237, 8 EDITTEXT IDC_LOCITEMEDIT, 7, 69, 165, 14, ES_AUTOHSCROLL PUSHBUTTON "B&la gjennom...", IDC_LOCBROWSE, 178, 69, 66, 14 DEFPUSHBUTTON "OK", IDOK, 118, 100, 60, 14 @@ -136,9 +136,9 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_WARNINGICON, 8, 10, 20, 20 - LTEXT "There are other users logged on to this computer.", -1, 37, 8, 214, 10 - LTEXT "If you uninstall this program while another user is running it, the program might not uninstall completely.", -1, 37, 23, 212, 22 - LTEXT "To properly change or remove this program, switch to and log off each user before you continue.", IDC_WARNINGTEXT, 37, 46, 212, 26 + LTEXT "Det er andre brukere som er logget på denne datamaskinen.", -1, 37, 8, 214, 10 + LTEXT "Hvis du vil avinstallere dette programmet mens en annen bruker det, vil ikke programmet bli fjernet fullstendig.", -1, 37, 23, 212, 22 + LTEXT "For å fullstendig endre eller fjerne dette programmet, bytt til og logg av alle brukere før du fortsetter.", IDC_WARNINGTEXT, 37, 46, 212, 26 PUSHBUTTON "&Bytt bruker", IDC_SWITCHUSER, 61, 81, 60, 14 PUSHBUTTON "&Fortsett", IDOK, 125, 81, 60, 14 PUSHBUTTON "Avbryt", IDCANCEL, 189, 81, 60, 14 @@ -149,7 +149,7 @@ CAPTION "Fjern snarveier/mapper" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&To remove an item from the Start menu, select the item and click Remove.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 + LTEXT "&For å fjerne en enhet fra Start menyen, velg en enhet og trykk på Fjern.", IDC_UNINSTLOCTEXT, 10, 7, 204, 16 CONTROL "", IDC_SELFOLDER, "SYSTREEVIEW32", WS_BORDER | WS_TABSTOP | 0x00000023, 10, 28, 200, 145 PUSHBUTTON "&Fjern", IDC_REMOVEBTN, 84, 182, 60, 14 DEFPUSHBUTTON "Lukk", IDOK, 151, 182, 60, 14 @@ -160,10 +160,10 @@ CAPTION "Legg til senere" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "You may choose a date and time when you would like to add this program to your computer. For example, you can schedule this to happen when you are away from your computer.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 - AUTORADIOBUTTON "&Add program later", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP + LTEXT "Du kan ha valgt en dato og tid når du vil legge til dette programmet til din datamaskin. For eksempel, kan du planlegge det som skal skje når du er borte din datamaskin.", IDC_UNINSTLOCTEXT, 7, 4, 208, 33 + AUTORADIOBUTTON "&Legg til et program senere", IDC_ADDPROGLATER, 7, 47, 207, 10, WS_GROUP CONTROL "Picker", 12368, "SYSDATETIMEPICK32", WS_BORDER | WS_TABSTOP | 0x0000000C, 29, 62, 107, 14 - AUTORADIOBUTTON "&Do not add program", IDC_NOTADDPROG, 7, 87, 208, 10 + AUTORADIOBUTTON "&Ikke legg til programmer", IDC_NOTADDPROG, 7, 87, 208, 10 DEFPUSHBUTTON "OK", IDOK, 89, 141, 60, 14, WS_GROUP PUSHBUTTON "Avbryt", IDCANCEL, 154, 141, 60, 14, NOT WS_TABSTOP END @@ -172,7 +172,7 @@ BEGIN IDS_CPLSYSTEMNAME "Legg til eller fjern programmer" IDS_CPLSYSTEMDESCRIPTION "Innstaller eller fjern programmer og ReactOS komponenter." - IDS_UNABLEOPEN_UNINSTKEY "Unable to open Uninstall Key" + IDS_UNABLEOPEN_UNINSTKEY "Ikke mulig å åpne avinnstallering nøkkel" IDS_LIST_TITLE "Liste" IDS_SIZE_TITLE "Størrelse (MB)" IDS_LAST_USED "Sist bruk" @@ -180,11 +180,11 @@ IDS_PROGRAMS_ONLY "Bare programmer" IDS_UPDATES_ONLY "Bare oppdateringer" IDS_WELCOME_TITLE "Velkommen til assistenten for å legg til eller fjerne programmer" - IDS_WELCOME_MSG "Please choose a category on the left or select application on the list for removing or viewing information." + IDS_WELCOME_MSG "Venligst velg en kategori til venstre eller velg et program på listen for å fjerne eller vise informasjon." IDS_SEARCH_TEXT "Søk i listen..." IDS_REMOVE_BTN "&Fjern" IDS_MODIFY_BTN "&Endre" - IDS_UNABLEREAD_UNINSTSTR "Unable to read UninstallString. This entry is invalid or has been created by an MSI installer." + IDS_UNABLEREAD_UNINSTSTR "Ikke mulig å lese Avinnstallerings streng. Denne enheten er ugyldig eller har blitt opprettet av en MSI installering." IDS_INF_REG_OWNER "Registerert eier: " IDS_INF_PRODUCT_ID "Produkt ID: " IDS_INF_PUBLISHER "Utgiver: " @@ -193,7 +193,7 @@ IDS_INF_SUP_INFO "Hjelp informasjon: " IDS_INF_SUP_PHONE "Hjelp telefon: " IDS_INF_PRODUCT_UPD "Produkt oppdateringer: " - IDS_INF_README "Readme: " + IDS_INF_README "Les meg: " IDS_INF_COMMENTS "Kommentarer: " IDS_NO_INFORMATION "Ingen informasjon om dette programmet." END Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -37,8 +37,8 @@ UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 LTEXT "minutter", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Spør etter &passord ved gjennopptakelse.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 + CONTROL "Krev &passord ved gjenopptakelse.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 125, 19 GROUPBOX "&Strømsparing funksjon", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "For å tilpasse strøminnstillingene for din skjerm, klikk på strøm innstillingene.", IDC_STATIC, 14, 166, 146 ,20 @@ -53,7 +53,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 7 + LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 END @@ -70,23 +70,23 @@ LTEXT "Element:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Størrelse", IDC_ADVAPPEARANCE_SIZE_T, 142, 164, 20, 9 + LTEXT "&Størrelse", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 64, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 - LTEXT "&Farge 1:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + LTEXT "&Farge 1:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 44, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "&Farge 2:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + LTEXT "&Farge 2:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 44, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Skrift:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + LTEXT "Skrift:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 60, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Skrift størrelse:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 41, 8 + LTEXT "Størrelse:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 64, 8 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL - LTEXT "Farger:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 194, 20, 9 + LTEXT "Farger:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 25, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE @@ -108,7 +108,7 @@ GROUPBOX "&Skjermområde",1818,3,127,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 - LTEXT "Mindre",1815,9,137,15,8,NOT WS_GROUP + LTEXT "Mindre",1815,9,137,21,8,NOT WS_GROUP LTEXT "Mere",1816,93,137,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Farger",1817,125,127,115,43 @@ -149,7 +149,7 @@ MENUITEM "&Primary", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identify", ID_MENU_IDENTIFY - MENUITEM "P&roperties", ID_MENU_PROPERTIES + MENUITEM "E&genskaper", ID_MENU_PROPERTIES END END @@ -204,7 +204,7 @@ IDS_ELEMENT_4 "Caption of active windows" IDS_ELEMENT_5 "Border of active windows" IDS_ELEMENT_6 "Meny" - IDS_ELEMENT_7 "Selected Items" + IDS_ELEMENT_7 "Valgt enhet" IDS_ELEMENT_8 "Vindu" IDS_ELEMENT_9 "Scrollbars" IDS_ELEMENT_10 "3D objects" Modified: trunk/reactos/dll/cpl/main/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -8,14 +8,14 @@ GROUPBOX "Repetisjonshastighet", -1, 5, 5, 236, 135 ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 13, 18, 15, 15 LTEXT "Repetisjon&forsinkelse:", -1, 40, 18, 100, 10 - LTEXT "Lang", -1, 40, 33, 20, 10 - LTEXT "Kort", -1, 200, 33, 20, 10 - CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 33, 130, 17 + LTEXT "Lang", -1, 40, 33, 52, 10 + LTEXT "Kort", -1, 210, 33, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 75, 33, 130, 17 ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 13, 70, 15, 15 LTEXT "&Repetisjonshastighet:", -1, 40, 70, 100, 10 - LTEXT "Langsom", -1, 40, 85, 20, 10 - LTEXT "Rask", -1, 200, 85, 20, 10 - CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 + LTEXT "Langsom", -1, 40, 85, 62, 10 + LTEXT "Rask", -1, 210, 85, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 75, 85, 130, 17 LTEXT "Klikk her og hold nede en tast for å &teste repetisjonshastigheten:", -1, 15, 105, 216, 10 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 116, 216, 14, WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "Markør&blinking:", -1, 5, 145, 236, 50 @@ -37,12 +37,12 @@ CAPTION "Klikklås" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Kort", -1, 50, 35, 27, 10 - LTEXT "Langt", -1, 157, 35, 27, 10 + LTEXT "Kort tid", -1, 50, 35, 40, 10 + LTEXT "Langt tid", -1, 157, 35, 40, 10 CONTROL "",IDC_SLIDER_CLICK_LOCK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 78, 35, 70, 17 PUSHBUTTON "&OK", IDOK, 110, 59, 60, 14 PUSHBUTTON "&Avbryt", IDCANCEL, 174, 59, 60, 14 - LTEXT "&Adjust how long you need to hold down a mouse or trackball button before your click is locked",-1,37,5,200,27 + LTEXT "&Juster hvor lenge du må holde mus eller styrekuleknappen nede før klikket er låst.",-1,37,5,200,27 ICON IDI_LOOK_KEY, IDC_ICON_CLICK_LOCK, 5, 5, 15, 15 END @@ -57,9 +57,10 @@ LTEXT "Merk av i denne avmerkningsboksen for å gjøre knappen til høyre til den du bruker til primærfunksjoner som å velge å dra.", -1, 10, 36, 156, 30 GROUPBOX "Hastighet på dobbeltklikking", -1, 5, 78, 236, 70 LTEXT "Dobbeltklikk mappen for å teste innstillingen. Hvis mappen ikke lukkes eller åpnes, kan du prøve med en langsommere innstilling.", -1, 10, 90, 156, 28 - LTEXT "Hastig&het: Langsom", -1, 10, 123, 50, 10 - LTEXT "Rask", -1, 136, 123, 24, 10 - CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 123, 70, 17 + LTEXT "Hastig&het:", -1, 10, 123, 90, 10 + LTEXT "Langsom", -1, 10, 130, 90, 10 + LTEXT "Rask", -1, 140, 130, 24, 10 + CONTROL "",IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 40, 130, 90, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 171, 87, 65, 57, WS_EX_STATICEDGE GROUPBOX "Klikklås", -1, 5, 150, 236, 70 CHECKBOX "&Slå på klikklås", IDC_CHECK_CLICK_LOCK, 10, 160, 70, 20 @@ -86,10 +87,10 @@ IDD_CURSOR_SCHEME_SAVEAS DIALOGEX 0, 0, 192, 53 STYLE DS_SHELLFONT | WS_CAPTION | WS_SYSMENU -CAPTION "Lagre Scheme" +CAPTION "Lagre oppsett" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Lagre denne cursor scheme som:", -1, 5, 5, 181, 10 + LTEXT "Lagre dette markøroppsettet som:", -1, 5, 5, 190, 10 EDITTEXT IDC_EDIT_SCHEME_NAME, 5, 15, 180, 15, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&OK", IDOK, 63, 35, 60, 14 PUSHBUTTON "&Avbryt", IDCANCEL, 126, 35, 60, 14 @@ -103,7 +104,7 @@ BEGIN GROUPBOX "Bevegelse", -1, 5, 5, 236, 60 LTEXT "Ve&lg en pekehastighet:", -1, 52, 15, 110, 10 - LTEXT "Langsomt", -1, 60, 30, 20, 10 + LTEXT "Langsom", -1, 54, 30, 40, 10 CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 LTEXT "Rask", -1, 170, 30, 20, 10 ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 18, 20, 32, 32 @@ -134,7 +135,7 @@ ICON IDI_MOUSE_WHEEL, IDC_ICON_WHEEL, 20, 20, 32, 32 LTEXT "Rull hjulet ett hakk for å rulle:", -1, 60, 15, 150, 10 RADIOBUTTON "Følgende &antall linjer om gangen:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP - RADIOBUTTON "&En skjermhøyde av gangen", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + RADIOBUTTON "&En skjermhøyde av gangen", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 150, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END @@ -146,27 +147,27 @@ IDS_CPLNAME_2 "Tastatur" IDS_CPLDESCRIPTION_2 "Endre tastatur innstillinger." IDS_ARROW "Vanlig merkering" - IDS_HELP "Hjelp valg" + IDS_HELP "Hjelpemerking" IDS_APPSTARTING "Arbeider i bakgrunnen" - IDS_WAIT "Busy" - IDS_CROSSHAIR "Precision Select" - IDS_IBEAM "Tekst valgt" - IDS_NWPEN "Handskriving" - IDS_NO "Utilgjengelig" - IDS_SIZENS "Vertical Resize" - IDS_SIZEWE "Horizontal Resize" - IDS_SIZENWSE "Diagonal Resize 1" - IDS_SIZENESW "Diagonal Resize 2" + IDS_WAIT "Opptatt" + IDS_CROSSHAIR "Presisjonsmerking" + IDS_IBEAM "Tekstmerking" + IDS_NWPEN "Handskrift" + IDS_NO "Ikke tilgjengelig" + IDS_SIZENS "Endre størrelse loddrett" + IDS_SIZEWE "Endre størrelse vannrett" + IDS_SIZENWSE "Endre størrelse diagonalt 1" + IDS_SIZENESW "Endre størrelse diagonalt 2" IDS_SIZEALL "Flytt" - IDS_UPARROW "Alternative Select" - IDS_HAND "Link Select" + IDS_UPARROW "Valg alternativ" + IDS_HAND "Koblingspeker" IDS_NONE "(Ingen)" - IDS_SYSTEM_SCHEME "(system scheme)" - IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_SYSTEM_SCHEME "(systemoppsett)" + IDS_BROWSE_FILTER "Markører (*.ani, *.cur)\0*.ani;*.cur\0Animerte markører (*.ani)\0*.ani\0Statiske markører (*.cur)\0*.cur\0Alle filer\0*.*\0\0" IDS_BROWSE_TITLE "Bla gjennom" - IDS_REMOVE_TITLE "Confirm Cursor Scheme Removal" - IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" - IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" - IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" - IDS_ANIMATE_CURSOR "Animated Cursor" + IDS_REMOVE_TITLE "Bekreft markøroppsett fjerning" + IDS_REMOVE_TEXT "Er du sikker på at du vil fjerne the markøroppsett '%s'?" + IDS_OVERWRITE_TITLE "Bekreft markøroppsett overskrivning" + IDS_OVERWRITE_TEXT "Følgene markøroppsett navnet som du valgte er i bruk. Vil du overskrive eksisterende markøroppsett?" + IDS_ANIMATE_CURSOR "Animerte markør" END Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -49,7 +49,7 @@ CAPTION "Avansert" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Du må være logget på som administrator for å kunne endre de fleste av disse innstillingene.", IDC_STATIC, 12, 5, 236, 8 + LTEXT "Du må være logget på som administrator for å kunne endre innstillingene.", IDC_STATIC, 12, 5, 255, 8 GROUPBOX "Ytelse", IDC_STATIC, 6, 18, 244, 50 LTEXT "Visuelle effekter, prosesorplanlegging, minnebruk og virtuelt minne.", IDC_STATIC, 16, 29, 228, 17 PUSHBUTTON "Innstillinger", IDC_PERFOR, 194, 48, 50, 15 @@ -177,15 +177,15 @@ LTEXT "Sidevekslingsfilstørrelse (MB)", IDC_STATIC, 115, 5, 96, 9 LISTBOX IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS GROUPBOX "Sidevekslingsfilstørrelse for valgte enhet", IDC_DRIVEGROUP, 10, 70, 204, 104 - LTEXT "Stasjon:", IDC_STATIC, 20, 80, 20, 8 - LTEXT "", IDC_DRIVE, 88, 81, 100, 9 - LTEXT "Tilgjengelig ledig plass:", IDC_STATIC, 20, 92, 56, 9 - LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 + LTEXT "Stasjon:", IDC_STATIC, 20, 80, 24, 8 + LTEXT "", IDC_DRIVE, 100, 81, 100, 9 + LTEXT "Tilgjengelig ledig plass:", IDC_STATIC, 20, 92, 75, 9 + LTEXT "", IDC_SPACEAVAIL, 100, 92, 104, 9 LTEXT "&Startstørrelse (MB):", -1, 22, 118, 75, 9 LTEXT "Ma&ksimalt størrelse (MB):", -1, 22, 131, 75, 9 - AUTORADIOBUTTON "&Tilpass størrelse", IDC_CUSTOM, 20, 105, 54, 9, WS_GROUP + AUTORADIOBUTTON "&Tilpass størrelse", IDC_CUSTOM, 20, 105, 69, 9, WS_GROUP AUTORADIOBUTTON "S&ystem styrt størrelse", IDC_SYSMANSIZE, 20, 145, 88, 9 - AUTORADIOBUTTON "&Ingen sidevekslingsfil", IDC_NOPAGEFILE, 20, 158, 78,9 + AUTORADIOBUTTON "&Ingen sidevekslingsfil", IDC_NOPAGEFILE, 20, 158, 79,9 EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE PUSHBUTTON "Still", IDC_SET, 158, 155, 50, 13 @@ -234,9 +234,9 @@ CAPTION "Rediger variabel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Variabel &Navn:", IDC_STATIC, 7, 14, 50, 8 + LTEXT "Variabel &navn:", IDC_STATIC, 7, 14, 50, 8 EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL - LTEXT "Variabel &Verdi:", IDC_STATIC, 7, 32, 50, 8 + LTEXT "Variabel &verdi:", IDC_STATIC, 7, 32, 50, 8 EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 PUSHBUTTON "Avbryt", IDCANCEL, 170, 50, 50, 14 @@ -256,12 +256,12 @@ STRINGTABLE DISCARDABLE BEGIN IDS_CPLSYSTEMNAME "System" - IDS_CPLSYSTEMDESCRIPTION "See information about your computer and change various system and hardware settings." + IDS_CPLSYSTEMDESCRIPTION "Se informasjon om din datamaskin og endre forskjellig system og maskinvare innstilling." IDS_MEGABYTE "MB Systemminne" IDS_GIGABYTE "GB Systemminne" IDS_TERABYTE "TB Systemminne" IDS_PETABYTE "PB Systemminne" - IDS_VARIABLE "Variable" + IDS_VARIABLE "Variabel" IDS_VALUE "Verdi" IDS_NO_DUMP "(Ingen)" IDS_MINI_DUMP "Minidump(64KB)" Added: trunk/reactos/dll/cpl/telephon/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/no-N… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/no-NO.rc (added) +++ trunk/reactos/dll/cpl/telephon/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -1,0 +1,16 @@ +// Norwegian (no) resources by LMH1 + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGE DIALOGEX 0, 0, 246, 230 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Telefon og Modem valg" + IDS_CPLSYSTEMDESCRIPTION "Konfigurer din telefon nummerslåing regler og modem innstillinger." +END Propchange: trunk/reactos/dll/cpl/telephon/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/telephon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/rsrc.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -8,6 +8,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/dll/win32/netid/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/no-NO… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/no-NO.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -17,7 +17,7 @@ PUSHBUTTON "&Nettverk-ID...", IDC_NETWORK_ID, 190, 114, 58, 15 LTEXT "Klikk Endre for å gi datamaskinen et nytt navn eller bli med i et domenet.", IDC_STATIC, 6, 149, 170, 17 PUSHBUTTON "&Endre...",IDC_NETWORK_PROPERTY, 190, 149, 58, 15 - LTEXT "OBS: Bare Administratorer kan endre disse innstillingene på denne datamaskinen.", IDC_STATIC, 6, 179, 300, 9 + LTEXT "OBS: Bare Administratorer kan endre disse innstillingene på datamaskinen.", IDC_STATIC, 6, 179, 300, 9 END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 @@ -60,15 +60,15 @@ BEGIN 1 "* Ukjent *" 2 "ARBEIDSGRUPPE" - 3 "The following error occurred while attempting to read domain membership information:" + 3 "Følgende feil har oppstått mens datamaskinen prøvde å lese domene medlemskap informasjon:" 4 "Endring i datamaskinnavn" 5 "Arbeidsgruppe:" 6 "Domene:" 22 "Velkommen til %1 arbeidsgruppen." 23 "Velkommen til %1 domene." 24 "Du må starte denne datamaskinen på nytt for at endringene skal tre i kraft." - 1021 "Note: Only Administrators can change the identification of this computer." - 1022 "Note: The identification of the computer cannot be changed because:" + 1021 "OBS: Bare administratorer kan endre identifisering for denne datamaskinen." + 1022 "OBS: Identifisering for datamaskinen kunne ikke endres fordi:" 3210 "&Detaljer >>" 3220 "<< &Detaljer" END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -207,18 +207,18 @@ BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 8, 35, 50, 10 - LTEXT "Folder", 14005, 68, 35, 160, 10 - LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "Tipo del file:", 14004, 8, 35, 50, 10 + LTEXT "Cartella", 14005, 68, 35, 160, 10 + LTEXT "Posizione:", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 315, 10 - LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "Dimensione:", 14008, 8, 72, 45, 10 LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "Contenente:", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "Creato:", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 - AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 + AUTOCHECKBOX "&Sola lettura", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "&Nascosto", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -569,11 +569,11 @@ CAPTION "Check Disk" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 - PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + DEFPUSHBUTTON "Inizia", IDOK, 53, 100, 60, 14 + GROUPBOX "Opzioni per la verifica del disco", -1, 7, 6, 179, 50 + PUSHBUTTON "Annulla", IDCANCEL, 118, 100, 60, 14 + AUTOCHECKBOX "Correggi automaticamente gli errori", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "&Ricerca dei settori difettosi e tentativo di correzione", 14001, 16, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -606,25 +606,25 @@ IDS_SHV_COLUMN9 "Commenti" IDS_SHV_COLUMN10 "Proprietario" IDS_SHV_COLUMN11 "Gruppo" - IDS_SHV_COLUMN12 "Filename" - IDS_SHV_COLUMN13 "Category" + IDS_SHV_COLUMN12 "Nome file" + IDS_SHV_COLUMN13 "Categoria" IDS_SHV_COLUMN_DELFROM "Posizione originale" IDS_SHV_COLUMN_DELDATE "Data di cancellazione" - IDS_SHV_COLUMN_FONTTYPE "Fonttype" - IDS_SHV_COLUMN_WORKGROUP "Workgroup" - IDS_SHV_NETWORKLOCATION "Network Location" - IDS_SHV_COLUMN_DOCUMENTS "Documents" - IDS_SHV_COLUMN_STATUS "Status" - IDS_SHV_COLUMN_COMMENTS "Comments" - IDS_SHV_COLUMN_LOCATION "Location" - IDS_SHV_COLUMN_MODEL "Model" + IDS_SHV_COLUMN_FONTTYPE "Tipo di font" + IDS_SHV_COLUMN_WORKGROUP "Gruppo di lavoro" + IDS_SHV_NETWORKLOCATION "Posizione in rete" + IDS_SHV_COLUMN_DOCUMENTS "Documenti" + IDS_SHV_COLUMN_STATUS "Stato" + IDS_SHV_COLUMN_COMMENTS "Commenti" + IDS_SHV_COLUMN_LOCATION "Posizione" + IDS_SHV_COLUMN_MODEL "Modello" /* special folders */ IDS_DESKTOP "Desktop" IDS_MYCOMPUTER "Risorse del Computer" IDS_RECYCLEBIN_FOLDER_NAME "Cestino" IDS_CONTROLPANEL "Pannello di controllo" - IDS_ADMINISTRATIVETOOLS "Administrative Tools" + IDS_ADMINISTRATIVETOOLS "Strumenti di amministrazione" /* context menus */ IDS_VIEW_LARGE "&Icone Grandi" @@ -638,10 +638,10 @@ IDS_DELETE "&Cancella" IDS_PROPERTIES "&Proprietà" IDS_CUT "&Taglia" - IDS_RESTORE "Restore" - IDS_FORMATDRIVE "Format..." - IDS_RENAME "Rename" - IDS_INSERT "Insert" + IDS_RESTORE "Ripristina" + IDS_FORMATDRIVE "Formatta..." + IDS_RENAME "Rinomina" + IDS_INSERT "Inserisci" IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." IDS_CREATEFOLDER_CAPTION "Errore durante la creazione della cartella" @@ -663,9 +663,9 @@ /* message box strings */ IDS_RESTART_TITLE "Riavvia" - IDS_RESTART_PROMPT "Vuoi simulare un riavvio do Windows?" + IDS_RESTART_PROMPT "Volete riavviare il sistema?" IDS_SHUTDOWN_TITLE "Termina sessione" - IDS_SHUTDOWN_PROMPT "Vuoi terminare la sessione di ReactOS?" + IDS_SHUTDOWN_PROMPT "Volete terminare la sessione di ReactOS?" /* shell folder path default values */ IDS_PROGRAMS "Menu Avvio\\Programmi" @@ -679,7 +679,7 @@ IDS_MYVIDEO "Video" IDS_DESKTOPDIRECTORY "Desktop" IDS_NETHOOD "Rete" - IDS_TEMPLATES "Templates" + IDS_TEMPLATES "Modelli" IDS_APPDATA "DatiApplicazioni" IDS_PRINTHOOD "Stampanti" IDS_LOCAL_APPDATA "Impostazioni locali\\Dati Applicazioni" @@ -727,7 +727,7 @@ IDS_CUR_FILE "Cursore" IDS_DLL_FILE "Estensione di applicazione" IDS_DRV_FILE "Device Driver" - IDS_EXE_FILE "Applicatione" + IDS_EXE_FILE "Applicazione" IDS_FON_FILE "Font" IDS_TTF_FILE "TrueType Font" IDS_HLP_FILE "Help File" @@ -735,18 +735,18 @@ IDS_LNK_FILE "Collegamento" IDS_SYS_FILE "File di sistema" - IDS_OPEN_VERB "Open" - IDS_RUNAS_VERB "Run as " - IDS_EDIT_VERB "Edit" - IDS_FIND_VERB "Find" - IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" - - 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" -END + IDS_OPEN_VERB "Apri" + IDS_RUNAS_VERB "Eseguire come " + IDS_EDIT_VERB "Modifica" + IDS_FIND_VERB "Cerca" + IDS_PRINT_VERB "Stampa" + IDS_PLAY_VERB "Mostra" + IDS_PREVIEW_VERB "Anteprima" + + IDS_FILE_FOLDER "%u File, %u Cartelle" + IDS_PRINTERS "Stampanti" + IDS_FONTS "Font" + IDS_INSTALLNEWFONT "Installazione nuovi Font..." + + IDS_DEFAULT_CLUSTER_SIZE "Dimensione predefinita di allocazione" +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -335,7 +335,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Które konto u¿ytkownika chcesz u¿yæ do uruchomienia tego programu?", -1, 10, 20, 220, 20 - CHECKBOX "Bierz¹cy u¿ytkownik %s", 14000, 10, 45, 150, 10 + CHECKBOX "Bie¿¹cy u¿ytkownik %s", 14000, 10, 45, 150, 10 LTEXT "Zabezpiecz mój komputer i dane przed nieautoryzowanym dzia³aniem programów", -1, 25, 57, 200, 10, WS_DISABLED CHECKBOX "Ta opcja mo¿e zabezpieczyæ twój komputer lub dane na nim przed szkodliwymi programami, ale u¿ycie jej mo¿e spowodowaæ nieprawid³owe dzia³anie programów.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "Nastêpuj¹cy u¿ytkownik:", 14002, 10, 100, 90, 10 @@ -396,8 +396,8 @@ GROUPBOX "Dzia³anie przycisków myszki", -1, 7, 110, 249, 60 ICON "", 30111, 14, 120, 21, 20, SS_REALSIZECONTROL AUTORADIOBUTTON "&Pojedyncze klikniêcie by otworzyæ cel (najechanie by wskazaæ)", 14007, 40, 120, 170, 10, WS_TABSTOP - AUTORADIOBUTTON "Underline icon titles consistent with my &browser", 14008, 50, 132, 170, 10, WS_TABSTOP - AUTORADIOBUTTON "Underline icon titles only when I &point at them", 14009, 50, 144, 170, 10, WS_TABSTOP + AUTORADIOBUTTON "Podkre&laj tytu³y ikon tak jak w przegl¹darce", 14008, 50, 132, 170, 10, WS_TABSTOP + AUTORADIOBUTTON "Podkrelaj &tytu³y ikon tylko po najechaniu na nie kursorem", 14009, 50, 144, 170, 10, WS_TABSTOP AUTORADIOBUTTON "Po&dwójne klikniêcie by otworzyæ (pojedyncze klikniêcie by wskazaæ)", 14010, 40, 156, 170, 10, WS_TABSTOP PUSHBUTTON "&Ustawienia domylne", 14011, 180, 180, 60, 14, WS_TABSTOP END @@ -572,14 +572,14 @@ CHKDSK_DLG DIALOGEX 50, 50, 194, 120 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Check Disk" +CAPTION "Sprawdzanie dysków" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 - PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 + GROUPBOX "Opcje sprawdzania dysków", -1, 7, 6, 179, 50 + PUSHBUTTON "Anuluj", IDCANCEL, 118, 100, 60, 14 + AUTOCHECKBOX "Automatycznie naprawiaj b³êdy systemu plików", 14000, 16, 15, 155, 10 + AUTOCHECKBOX "&Szukaj i próbuj odzyskaæ uszkodzone sektory", 14001, 16, 30, 165, 10 CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 LTEXT "", 14003, 60, 80, 170, 10 END @@ -630,7 +630,7 @@ IDS_MYCOMPUTER "Mój komputer" IDS_RECYCLEBIN_FOLDER_NAME "Kosz" IDS_CONTROLPANEL "Panel Sterowania" - IDS_ADMINISTRATIVETOOLS "Administrative Tools" + IDS_ADMINISTRATIVETOOLS "Narzêdzia Administracyjne" /* context menus */ IDS_VIEW_LARGE "&Du¿e Ikony" @@ -645,9 +645,9 @@ IDS_PROPERTIES "W³aciwoci" IDS_CUT "Wytnij" IDS_RESTORE "Przywróæ" - IDS_FORMATDRIVE "Format..." - IDS_RENAME "Rename" - IDS_INSERT "Insert" + IDS_FORMATDRIVE "Formatuj..." + IDS_RENAME "Zmieñ nazwê" + IDS_INSERT "W³ó¿" IDS_CREATEFOLDER_DENIED "Nie mogê utworzyæ nowego katalogu: Brak dostêpu." IDS_CREATEFOLDER_CAPTION "B³¹d przy tworzeniu nowego katalogu." @@ -697,9 +697,9 @@ IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" IDS_COMMON_DOCUMENTS "Dokumenty" IDS_ADMINTOOLS "Menu Start\\Programy\\Narzêdzia administracyjne" - IDS_COMMON_MUSIC "Documenty\\Moja muzyka" - IDS_COMMON_PICTURES "Documenty\\Moje obrazy" - IDS_COMMON_VIDEO "Documenty\\Moje wideo" + IDS_COMMON_MUSIC "Dokumenty\\Moja muzyka" + IDS_COMMON_PICTURES "Dokumenty\\Moje obrazy" + IDS_COMMON_VIDEO "Dokumenty\\Moje wideo" IDS_CDBURN_AREA "Ustawienia lokalne\\Dane aplikacji\\Microsoft\\Nagrywanie dysków CD" IDS_NETWORKPLACE "Moja sieæ" @@ -754,5 +754,5 @@ IDS_FONTS "Czcionki" IDS_INSTALLNEWFONT "Zainstaluj Now¹ Czcionkê..." - IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_DEFAULT_CLUSTER_SIZE "Domylny rozmiar jednostki alokacji" +END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Tue Aug 19 11:32:35 2008 @@ -13,6 +13,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc"

1 0

[cgutman] 35454: - SEHify LockRequest - Free everything and return if MmMapLockedPages fails
by cgutman＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: cgutman Date: Tue Aug 19 11:23:01 2008 New Revision: 35454 URL: http://svn.reactos.org/svn/reactos?rev=35454&view=rev Log: - SEHify LockRequest - Free everything and return if MmMapLockedPages fails Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Tue Aug 19 11:23:01 2008 @@ -15,6 +15,8 @@ /* Lock a method_neither request so it'll be available from DISPATCH_LEVEL */ PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { + BOOLEAN LockFailed = FALSE; + Irp->MdlAddress = IoAllocateMdl( IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, IrpSp->Parameters.DeviceIoControl.InputBufferLength, @@ -22,9 +24,27 @@ FALSE, NULL ); if( Irp->MdlAddress ) { - MmProbeAndLockPages( Irp->MdlAddress, KernelMode, IoModifyAccess ); + _SEH_TRY { + MmProbeAndLockPages( Irp->MdlAddress, KernelMode, IoModifyAccess ); + } _SEH_HANDLE { + LockFailed = TRUE; + } _SEH_END; + + if( LockFailed ) { + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + IrpSp->Parameters.DeviceIoControl.Type3InputBuffer = MmMapLockedPages( Irp->MdlAddress, KernelMode ); + + if( !IrpSp->Parameters.DeviceIoControl.Type3InputBuffer ) { + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + return IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; } else return NULL; }

1 0

[cgutman] 35453: - MmMapLockedPages takes KPROCESSOR_MODE not LOCK_OPERATION as the second parameter
by cgutman＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: cgutman Date: Tue Aug 19 11:06:36 2008 New Revision: 35453 URL: http://svn.reactos.org/svn/reactos?rev=35453&view=rev Log: - MmMapLockedPages takes KPROCESSOR_MODE not LOCK_OPERATION as the second parameter Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Tue Aug 19 11:06:36 2008 @@ -143,7 +143,7 @@ if( NT_SUCCESS(Status) ) { TransAddr = (PTRANSPORT_ADDRESS)MmMapLockedPages - ( Mdl, IoModifyAccess ); + ( Mdl, Irp->RequestorMode ); } if( TransAddr )

1 0

[gbrunmar] 35452: * Removed d3d9's dependency on the missing strsafe library * Replaced .def file with a .spec file
by gbrunmar＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: gbrunmar Date: Tue Aug 19 10:42:23 2008 New Revision: 35452 URL: http://svn.reactos.org/svn/reactos?rev=35452&view=rev Log: * Removed d3d9's dependency on the missing strsafe library * Replaced .def file with a .spec file Added: trunk/reactos/dll/directx/d3d9/d3d9.spec (with props) Removed: trunk/reactos/dll/directx/d3d9/d3d9.def Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_caps.c trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/format.c trunk/reactos/include/psdk/d3d9types.h Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -10,10 +10,10 @@ #include "d3d9_common.h" #include <d3d9.h> #include <ddraw.h> -#include <strsafe.h> #include <debug.h> #include <d3dhal.h> #include "d3d9_private.h" +#include "d3d9_helpers.h" #include "adapter.h" #define D3D9_CAPS1 (D3DCAPS_READ_SCANLINE) @@ -58,7 +58,7 @@ if (ERROR_SUCCESS == RegQueryValueExA(hKey, "InstalledDisplayDrivers", 0, &Type, (LPBYTE)pIdentifier->Driver, &DriverNameLength)) { pIdentifier->Driver[DriverNameLength] = '\0'; - StringCbCatA(pIdentifier->Driver, MAX_DEVICE_IDENTIFIER_STRING, ".dll"); + SafeAppendString(pIdentifier->Driver, MAX_DEVICE_IDENTIFIER_STRING, ".dll"); bResult = TRUE; } Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -11,7 +11,6 @@ #include "d3d9_helpers.h" #include "d3d9_create.h" #include <debug.h> -#include <strsafe.h> #define DEBUG_MESSAGE_BUFFER_SIZE 512 @@ -25,31 +24,31 @@ "Recompile the application against the appropriate SDK for the installed runtime.\n" "\n"; -HRESULT Direct3DShaderValidatorCreate9(void) +HRESULT WINAPI Direct3DShaderValidatorCreate9(void) { UNIMPLEMENTED return 0; } -HRESULT PSGPError(void) +HRESULT WINAPI PSGPError(void) { UNIMPLEMENTED return 0; } -HRESULT PSGPSampleTexture(void) +HRESULT WINAPI PSGPSampleTexture(void) { UNIMPLEMENTED return 0; } -HRESULT DebugSetLevel(void) +HRESULT WINAPI DebugSetLevel(void) { UNIMPLEMENTED return 0; } -HRESULT DebugSetMute(DWORD dw1) +HRESULT WINAPI DebugSetMute(DWORD dw1) { UNIMPLEMENTED return 0; @@ -86,7 +85,7 @@ if (SDKVersion & DX_D3D9_DEBUG) { HRESULT hResult; - hResult = StringCbPrintfA(DebugMessageBuffer, DEBUG_MESSAGE_BUFFER_SIZE, D3dError_WrongSdkVersion, NoDebugSDKVersion, D3D_SDK_VERSION); + hResult = SafeFormatString(DebugMessageBuffer, DEBUG_MESSAGE_BUFFER_SIZE, D3dError_WrongSdkVersion, NoDebugSDKVersion, D3D_SDK_VERSION); if (SUCCEEDED(hResult)) OutputDebugStringA(DebugMessageBuffer); } Removed: trunk/reactos/dll/directx/d3d9/d3d9.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.def?… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.def [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.def (removed) @@ -1,8 +1,0 @@ -LIBRARY d3d9 -EXPORTS - Direct3DShaderValidatorCreate9 - PSGPError - PSGPSampleTexture - DebugSetLevel - DebugSetMute - Direct3DCreate9 Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll" baseaddress="0x4fdd0000"> - <importlibrary definition="d3d9.def" /> + <importlibrary definition="d3d9.spec.def" /> <library>advapi32</library> <library>kernel32</library> @@ -9,7 +9,6 @@ <library>gdi32</library> <library>uuid</library> <library>dxguid</library> - <library>strsafe</library> <library>version</library> <library>d3d8thk</library> @@ -22,4 +21,5 @@ <file>adapter.c</file> <file>format.c</file> <file>d3d9.rc</file> + <file>d3d9.spec</file> </module> Added: trunk/reactos/dll/directx/d3d9/d3d9.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.spec… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.spec (added) +++ trunk/reactos/dll/directx/d3d9/d3d9.spec [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -1,0 +1,6 @@ +@ stdcall Direct3DShaderValidatorCreate9() +@ stdcall PSGPError() +@ stdcall PSGPSampleTexture() +@ stdcall DebugSetLevel() +@ stdcall DebugSetMute(long) +@ stdcall Direct3DCreate9(long) Propchange: trunk/reactos/dll/directx/d3d9/d3d9.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/d3d9/d3d9_caps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_caps… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_caps.c [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -7,7 +7,6 @@ #include <ddrawgdi.h> #include <dll/directx/d3d8thk.h> #include <debug.h> -#include <strsafe.h> #include <limits.h> #include "d3d9_helpers.h" #include "d3d9_caps.h" @@ -98,7 +97,7 @@ } - StringCbCopyA(pUnknown6BC->szDeviceName, CCHDEVICENAME, lpszDeviceName); + SafeCopyString(pUnknown6BC->szDeviceName, CCHDEVICENAME, lpszDeviceName); //pUnknown6BC->DeviceUniq = DdQueryDisplaySettingsUniqueness(); pUnknown6BC->DeviceType = DeviceType; Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -13,7 +13,6 @@ #include <debug.h> #include <ddrawi.h> #include <ddrawgdi.h> -#include <strsafe.h> static const GUID DISPLAY_GUID = { 0x67685559, 0x3106, 0x11D0, { 0xB9, 0x71, 0x00, 0xAA, 0x00, 0x34, 0x2F, 0x9F } }; Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -36,6 +36,59 @@ return FALSE; return TRUE; +} + +HRESULT SafeFormatString(OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ) +{ + DWORD BytesWritten; + va_list vargs; + + if (BufferSize == 0) + return DDERR_INVALIDPARAMS; + + va_start(vargs, FormatString); + BytesWritten = _vsnprintf(Buffer, BufferSize-1, FormatString, vargs); + + if (BytesWritten < BufferSize) + return DDERR_GENERIC; + + Buffer[BufferSize-1] = '\0'; + + return ERROR_SUCCESS; +} + +HRESULT SafeCopyString(OUT LPSTR Dst, IN DWORD DstSize, IN LPCSTR Src) +{ + HRESULT hr = ERROR_SUCCESS; + + if (Dst == NULL || DstSize == 0 || Src == NULL) + return DDERR_INVALIDPARAMS; + + while (*Src != '\0' && DstSize > 0) + { + *Dst++ = *Src++; + --DstSize; + } + + if (DstSize == 0) + { + --Dst; + hr = DDERR_GENERIC; + } + + return hr; +} + +HRESULT SafeAppendString(IN OUT LPSTR Dst, IN DWORD DstSize, IN LPCSTR Src) +{ + DWORD CurrentDstLength; + + if (Dst == NULL || DstSize == 0) + return DDERR_INVALIDPARAMS; + + CurrentDstLength = strlen(Dst); + + return SafeCopyString(Dst + CurrentDstLength, DstSize - CurrentDstLength, Src); } HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize) Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -15,6 +15,11 @@ /* Reads a registry value if it's of the correct value type */ BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize); +/* Safe string formatting */ +HRESULT SafeFormatString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ); +HRESULT SafeCopyString(OUT LPSTR Dst, IN DWORD DstSize, IN LPCSTR Src); +HRESULT SafeAppendString(IN OUT LPSTR Dst, IN DWORD DstSize, IN LPCSTR Src); + /* Allocates memory and returns an aligned pointer */ HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize); Modified: trunk/reactos/dll/directx/d3d9/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/format.c?… ============================================================================== --- trunk/reactos/dll/directx/d3d9/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/d3d9/format.c [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -9,6 +9,7 @@ #include "format.h" #include <ddrawi.h> #include <debug.h> +#include <d3d9types.h> BOOL IsBackBufferFormat(D3DFORMAT Format) { Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d9types.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3d9types.h [iso-8859-1] Tue Aug 19 10:42:23 2008 @@ -822,6 +822,11 @@ D3DFMT_L16 = 81, D3DFMT_D32F_LOCKABLE = 82, D3DFMT_D24FS8 = 83, + +#ifndef D3D_DISABLE_9EX + D3DFMT_D32_LOCKABLE = 84, + D3DFMT_S8_LOCKABLE = 85, +#endif D3DFMT_VERTEXDATA = 100, D3DFMT_INDEX16 = 101,

1 0

[janderwald] 35451: * Restore file with SHFileOperation
by janderwald＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: janderwald Date: Tue Aug 19 08:14:25 2008 New Revision: 35451 URL: http://svn.reactos.org/svn/reactos?rev=35451&view=rev Log: * Restore file with SHFileOperation Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c Modified: trunk/reactos/lib/recyclebin/recyclebin_v5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/recyclebin/recyclebin_… ============================================================================== --- trunk/reactos/lib/recyclebin/recyclebin_v5.c [iso-8859-1] (original) +++ trunk/reactos/lib/recyclebin/recyclebin_v5.c [iso-8859-1] Tue Aug 19 08:14:25 2008 @@ -472,6 +472,7 @@ PINFO2_HEADER pHeader; DELETED_FILE_RECORD *pRecord, *pLast; DWORD dwEntries, i; + SHFILEOPSTRUCTW op; TRACE("(%p, %s, %p)\n", This, debugstr_w(pDeletedFileName), pDeletedFile); @@ -496,7 +497,12 @@ if (pRecord->dwRecordUniqueId == pDeletedFile->dwRecordUniqueId) { /* Restore file */ - if (!MoveFileW(pDeletedFileName, pDeletedFile->FileNameW)) + ZeroMemory(&op, sizeof(op)); + op.wFunc = FO_COPY; + op.pFrom = pDeletedFileName; + op.pTo = pDeletedFile->FileNameW; + + if (!SHFileOperationW(&op)) { UnmapViewOfFile(pHeader); return HRESULT_FROM_WIN32(GetLastError());

1 0

[janderwald] 35450: * Create a IDataObject when cidl == 0 (click on TreeView) * Handle directories in ISFHelper_fnCopyItems * Should make copying directories work
by janderwald＠svn.reactos.org 19 Aug '08

19 Aug '08

Author: janderwald Date: Tue Aug 19 08:03:16 2008 New Revision: 35450 URL: http://svn.reactos.org/svn/reactos?rev=35450&view=rev Log: * Create a IDataObject when cidl == 0 (click on TreeView) * Handle directories in ISFHelper_fnCopyItems * Should make copying directories work Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c Modified: trunk/reactos/dll/win32/shell32/shfldr_fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_fs.c [iso-8859-1] Tue Aug 19 08:03:16 2008 @@ -653,10 +653,17 @@ if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { hr = CDefFolderMenu_Create2(This->pidlRoot, hwndOwner, cidl, apidl, (IShellFolder*)iface, NULL, 0, NULL, (IContextMenu**)&pObj); - } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { + } else if (IsEqualIID (riid, &IID_IDataObject)){ + if (cidl >= 1) { pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); hr = S_OK; + } + else + { + pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, (LPCITEMIDLIST*)&This->pidlRoot, 1); + hr = S_OK; + } } else if (IsEqualIID (riid, &IID_IExtractIconA) && (cidl == 1)) { pidl = ILCombine (This->pidlRoot, apidl[0]); pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); @@ -1274,9 +1281,9 @@ WCHAR szTargetPath[MAX_PATH]; SHFILEOPSTRUCTW op; LPITEMIDLIST pidl; - LPWSTR pszSrc, pszTarget; + LPWSTR pszSrc, pszTarget, pszSrcList, pszTargetList; int res; - + STRRET strRet; IGenericSFImpl *This = impl_from_ISFHelper(iface); @@ -1290,47 +1297,81 @@ IPersistFolder2_Release(ppf2); return E_FAIL; } - - if (!SHGetPathFromIDListW (pidl, szSrcPath)) + IPersistFolder2_Release(ppf2); + + if (FAILED(IShellFolder_GetDisplayNameOf(pSFFrom, pidl, SHGDN_FORPARSING, &strRet))) { SHFree (pidl); - IPersistFolder2_Release (ppf2); return E_FAIL; } + + if (FAILED(StrRetToBufW(&strRet, pidl, szSrcPath, MAX_PATH))) + { + SHFree (pidl); + return E_FAIL; + } + SHFree (pidl); + pszSrc = PathAddBackslashW (szSrcPath); + wcscpy(szTargetPath, This->sPathTarget); pszTarget = PathAddBackslashW (szTargetPath); - pszSrc = build_paths_list(szSrcPath, cidl, apidl); - pszTarget = build_paths_list(szTargetPath, cidl, apidl); - - if (!pszSrc || !pszTarget) + pszSrcList = build_paths_list(szSrcPath, cidl, apidl); + pszTargetList = build_paths_list(szTargetPath, cidl, apidl); + + if (!pszSrcList || !pszTargetList) { - if (pszSrc) - HeapFree(GetProcessHeap(), 0, pszSrc); - - if (pszTarget) - HeapFree(GetProcessHeap(), 0, pszTarget); + if (pszSrcList) + HeapFree(GetProcessHeap(), 0, pszSrcList); + + if (pszTargetList) + HeapFree(GetProcessHeap(), 0, pszTargetList); SHFree (pidl); IPersistFolder2_Release (ppf2); return E_OUTOFMEMORY; } - ZeroMemory(&op, sizeof(op)); + if (!pszSrcList[0]) + { + /* remove trailing backslash */ + pszSrc--; + pszSrc[0] = L'\0'; + op.pFrom = szSrcPath; + } + else + { + op.pFrom = pszSrcList; + } + + if (!pszTargetList[0]) + { + /* remove trailing backslash */ + if (pszTarget - szTargetPath > 3) + { + pszTarget--; + pszTarget[0] = L'\0'; + } + else + { + pszTarget[1] = L'\0'; + } + + op.pTo = szTargetPath; + } + else + { + op.pTo = pszTargetList; + } op.hwnd = GetActiveWindow(); op.wFunc = FO_COPY; - op.pFrom = pszSrc; - op.pTo = pszTarget; - op.fFlags = FOF_ALLOWUNDO; + op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMMKDIR; res = SHFileOperationW(&op); HeapFree(GetProcessHeap(), 0, pszSrc); HeapFree(GetProcessHeap(), 0, pszTarget); - - SHFree (pidl); - IPersistFolder2_Release (ppf2); if (res) return E_FAIL;

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