Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 36103: add WINE_ALLOC_SIZE macro
by cwittich＠svn.reactos.org 10 Sep '08

10 Sep '08

Author: cwittich Date: Wed Sep 10 01:52:51 2008 New Revision: 36103 URL: http://svn.reactos.org/svn/reactos?rev=36103&view=rev Log: add WINE_ALLOC_SIZE macro Modified: trunk/reactos/include/reactos/wine/winnt.h Modified: trunk/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnt… ============================================================================== --- trunk/reactos/include/reactos/wine/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnt.h [iso-8859-1] Wed Sep 10 01:52:51 2008 @@ -22,6 +22,12 @@ #define __WINE_WINNT_H #include_next <winnt.h> + +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) +#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) +#else +#define __WINE_ALLOC_SIZE(x) +#endif /* non standard; keep the number high enough (but < 0xff) */ #define LANG_ESPERANTO 0x8f

1 0

[cgutman] 36102: - Don't call IoCompleteRequest while holding a spin lock because it can cause deadlocks
by cgutman＠svn.reactos.org 10 Sep '08

10 Sep '08

Author: cgutman Date: Tue Sep 9 23:59:12 2008 New Revision: 36102 URL: http://svn.reactos.org/svn/reactos?rev=36102&view=rev Log: - Don't call IoCompleteRequest while holding a spin lock because it can cause deadlocks Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Tue Sep 9 23:59:12 2008 @@ -86,8 +86,6 @@ } UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); - AFD_DbgPrint(MID_TRACE,("Completing\n")); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); AFD_DbgPrint(MID_TRACE,("Done\n")); } @@ -112,6 +110,8 @@ KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); SignalSocket( Poll, NULL, PollReq, STATUS_TIMEOUT ); KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); + + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); AFD_DbgPrint(MID_TRACE,("Timeout\n")); } @@ -146,6 +146,9 @@ (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { ZeroEvents( PollReq->Handles, PollReq->HandleCount ); SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); + KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); } } } @@ -230,6 +233,9 @@ Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; SignalSocket( NULL, Irp, PollReq, Status ); + KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + return Status; } else { PAFD_ACTIVE_POLL Poll = NULL; @@ -383,6 +389,7 @@ KIRQL OldIrql; PAFD_POLL_INFO PollReq; PKEVENT EventSelect = NULL; + PIRP Irp; AFD_DbgPrint(MID_TRACE,("Called: DeviceExt %x FileObject %x\n", DeviceExt, FileObject)); @@ -412,13 +419,17 @@ while( ThePollEnt != &DeviceExt->Polls ) { Poll = CONTAINING_RECORD( ThePollEnt, AFD_ACTIVE_POLL, ListEntry ); - PollReq = Poll->Irp->AssociatedIrp.SystemBuffer; + Irp = Poll->Irp; + PollReq = Irp->AssociatedIrp.SystemBuffer; AFD_DbgPrint(MID_TRACE,("Checking poll %x\n", Poll)); if( UpdatePollWithFCB( Poll, FileObject ) ) { ThePollEnt = ThePollEnt->Flink; AFD_DbgPrint(MID_TRACE,("Signalling socket\n")); SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); + KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); } else ThePollEnt = ThePollEnt->Flink; }

1 0

[cgutman] 36101: - Remove the spin locks around NdisSend because it causes a crash in kvmnet
by cgutman＠svn.reactos.org 10 Sep '08

10 Sep '08

Author: cgutman Date: Tue Sep 9 22:54:46 2008 New Revision: 36101 URL: http://svn.reactos.org/svn/reactos?rev=36101&view=rev Log: - Remove the spin locks around NdisSend because it causes a crash in kvmnet Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Tue Sep 9 22:54:46 2008 @@ -595,7 +595,6 @@ PETH_HEADER EHeader; PCHAR Data; UINT Size; - KIRQL OldIrql; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)Context; TI_DbgPrint(DEBUG_DATALINK, @@ -673,13 +672,11 @@ ((PCHAR)LinkAddress)[5] & 0xff)); } - TcpipAcquireSpinLock( &Adapter->Lock, &OldIrql ); TI_DbgPrint(MID_TRACE, ("NdisSend\n")); NdisSend(&NdisStatus, Adapter->NdisHandle, NdisPacket); TI_DbgPrint(MID_TRACE, ("NdisSend %s\n", NdisStatus == NDIS_STATUS_PENDING ? "Pending" : "Complete")); - TcpipReleaseSpinLock( &Adapter->Lock, OldIrql ); /* I had a talk with vizzini: these really ought to be here. * we're supposed to see these completed by ndis *only* when

1 0

[cgutman] 36100: - Set ContextSize when we allocate it - Remove the context size check so we always create a new one now - Now we succeed regardless of the current context size
by cgutman＠svn.reactos.org 10 Sep '08

10 Sep '08

Author: cgutman Date: Tue Sep 9 21:52:22 2008 New Revision: 36100 URL: http://svn.reactos.org/svn/reactos?rev=36100&view=rev Log: - Set ContextSize when we allocate it - Remove the context size check so we always create a new one now - Now we succeed regardless of the current context size Modified: branches/aicom-network-fixes/drivers/network/afd/afd/context.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/context.c [iso-8859-1] Tue Sep 9 21:52:22 2008 @@ -39,7 +39,6 @@ NTSTATUS STDCALL AfdSetContext( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { - NTSTATUS Status = STATUS_BUFFER_TOO_SMALL; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; @@ -47,25 +46,19 @@ if( FCB->Context ) { ExFreePool( FCB->Context ); - FCB->Context = NULL; + FCB->ContextSize = 0; } - if( FCB->ContextSize < - IrpSp->Parameters.DeviceIoControl.InputBufferLength ) { - FCB->Context = - ExAllocatePool - ( PagedPool, - IrpSp->Parameters.DeviceIoControl.InputBufferLength ); + FCB->Context = ExAllocatePool( PagedPool, + IrpSp->Parameters.DeviceIoControl.InputBufferLength ); - if( !FCB->Context ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + if( !FCB->Context ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); - RtlCopyMemory( FCB->Context, - IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, - IrpSp->Parameters.DeviceIoControl.InputBufferLength ); - Status = STATUS_SUCCESS; - } + FCB->ContextSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; - AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + RtlCopyMemory( FCB->Context, + IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, + FCB->ContextSize ); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, 0, NULL ); }

1 0

[janderwald] 36099: - Free INetCfgComponent when reference count is zero - HACK: use {RandomProtocolGUID_TCPIP} for all network notification objects (As soon GUIDs are automatically generated for network components like TCPIP, this hack can be removed) - Start implementing TCP/IP Notification Object - Import TCP/IP Properties dialog from ncpa.cpl
by janderwald＠svn.reactos.org 10 Sep '08

10 Sep '08

Author: janderwald Date: Tue Sep 9 19:13:39 2008 New Revision: 36099 URL: http://svn.reactos.org/svn/reactos?rev=36099&view=rev Log: - Free INetCfgComponent when reference count is zero - HACK: use {RandomProtocolGUID_TCPIP} for all network notification objects (As soon GUIDs are automatically generated for network components like TCPIP, this hack can be removed) - Start implementing TCP/IP Notification Object - Import TCP/IP Properties dialog from ncpa.cpl Added: trunk/reactos/dll/win32/netcfgx/lang/ (with props) trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc (with props) trunk/reactos/dll/win32/netcfgx/netcfgx.rc (with props) trunk/reactos/dll/win32/netcfgx/resource.h (with props) trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c (with props) Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild trunk/reactos/dll/win32/netcfgx/precomp.h Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/inetcfgc… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Tue Sep 9 19:13:39 2008 @@ -62,6 +62,10 @@ INetCfgComponentImpl * This = (INetCfgComponentImpl*)iface; ULONG refCount = InterlockedDecrement(&This->ref); + if (!refCount) + { + CoTaskMemFree(This); + } return refCount; } @@ -332,7 +336,8 @@ INetCfgComponentControl * pNCCC; HRESULT hr; LONG lRet; - CLSID ClassGUID, InstanceGUID; + CLSID ClassGUID; + //CLSID InstanceGUID; wcscpy(szName,L"SYSTEM\\CurrentControlSet\\Control\\Network\\"); @@ -349,7 +354,8 @@ CoTaskMemFree(pStr); wcscat(szName, L"\\"); - /* get the Class GUID */ + /* get the Instance GUID */ +#if 0 hr = INetCfgComponent_GetInstanceGuid(iface, &InstanceGUID); if (FAILED(hr)) return hr; @@ -360,6 +366,11 @@ wcscat(szName, pStr); CoTaskMemFree(pStr); +#else + // HACK HACK HACK HACK HACK + wcscat(szName, L"{RandomProtocolGUID_TCPIP}"); +#endif + wcscat(szName, L"\\NDI"); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szName, 0, KEY_READ, &hKey) != ERROR_SUCCESS) @@ -433,11 +444,14 @@ hr = CreateNotificationObject(This,iface, pUnk, &This->pProperty); if (FAILED(hr)) return hr; - } - - dwDefPages = 1; + if (dwFlags == NCRP_QUERY_PROPERTY_UI) + return S_OK; + } + + dwDefPages = 0; + Pages = 0; hr = INetCfgComponentPropertyUi_MergePropPages(This->pProperty, &dwDefPages, (BYTE**)&hppages, &Pages, hwndParent, NULL); - if (FAILED(hr)) + if (FAILED(hr) || !Pages) { return hr; } @@ -446,6 +460,7 @@ pinfo.dwFlags = PSH_NOCONTEXTHELP | PSH_PROPTITLE | PSH_NOAPPLYNOW; pinfo.u3.phpage = hppages; pinfo.hwndParent = hwndParent; + pinfo.nPages = Pages; pinfo.pszCaption = This->pItem->szDisplayName; iResult = PropertySheetW(&pinfo); @@ -669,9 +684,6 @@ IEnumNetCfgComponent_Release((IEnumNetCfgComponent*)This); return S_OK; - - - return S_OK; -} - - +} + + Propchange: trunk/reactos/dll/win32/netcfgx/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Sep 9 19:13:39 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/netcfgx/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/netcfgx/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/netcfgx/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc (added) +++ trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] Tue Sep 9 19:13:39 2008 @@ -1,0 +1,26 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_TCPIP_BASIC_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Allgemein" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "IP-Einstellungen können automatisch zugewiesen werden, wenn das Netzwerk diese Funktion unterstützt. Wenden Sie sich andernfalls an den Netzwerkadministrator, um die geeigneten IP-Einstellungen zu beziehen.", -1, 9, 9, 235, 27 + CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 + LTEXT "&IP-Adresse:", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12 + LTEXT "S&ubnetzmaske:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12 + LTEXT "&Standardgateway:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12 + CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "Folgende DNS-Serveradressen &verwenden:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12 + LTEXT "&Bevorzugter DNS-Server:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12 + LTEXT "A&lternativer DNS-Server:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 + PUSHBUTTON "&Erweitert...", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +END Propchange: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] Tue Sep 9 19:13:39 2008 @@ -15,12 +15,20 @@ #include <debug.h> HINSTANCE netcfgx_hInstance; +const GUID CLSID_TcpipConfigNotifyObject = {0xA907657F, 0x6FDF, 0x11D0, {0x8E, 0xFB, 0x00, 0xC0, 0x4F, 0xD9, 0x12, 0xB2}}; + + + static INTERFACE_TABLE InterfaceTable[] = { { &CLSID_CNetCfg, INetCfg_Constructor + }, + { + &CLSID_TcpipConfigNotifyObject, + TcpipConfigNotify_Constructor }, { NULL, Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rbuild [iso-8859-1] Tue Sep 9 19:13:39 2008 @@ -19,4 +19,6 @@ <file>classfactory.c</file> <file>netcfg_iface.c</file> <file>inetcfgcomp_iface.c</file> + <file>tcpipconf_notify.c</file> + <file>netcfgx.rc</file> </module> Added: trunk/reactos/dll/win32/netcfgx/netcfgx.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.rc (added) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.rc [iso-8859-1] Tue Sep 9 19:13:39 2008 @@ -1,0 +1,18 @@ +#include <windows.h> +#include "shlobj.h" +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Network Configuration API\0" +#define REACTOS_STR_INTERNAL_NAME "netcfgx.dll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "netcfgx.dll\0" +#define REACTOS_STR_PRODUCT_VERSION "5.1.2600.3264\0" +#define REACTOS_STR_FILE_VERSION "5.1.2600.3264\0" + +#include <reactos/version.rc> + + +#include "lang/de-DE.rc" Propchange: trunk/reactos/dll/win32/netcfgx/netcfgx.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/precomp.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] Tue Sep 9 19:13:39 2008 @@ -12,6 +12,7 @@ #include <iphlpapi.h> #include <olectl.h> #include <netcfgn.h> +#include "resource.h" typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); typedef struct { @@ -47,4 +48,9 @@ HRESULT STDCALL INetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem,INetCfg * iface); HRESULT STDCALL IEnumNetCfgComponent_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv, NetCfgComponentItem * pItem, INetCfg * iface); +/* tcpipconf_notify.c */ +HRESULT WINAPI TcpipConfigNotify_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); + +extern const GUID CLSID_TcpipConfigNotifyObject; + #endif Added: trunk/reactos/dll/win32/netcfgx/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/resource… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/resource.h (added) +++ trunk/reactos/dll/win32/netcfgx/resource.h [iso-8859-1] Tue Sep 9 19:13:39 2008 @@ -1,0 +1,21 @@ +#ifndef _RESOURCE_H__ +#define _RESOURCE_H__ + +/* dialogs */ +#define IDD_TCPIP_BASIC_DLG 100 + +/* controls */ +#define IDC_USEDHCP 1000 +#define IDC_NODHCP 1001 +#define IDC_IPADDR 1002 +#define IDC_SUBNETMASK 1003 +#define IDC_DEFGATEWAY 1004 +#define IDC_AUTODNS 1005 +#define IDC_FIXEDDNS 1006 +#define IDC_DNS1 1007 +#define IDC_DNS2 1008 +#define IDC_ADVANCED 1009 + + + +#endif Propchange: trunk/reactos/dll/win32/netcfgx/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c (added) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Tue Sep 9 19:13:39 2008 @@ -1,0 +1,339 @@ +#include "precomp.h" + +typedef struct +{ + const INetCfgComponentPropertyUi * lpVtbl; + const INetCfgComponentControl * lpVtblCompControl; + LONG ref; + IUnknown * pUnknown; + INetCfg * pNCfg; + INetCfgComponent * pNComp; +}TcpipConfNotifyImpl, *LPTcpipConfNotifyImpl; + +static LPTcpipConfNotifyImpl __inline impl_from_INetCfgComponentControl(INetCfgComponentControl *iface) +{ + return (TcpipConfNotifyImpl*)((char *)iface - FIELD_OFFSET(TcpipConfNotifyImpl, lpVtblCompControl)); +} + + +HPROPSHEETPAGE +InitializePropertySheetPage(LPWSTR resname, DLGPROC dlgproc, LPARAM lParam, LPWSTR szTitle) +{ + PROPSHEETPAGEW ppage; + + memset(&ppage, 0x0, sizeof(PROPSHEETPAGEW)); + ppage.dwSize = sizeof(PROPSHEETPAGEW); + ppage.dwFlags = PSP_DEFAULT; + ppage.u.pszTemplate = resname; + ppage.pfnDlgProc = dlgproc; + ppage.lParam = lParam; + ppage.hInstance = netcfgx_hInstance; + if (szTitle) + { + ppage.dwFlags |= PSP_USETITLE; + ppage.pszTitle = szTitle; + } + return CreatePropertySheetPageW(&ppage); +} + +INT_PTR +CALLBACK +TcpipBasicDlg( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam +) +{ + switch(uMsg) + { + case WM_INITDIALOG: + return TRUE; + default: + break; + } + return FALSE; +} + +/*************************************************************** + * INetCfgComponentPropertyUi interface + */ + +HRESULT +STDCALL +INetCfgComponentPropertyUi_fnQueryInterface( + INetCfgComponentPropertyUi * iface, + REFIID iid, + LPVOID * ppvObj) +{ + //LPOLESTR pStr; + TcpipConfNotifyImpl * This = (TcpipConfNotifyImpl*)iface; + + *ppvObj = NULL; + + + if (IsEqualIID (iid, &IID_IUnknown) || + IsEqualIID (iid, &IID_INetCfgComponentPropertyUi)) + { + *ppvObj = This; + INetCfgComponentPropertyUi_AddRef(iface); + return S_OK; + } + else if (IsEqualIID(iid, &IID_INetCfgComponentControl)) + { + *ppvObj = (LPVOID*)&This->lpVtblCompControl; + INetCfgComponentPropertyUi_AddRef(iface); + return S_OK; + } + + //StringFromCLSID(iid, &pStr); + //MessageBoxW(NULL, pStr, L"INetConnectionPropertyUi_fnQueryInterface", MB_OK); + //CoTaskMemFree(pStr); + + return E_NOINTERFACE; +} + + +ULONG +STDCALL +INetCfgComponentPropertyUi_fnAddRef( + INetCfgComponentPropertyUi * iface) +{ + TcpipConfNotifyImpl * This = (TcpipConfNotifyImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + return refCount; +} + +ULONG +STDCALL +INetCfgComponentPropertyUi_fnRelease( + INetCfgComponentPropertyUi * iface) +{ + TcpipConfNotifyImpl * This = (TcpipConfNotifyImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + if (!refCount) + { + CoTaskMemFree(This); + } + return refCount; +} + +HRESULT +STDCALL +INetCfgComponentPropertyUi_fnQueryPropertyUi( + INetCfgComponentPropertyUi * iface, + IUnknown *pUnkReserved) +{ + INetLanConnectionUiInfo * pLanInfo; + HRESULT hr; + + hr = IUnknown_QueryInterface(pUnkReserved, &IID_INetLanConnectionUiInfo, (LPVOID*)&pLanInfo); + if (FAILED(hr)) + return hr; + + //FIXME + // check if tcpip is enabled on that binding */ + IUnknown_Release(pUnkReserved); + return S_OK; +} + +HRESULT +STDCALL +INetCfgComponentPropertyUi_fnSetContext( + INetCfgComponentPropertyUi * iface, + IUnknown *pUnkReserved) +{ + TcpipConfNotifyImpl * This = (TcpipConfNotifyImpl*)iface; + + if (!iface || !pUnkReserved) + return E_POINTER; + + This->pUnknown = pUnkReserved; + return S_OK; +} + +HRESULT +STDCALL +INetCfgComponentPropertyUi_fnMergePropPages( + INetCfgComponentPropertyUi * iface, + DWORD *pdwDefPages, + BYTE **pahpspPrivate, + UINT *pcPages, + HWND hwndParent, + LPCWSTR *pszStartPage) +{ + HPROPSHEETPAGE * hppages; + TcpipConfNotifyImpl * This = (TcpipConfNotifyImpl*)iface; + + hppages = (HPROPSHEETPAGE*) CoTaskMemAlloc(sizeof(HPROPSHEETPAGE)); + if (!hppages) + return E_FAIL; + + hppages[0] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_TCPIP_BASIC_DLG), TcpipBasicDlg, (LPARAM)This, NULL); + if (!hppages[0]) + { + CoTaskMemFree(hppages); + return E_FAIL; + } + + *pahpspPrivate = (BYTE*)hppages; + *pcPages = 1; + + return S_OK; +} + +HRESULT +STDCALL +INetCfgComponentPropertyUi_fnValidateProperties( + INetCfgComponentPropertyUi * iface, + HWND hwndSheet) +{ + return E_NOTIMPL; +} + +HRESULT +STDCALL +INetCfgComponentPropertyUi_fnApplyProperties( + INetCfgComponentPropertyUi * iface) +{ + return E_NOTIMPL; +} + + +HRESULT +STDCALL +INetCfgComponentPropertyUi_fnCancelProperties( + INetCfgComponentPropertyUi * iface) +{ + return E_NOTIMPL; +} + +static const INetCfgComponentPropertyUiVtbl vt_NetCfgComponentPropertyUi = +{ + INetCfgComponentPropertyUi_fnQueryInterface, + INetCfgComponentPropertyUi_fnAddRef, + INetCfgComponentPropertyUi_fnRelease, + INetCfgComponentPropertyUi_fnQueryPropertyUi, + INetCfgComponentPropertyUi_fnSetContext, + INetCfgComponentPropertyUi_fnMergePropPages, + INetCfgComponentPropertyUi_fnValidateProperties, + INetCfgComponentPropertyUi_fnApplyProperties, + INetCfgComponentPropertyUi_fnCancelProperties +}; + +/*************************************************************** + * INetCfgComponentControl interface + */ + +HRESULT +STDCALL +INetCfgComponentControl_fnQueryInterface( + INetCfgComponentControl * iface, + REFIID iid, + LPVOID * ppvObj) +{ + TcpipConfNotifyImpl * This = impl_from_INetCfgComponentControl(iface); + return INetCfgComponentPropertyUi_QueryInterface((INetCfgComponentPropertyUi*)This, iid, ppvObj); +} + +ULONG +STDCALL +INetCfgComponentControl_fnAddRef( + INetCfgComponentControl * iface) +{ + TcpipConfNotifyImpl * This = impl_from_INetCfgComponentControl(iface); + return INetCfgComponentPropertyUi_AddRef((INetCfgComponentPropertyUi*)This); +} + +ULONG +STDCALL +INetCfgComponentControl_fnRelease( + INetCfgComponentControl * iface) +{ + TcpipConfNotifyImpl * This = impl_from_INetCfgComponentControl(iface); + return INetCfgComponentPropertyUi_Release((INetCfgComponentPropertyUi*)This); +} + +HRESULT +STDCALL +INetCfgComponentControl_fnInitialize( + INetCfgComponentControl * iface, + INetCfgComponent *pIComp, + INetCfg *pINetCfg, + BOOL fInstalling) +{ + TcpipConfNotifyImpl * This = impl_from_INetCfgComponentControl(iface); + + This->pNCfg = pINetCfg; + This->pNComp = pIComp; + + return S_OK; +} + +HRESULT +STDCALL +INetCfgComponentControl_fnApplyRegistryChanges( + INetCfgComponentControl * iface) +{ + return S_OK; +} + +HRESULT +STDCALL +INetCfgComponentControl_fnApplyPnpChanges( + INetCfgComponentControl * iface, + INetCfgPnpReconfigCallback *pICallback) +{ + return S_OK; +} + +HRESULT +STDCALL +INetCfgComponentControl_fnCancelChanges( + INetCfgComponentControl * iface) +{ + return S_OK; +} + +static const INetCfgComponentControlVtbl vt_NetCfgComponentControl = +{ + INetCfgComponentControl_fnQueryInterface, + INetCfgComponentControl_fnAddRef, + INetCfgComponentControl_fnRelease, + INetCfgComponentControl_fnInitialize, + INetCfgComponentControl_fnApplyRegistryChanges, + INetCfgComponentControl_fnApplyPnpChanges, + INetCfgComponentControl_fnCancelChanges +}; + +HRESULT +STDCALL +TcpipConfigNotify_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + TcpipConfNotifyImpl *This; + + if (!ppv) + return E_POINTER; + + This = (TcpipConfNotifyImpl *) CoTaskMemAlloc(sizeof (TcpipConfNotifyImpl)); + if (!This) + return E_OUTOFMEMORY; + + This->ref = 1; + This->lpVtbl = (const INetCfgComponentPropertyUi*)&vt_NetCfgComponentPropertyUi; + This->lpVtblCompControl = (const INetCfgComponentControl*)&vt_NetCfgComponentControl; + This->pNCfg = NULL; + This->pUnknown = NULL; + This->pNComp = NULL; + + if (!SUCCEEDED (INetCfgComponentPropertyUi_QueryInterface ((INetCfgComponentPropertyUi*)This, riid, ppv))) + { + INetCfgComponentPropertyUi_Release((INetCfgComponentPropertyUi*)This); + return E_NOINTERFACE; + } + + INetCfgComponentPropertyUi_Release((INetCfgComponentPropertyUi*)This); + return S_OK; +} Propchange: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 36098: Fix some warnings
by tkreuzer＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: tkreuzer Date: Tue Sep 9 17:11:45 2008 New Revision: 36098 URL: http://svn.reactos.org/svn/reactos?rev=36098&view=rev Log: Fix some warnings Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Tue Sep 9 17:11:45 2008 @@ -49,7 +49,7 @@ KiSetProcessorType(VOID) { ULONG64 EFlags; - int Reg[4]; + INT Reg[4]; ULONG Stepping, Type; /* Start by assuming no CPUID data */ @@ -89,7 +89,7 @@ KiGetCpuVendor(VOID) { PKPRCB Prcb = KeGetCurrentPrcb(); - ULONG Vendor[5]; + INT Vendor[5]; ULONG Temp; /* Assume no Vendor ID and fail if no CPUID Support. */ @@ -112,30 +112,30 @@ Prcb->VendorString[sizeof(Prcb->VendorString) - sizeof(CHAR)] = ANSI_NULL; /* Now check the CPU Type */ - if (!strcmp(Prcb->VendorString, CmpIntelID)) + if (!strcmp((PCHAR)Prcb->VendorString, CmpIntelID)) { return CPU_INTEL; } - else if (!strcmp(Prcb->VendorString, CmpAmdID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpAmdID)) { return CPU_AMD; } - else if (!strcmp(Prcb->VendorString, CmpCyrixID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpCyrixID)) { DPRINT1("Cyrix CPUs not fully supported\n"); return 0; } - else if (!strcmp(Prcb->VendorString, CmpTransmetaID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpTransmetaID)) { DPRINT1("Transmeta CPUs not fully supported\n"); return 0; } - else if (!strcmp(Prcb->VendorString, CmpCentaurID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpCentaurID)) { DPRINT1("VIA CPUs not fully supported\n"); return 0; } - else if (!strcmp(Prcb->VendorString, CmpRiseID)) + else if (!strcmp((PCHAR)Prcb->VendorString, CmpRiseID)) { DPRINT1("Rise CPUs not fully supported\n"); return 0; @@ -152,7 +152,7 @@ PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Vendor; ULONG FeatureBits = KF_WORKING_PTE; - ULONG Reg[4]; + INT Reg[4]; BOOLEAN ExtendedCPUID = TRUE; ULONG CpuFeatures = 0; @@ -230,7 +230,7 @@ { /* Perform the special sequence to get the MicroCode Signature */ __writemsr(0x8B, 0); - __writemsr(Reg, 1); + __cpuid(Reg, 1); Prcb->UpdateSignature.QuadPart = __readmsr(0x8B); } else if (Prcb->CpuType == 5) @@ -329,7 +329,7 @@ { PKIPCR Pcr = (PKIPCR)KeGetPcr(); ULONG Vendor; - ULONG Data[4]; + INT Data[4]; ULONG CacheRequests = 0, i; ULONG CurrentRegister; UCHAR RegisterByte;

1 0

[dreimer] 36097: Bug 3637 Translate files of 0.3.6 by Lars Martin Hambro Bug 3671 Small spanish corrections Bug 3700 Spanish netshell file by Javier Remacha Bug 3705 Polish translation update for netshell by Maciej Bialas Bug 3721 update translations for setup/reactos by Mario Kacmar Bug 3722 some slovak translations for rosapps my Mario Kacmar Bug 3723 some slovak fixes by Mario Kacmar
by dreimer＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: dreimer Date: Tue Sep 9 16:18:13 2008 New Revision: 36097 URL: http://svn.reactos.org/svn/reactos?rev=36097&view=rev Log: Bug 3637 Translate files of 0.3.6 by Lars Martin Hambro Bug 3671 Small spanish corrections Bug 3700 Spanish netshell file by Javier Remacha Bug 3705 Polish translation update for netshell by Maciej Bialas Bug 3721 update translations for setup/reactos by Mario Kacmar Bug 3722 some slovak translations for rosapps my Mario Kacmar Bug 3723 some slovak fixes by Mario Kacmar Added: trunk/reactos/dll/win32/netshell/lang/es-ES.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/charmap/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/welcome/lang/es-ES.rc trunk/reactos/base/shell/explorer/explorer-es.rc trunk/reactos/base/system/format/lang/sk-SK.rc trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc trunk/reactos/dll/win32/netshell/lang/pl-PL.rc trunk/reactos/dll/win32/netshell/netshell.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 30-01-2008 - * LAST CHANGE: 10-07-2008 + * LAST CHANGE: 30-08-2008 * --------------------------------------- * TODO: * 1. treba usporiada jednotky pod¾a abecedy @@ -445,7 +445,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_STRING_LICENSE "Kalkulaèka systému ReactOS je vo¾ný softvér vydaný pod licenciou GNU GPL.\r\n\r\nKópiu licenie GNU GPL môete získa tu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nRovnako môete získa preklad licencie GNU GPL tu:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_STRING_LICENSE "Kalkulaèka systému ReactOS je vo¾ný softvér vydaný pod licenciou GNU GPL.\r\n\r\nKópiu licencie GNU GPL môete získa tu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nRovnako môete získa preklad licencie GNU GPL tu:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Chyba" IDS_QUICKHELP "Rýchla pomoc" END Modified: trunk/reactos/base/applications/charmap/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,9 +1,10 @@ /* - * PROJECT: Character Map - * FILE: base/applications/charmap/lang/sk-SK.rc - * PURPOSE: Slovak Language File for charmap - * TRANSLATOR: Kario (kario(a)szm.sk) /Mário Kaèmár/ - * DATE OF TR: 24-07-2007 + * PROJECT: Character Map + * FILE: base/applications/charmap/lang/sk-SK.rc + * PURPOSE: Slovak Language File for charmap + * TRANSLATOR: Kario (kario(a)szm.sk) /Mário Kaèmár/ + * DATE OF TR.: 24-07-2007 + * LAST CHANGE: 29-08-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -38,6 +39,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE, "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU Ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_LICENSE, "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." IDS_ABOUT "È&o je Mapa znakov" END Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,5 +1,6 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 14-02-2008 +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 14-02-2008 + * LAST CHANGE: 29-08-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -55,7 +56,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU Ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -148,7 +148,7 @@ STRINGTABLE DISCARDABLE BEGIN - STRING_LICENSE, "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU Ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + STRING_LICENSE, "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END STRINGTABLE DISCARDABLE @@ -172,7 +172,7 @@ STRING_TOOLARGE, "Súbor '%s' je pre Poznámkový blok príli ve¾ký.\n \ Na otvorenie súboru pouite iný editor." -STRING_NOTEXT, "Nevloili Ste iadny text. \ +STRING_NOTEXT, "Nevloili ste iadny text. \ \nProsím, napíte nieèo a skúste to znova." STRING_DOESNOTEXIST, "Nie je moné nájs súbor '%s'\n\n \ Chcete vytvori nový súbor?" Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -601,7 +601,7 @@ ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Zaradí proces do triedy priorít ZNÍENÁ." ID_PROCESS_PAGE_SETPRIORITY_LOW "Zaradí proces do triedy priorít NÍZKA." - IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Menej veobecnej verejnej licencie (GNU Lesser General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2.1 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU Ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." + IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Menej veobecnej verejnej licencie (GNU Lesser General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2.1 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,12 +1,128 @@ -/* $Id: En.rc 12852 2005-01-06 13:58:04Z denzil $ */ +/* $Id: cs-CZ.rc 35435 2008-08-18 21:47:53Z Kario $ */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -/* String Tables */ -STRINGTABLE DISCARDABLE +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalace ReactOS" +FONT 8, "MS Shell Dlg" BEGIN - IDS_CAPTION "Instalace ReactOS" - IDS_TEXT "ReactOS nelze instalovat pøímo z tohoto CD!\n\nProsím restartujte poèítaè z tohoto CD aby jste nainstalovali ReactOS." + LTEXT "Welcome to the ReactOS Setup Wizard.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "ReactOS nelze instalovat pøímo z tohoto CD! "\ + "Prosím restartujte poèítaè z tohoto CD aby jste "\ + "nainstalovali ReactOS.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Click Finish to exit the Setup.", IDC_STATIC, 115, 169, 195, 17 END +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalace ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalace ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalace ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalace ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Advanced Partition Settings" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalace ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completing ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ + "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 +END + + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Language Selection" + IDS_LANGSUBTITLE "Choose language for setup and final system." + IDS_TYPETITLE "Welcome to ReactOS Setup" + IDS_TYPESUBTITLE "Choose setup type." + IDS_DEVICETITLE "Setup the basic devices" + IDS_DEVICESUBTITLE "Set the settings of display and keyboard." + IDS_DRIVETITLE "Setup the installation partition and system folder" + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." + IDS_PROCESSTITLE "Prepare partition, copy files and setup system" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + IDS_RESTARTTITLE "First stage of setup finished" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP2 "Abort installation?" +END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -14,4 +14,115 @@ LTEXT "Klicken Sie auf Beenden um das Setup zu verlassen.", IDC_STATIC, 115, 169, 195, 17 END +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Advanced Partition Settings" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completing ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ + "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 +END + + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Language Selection" + IDS_LANGSUBTITLE "Choose language for setup and final system." + IDS_TYPETITLE "Welcome to ReactOS Setup" + IDS_TYPESUBTITLE "Choose setup type." + IDS_DEVICETITLE "Setup the basic devices" + IDS_DEVICESUBTITLE "Set the settings of display and keyboard." + IDS_DRIVETITLE "Setup the installation partition and system folder" + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." + IDS_PROCESSTITLE "Prepare partition, copy files and setup system" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + IDS_RESTARTTITLE "First stage of setup finished" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP2 "Abort installation?" +END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,13 +1,132 @@ /* - * Spanish language file by Javier Remacha <2007-09-21> + * Spanish language file by Javier Remacha <2008> */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -/* String Tables */ -STRINGTABLE DISCARDABLE + + +IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalación de ReactOS" +FONT 8, "MS Shell Dlg" BEGIN - IDS_CAPTION "Instalación de ReactOS" - IDS_TEXT "¡No puede instalar ReactOS directamente desde este CD!\n\nPor favor, reinicie su equipo sin retirar este CD para proceder con la instalación de ReactOS." + LTEXT "Bienvenido al Asistente de Instalación de ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 + LTEXT "¡Aún no puede instalar ReactOS directamente desde este CD! "\ + "Por favor, reinicie su equipo desde este CD para "\ + "instalar ReactOS.", IDC_STATIC, 115, 40, 200, 100 + LTEXT "Pulse Finalizar para salir del instalador.", IDC_STATIC, 115, 169, 195, 17 +END + +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalación de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Selección de idioma:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Teclado o dispositivo de entrada:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Presione Siguiente para seleccionar el tipo de instalación.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalación de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tipo de instalación", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Instalar ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Reparar o actualizar una versión instalada de ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Presione Siguiente para instalar los dispositivos.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalación de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Ajustes de dispositivos", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Equipo:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + LTEXT "Pantalla:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + LTEXT "Teclado:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + LTEXT "Presione Siguiente para configurar la instalación de dispositivos.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalación de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partición para la instalación de ReactOS", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Crear", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Borrar", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Opciones avanzadas...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Presione Siguiente para comenzar el proceso de instalación.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Ajustes avanzados de la partición" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Carpeta de instalación", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Instalación del cargador de arranque", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Instalar el cargador de arranque en el disco duro (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalación de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Instalando", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Instalando archivos...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completando la instalación de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Completada la primera parte de la instalación de ReactOS", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "La primera parte de la instalación de ReactOS se ha completado satisfactoriamente.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "Cuando presione Finalizar, su equipo será reiniciado.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "Si hay un CD en alguna unidad, retírelo. Luego, para reiniciar "\ + "su equipo, presione Finalizar.", IDC_STATIC, 10, 180, 297, 20 +END + + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Selección del idioma" + IDS_LANGSUBTITLE "Seleccione el idioma para la instalación y para el sistema." + IDS_TYPETITLE "Bienvenido a la instalación de ReactOS" + IDS_TYPESUBTITLE "Seleccione el tipo de instalación." + IDS_DEVICETITLE "Instalación de los dispositivos básicos" + IDS_DEVICESUBTITLE "Seleccione los ajustes de la pantalla y el teclado." + IDS_DRIVETITLE "Crear la partición para la instalación y la carpeta del sistema" + IDS_DRIVESUBTITLE "Preparar la partición para la instalación, la carpeta del sistema y el cargador de arranque." + IDS_PROCESSTITLE "Preparar partición, copiar archivos e instalar sistema" + IDS_PROCESSSUBTITLE "Crear y formatear partición, copiar archivos, instalar e instalar el cargador de arranque" + IDS_RESTARTTITLE "Primera parte de la instalación finalizada" + IDS_RESTARTSUBTITLE "La primera parte de la instalación ha sido completada, reinicie para continuar con la segunda parte" + IDS_ABORTSETUP "ReactOS no está completamente instalado en su equipo. Si sale de la instalación ahora, tendrá que ejecutar el instalador otra vez para instalar Reactos. ¿Realmente quiere salir?" + IDS_ABORTSETUP2 "¿Abortar instalación?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -12,4 +12,115 @@ LTEXT "Cliquez sur Terminer pour quitter l'installation.", IDC_STATIC, 115, 169, 195, 17 END +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Advanced Partition Settings" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installation de ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completing ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ + "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 +END + + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Language Selection" + IDS_LANGSUBTITLE "Choose language for setup and final system." + IDS_TYPETITLE "Welcome to ReactOS Setup" + IDS_TYPESUBTITLE "Choose setup type." + IDS_DEVICETITLE "Setup the basic devices" + IDS_DEVICESUBTITLE "Set the settings of display and keyboard." + IDS_DRIVETITLE "Setup the installation partition and system folder" + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." + IDS_PROCESSTITLE "Prepare partition, copy files and setup system" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + IDS_RESTARTTITLE "First stage of setup finished" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP2 "Abort installation?" +END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -20,4 +20,115 @@ LTEXT "Nacinij przycisk aby zakoñczyæ pracê Instalatora.", IDC_STATIC, 115, 169, 195, 17 END +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Advanced Partition Settings" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completing ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ + "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 +END + + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Language Selection" + IDS_LANGSUBTITLE "Choose language for setup and final system." + IDS_TYPETITLE "Welcome to ReactOS Setup" + IDS_TYPESUBTITLE "Choose setup type." + IDS_DEVICETITLE "Setup the basic devices" + IDS_DEVICESUBTITLE "Set the settings of display and keyboard." + IDS_DRIVETITLE "Setup the installation partition and system folder" + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." + IDS_PROCESSTITLE "Prepare partition, copy files and setup system" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + IDS_RESTARTTITLE "First stage of setup finished" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP2 "Abort installation?" +END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,12 +1,12 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: xx-xx-2007 - * LAST UPDATE: 06-07-2008 + * LAST UPDATE: 18-08-2008 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Intalácia systému ReactOS" +CAPTION "Intalácia systému ReactOS" //ReactOS Setup FONT 8, "MS Shell Dlg" BEGIN LTEXT "Víta Vás sprievodca intaláciou systému ReactOS.", IDC_STARTTITLE, 115, 8, 195, 24 @@ -16,4 +16,115 @@ LTEXT "Intaláciu ukonèíte kliknutím na tlaèidlo Dokonèi.", IDC_STATIC, 115, 169, 195, 17 END +IDD_LANGSELPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Intalácia systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 + CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 + CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 + LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Intalácia systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 +END + +IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Intalácia systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Nastavenia zariadení", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Poèítaè:", IDC_STATIC, 20,15, 80, 10 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + LTEXT "Obrazovka:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + LTEXT "Klávesnica:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Intalácia systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL + PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 +END + +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +CAPTION "Advanced Partition Settings" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE + + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + + CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 +END + +IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Intalácia systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Setup action", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Install files...", IDC_ACTIVITY, 20, 50, 277, 10 + LTEXT "test.txt", IDC_ITEM, 30, 80, 257, 10 + CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", + PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 +END + + +IDD_RESTARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Completing ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Completing the first stage of ReactOS Setup", IDC_FINISHTITLE, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "You have successfully completed the first stage of ReactOS Setup.", IDC_STATIC, 20, 50, 277, 10 + + LTEXT "When you click Finish, your computer will restart.", IDC_STATIC, 20, 80, 277, 10 + CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 + LTEXT "If there is a CD in a drive, remove it. Then, to restart "\ + "your computer, click Finish.", IDC_STATIC, 10, 180, 297, 20 +END + + +STRINGTABLE +BEGIN + IDS_LANGTITLE "Language Selection" + IDS_LANGSUBTITLE "Choose language for setup and final system." + IDS_TYPETITLE "Welcome to ReactOS Setup" + IDS_TYPESUBTITLE "Choose setup type." + IDS_DEVICETITLE "Setup the basic devices" + IDS_DEVICESUBTITLE "Set the settings of display and keyboard." + IDS_DRIVETITLE "Setup the installation partition and system folder" + IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." + IDS_PROCESSTITLE "Prepare partition, copy files and setup system" + IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" + IDS_RESTARTTITLE "First stage of setup finished" + IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" + IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" + IDS_ABORTSETUP2 "Prerui intaláciu?" +END /* EOF */ Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/rsrc.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -8,8 +8,8 @@ //#include "lang/el-GR.rc" #include "lang/en-US.rc" #include "lang/no-NO.rc" -/*#include "lang/es-ES.rc" -#include "lang/fi-FI.rc"*/ +#include "lang/es-ES.rc" +/*#include "lang/fi-FI.rc"*/ #include "lang/fr-FR.rc" /*#include "lang/hu-HU.rc" #include "lang/id-ID.rc" @@ -20,8 +20,8 @@ #include "lang/pl-PL.rc" /*#include "lang/pt-BR.rc"*/ #include "lang/ru-RU.rc" -/*#include "lang/sk-SK.rc" -#include "lang/sv-SE.rc" +#include "lang/sk-SK.rc" +/*#include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc"*/ Modified: trunk/reactos/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/es… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/es-ES.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -47,9 +47,9 @@ /* Topic descriptions */ STRINGTABLE DISCARDABLE BEGIN - IDS_TOPICDESC0 "Crear una nueva instalacion de ReactOS en su PC o actualizar una instalacion existente." + IDS_TOPICDESC0 "Crear una nueva instalación de ReactOS en su PC o actualizar una instalación existente." IDS_TOPICDESC1 "Explorar este CD." - IDS_TOPICDESC2 "Haz Click para salir de esta aplicacion." + IDS_TOPICDESC2 "Haz Click para salir de esta aplicación." // IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." // IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." // IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." Modified: trunk/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-es.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -55,7 +55,7 @@ MENUITEM "Agrupar Automaticamente", ID_WINDOW_AUTOSORT MENUITEM "Agrupar &Símbolos", ID_WINDOW_ARRANGE END - POPUP "&Tools" + POPUP "Herramientas" BEGIN MENUITEM "&Opciones", ID_TOOLS_OPTIONS END @@ -340,7 +340,7 @@ IDS_EXPLORE "Explorar" IDS_EMPTY "(Vacío)" IDS_RECENT "Documentos Recientes" - IDS_ADMIN "Administracion" + IDS_ADMIN "Administración" END STRINGTABLE DISCARDABLE @@ -377,7 +377,7 @@ IDS_ABOUT_EXPLORER "&Acerca de Explorer..." IDS_LAUNCH_MANY_PROGRAMS "Ha seleccionado más de un programa.\n¿Está seguro de que desea ejecutarlos todos?" - IDS_DESKTOPBAR_SETTINGS "Configuracion del Escritorio" + IDS_DESKTOPBAR_SETTINGS "Configuración del Escritorio" IDS_DESKTOP "Escritorio" IDS_TASKBAR "Barra de Tareas" IDS_NAMECOLUMN "Nombre" Modified: trunk/reactos/base/system/format/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/sk… ============================================================================== --- trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,5 +1,5 @@ /* TRANSLATOR : M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: 07-08-2008 + * DATE OF TR.: 15-02-2008 * LAST CHANGE: 08-08-2008 */ Modified: trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/s… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -171,7 +171,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU Ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." + IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END #endif // English (U.S.) resources Added: trunk/reactos/dll/win32/netshell/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/es… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/es-ES.rc (added) +++ trunk/reactos/dll/win32/netshell/lang/es-ES.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,0 +1,74 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "Conectar usando:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "Con&figurar", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Esta conexión utiliza los siguientes elementos:", -1, 9, 59, 217, 8 + PUSHBUTTON "Inst&alar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Descripción ", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "La descripción de los componentes va aquí...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Mostrar icono en el área de notificación al conectarse", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Notificarme cuando esta conexión tenga conectividad limitada o nula", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Conexión ", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Estado:", -1, 19, 20, 60, 8 + LTEXT "Duración:", -1, 19, 34, 60, 8 + LTEXT "Velocidad:", -1, 19, 48, 60, 8 + GROUPBOX "Actividad ", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Enviados", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Recibidos", -1, 149, 90, 37, 8 + LTEXT "Paquetes:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Propiedades", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Deshabilitar", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORKCONNECTION "Conexiones de red" + IDS_SHV_COLUMN_NAME "Nombre" + IDS_SHV_COLUMN_TYPE "Tipo" + IDS_SHV_COLUMN_STATE "Estado" + IDS_SHV_COLUMN_DEVNAME "Nombre del dispositivo" + IDS_SHV_COLUMN_PHONE "Número de teléfono o dirección de host" + IDS_SHV_COLUMN_OWNER "Propietario" + IDS_TYPE_ETHERNET "LAN o Internet de alta velocidad" + IDS_STATUS_NON_OPERATIONAL "Deshabilitado" + IDS_STATUS_UNREACHABLE "No Conectado" + IDS_STATUS_DISCONNECTED "Cable de red desconectado" + IDS_STATUS_CONNECTING "Obteniendo dirección de red" + IDS_STATUS_CONNECTED "Conectado" + IDS_STATUS_OPERATIONAL "Conectado" + + IDS_NET_ACTIVATE "Habilitar" + IDS_NET_DEACTIVATE "Deshabilitar" + IDS_NET_STATUS "Estado" + IDS_NET_REPAIR "Reparar" + IDS_NET_CREATELINK "Crear acceso directo" + IDS_NET_DELETE "Borrar" + IDS_NET_PROPERTIES "Propiedades" +END + Propchange: trunk/reactos/dll/win32/netshell/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,4 +1,50 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Ogólne" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_LIST | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 + LTEXT "Po³¹cz u¿ywaj¹c:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Konfiguruj", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "To po³¹czenie wykorzystuje nastêpuj¹ce sk³adniki:", -1, 9, 59, 217, 8 + PUSHBUTTON "&Zainstaluj", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Odinstaluj", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&W³aciwoci", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Opis", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Tutaj pojawi siê opis sk³adnika...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Pokazuj ikonê w obszarze powiadomieñ podczas po³¹czenia", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Powiadom mnie, gdy to po³¹czenie ma ograniczon¹ ³¹cznoæ lub brak ³¹cznoci", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Ogólne" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Po³¹czenie", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Status:", -1, 19, 20, 60, 8 + LTEXT "Czas trwania:", -1, 19, 34, 60, 8 + LTEXT "Szybkoæ:", -1, 19, 48, 60, 8 + GROUPBOX "Aktywnoæ", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Wys³ano", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Odebrano", -1, 149, 90, 37, 8 + LTEXT "bajtów:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&W³aciwoci", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "W&y³¹cz", IDC_ENDISABLE, 66, 150, 50, 14 + RTEXT "",IDC_STATUS,83,20,98,8 + RTEXT "",IDC_DURATION,83,34,98,8 + RTEXT "",IDC_SPEED,83,48,98,8 +END + STRINGTABLE DISCARDABLE BEGIN @@ -16,5 +62,13 @@ IDS_STATUS_CONNECTING "Pobieranie adresu sieciowego" IDS_STATUS_CONNECTED "Po³¹czony" IDS_STATUS_OPERATIONAL "Po³¹czony" + + IDS_NET_ACTIVATE "W³¹cz" + IDS_NET_DEACTIVATE "Wy³¹cz" + IDS_NET_STATUS "Status" + IDS_NET_REPAIR "Napraw" + IDS_NET_CREATELINK "Utwórz skrót" + IDS_NET_DELETE "Usuñ" + IDS_NET_PROPERTIES "W³aciwoci" END Modified: trunk/reactos/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -20,5 +20,6 @@ #include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/es-ES.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -1,7 +1,7 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * NOTE : partially translated * TRANSLATED : 26-12-2007 - * LAST CHANGE: 16-08-2008 + * LAST CHANGE: 24-08-2008 */ /* @@ -199,8 +199,8 @@ BEGIN LTEXT "Vyberte rozírené vlastnosti urèené pre tento odkaz.", -1, 5, 30, 210, 10 CHECKBOX "&Spusti s inými povereniami", 14000, 25, 50, 150, 10 - LTEXT "Táto monos umoòuje spusti tento odkaz ako iný pouívate¾, alebo pokraèova so svojím pouívate¾ským oprávnením, ale s ochranou poèítaèa a údajov pred neoprávnenými aktivitami programu.", -1, 50, 60, 175, 40 - CHECKBOX "Spusti v oddelenom pa&mäovom priestore", 14001, 25, 100, 90, 10, WS_DISABLED + LTEXT "Táto monos umoòuje spusti tento odkaz ako iný pouívate¾, alebo pokraèova so svojím pouívate¾ským oprávnením, ale s ochranou poèítaèa a údajov pred neoprávnenými aktivitami programu.", -1, 50, 60, 170, 40 + CHECKBOX "Spusti v oddelenom pa&mäovom priestore", 14001, 25, 100, 190, 10, WS_DISABLED PUSHBUTTON "OK", 1, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Prerui", 2, 120, 124, 50, 15, WS_VISIBLE END Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Tue Sep 9 16:18:13 2008 @@ -33,7 +33,7 @@ CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Bienvenido al asistente de instalación the ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Bienvenido al asistente de instalación de ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 LTEXT "Este asistente instalará ReactOS en su equipo. El asistente "\ "necesita recopilar alguna información sobre usted y su equipo "\ "para configurar ReactOS apropiadamente.", IDC_STATIC, 115, 40, 195, 100 @@ -103,15 +103,15 @@ BEGIN LTEXT "Las opciones regionales y de idioma permiten configurar la manera en que se representan "\ "fechas ,número ,monedas y horas. También puede agregar compatibilidad con otros idiomas "\ - "y cambiar la configuración de su ubicación.", IDC_STATIC, 53, 7, 253, 22 - LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 + "y cambiar la configuración de su ubicación.", IDC_STATIC, 53, 6, 253, 30 + LTEXT "", IDC_LOCALETEXT, 53, 34, 250, 16 LTEXT "Para modificar esta configuración, pulse Modificar.", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "La disposición de teclado especifica los caracteres que aparecen cuando "\ "usted escribe.", - IDC_STATIC, 53, 86, 253, 20 - LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + IDC_STATIC, 53, 86, 253, 32 + LTEXT "", IDC_LAYOUTTEXT, 53, 109, 250, 16 LTEXT "Para cambiar la disposición de teclado, pulse Modificar.", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "&Modificar...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 @@ -157,7 +157,7 @@ LTEXT "Usted ha finalizado con éxito la instalación de ReactOS.\n\n" \ "Cuando pulse Terminar, su equipo será reiniciado.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Si hay un CD en su lector, quítelo. Luego, reinicie su equipo "\ + LTEXT "Si hay un CD en alguna unidad, retírelo. Luego, reinicie su equipo "\ "pulsando Terminar.", IDC_STATIC, 115, 169, 195, 17 END

1 0

[dreimer] 36096: Bug 3637 Translate files of 0.3.6 by Lars Martin Hambro Bug 3671 Small spanish corrections Bug 3700 Spanish netshell file by Javier Remacha Bug 3705 Polish translation update for netshell by Maciej Bialas Bug 3721 update translations for setup/reactos by Mario Kacmar Bug 3722 some slovak translations for rosapps my Mario Kacmar Bug 3723 some slovak fixes by Mario Kacmar
by dreimer＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: dreimer Date: Tue Sep 9 16:18:12 2008 New Revision: 36096 URL: http://svn.reactos.org/svn/reactos?rev=36096&view=rev Log: Bug 3637 Translate files of 0.3.6 by Lars Martin Hambro Bug 3671 Small spanish corrections Bug 3700 Spanish netshell file by Javier Remacha Bug 3705 Polish translation update for netshell by Maciej Bialas Bug 3721 update translations for setup/reactos by Mario Kacmar Bug 3722 some slovak translations for rosapps my Mario Kacmar Bug 3723 some slovak fixes by Mario Kacmar Added: trunk/rosapps/applications/devutils/zoomin/lang/sk-SK.rc (with props) trunk/rosapps/applications/fraginator/lang/sk-SK.rc (with props) trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc (with props) Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc trunk/rosapps/applications/fraginator/Fraginator.rc trunk/rosapps/applications/fraginator/lang/no-NO.rc trunk/rosapps/applications/imagesoft/lang/sk-SK.rc trunk/rosapps/applications/packmgr/gui/lang/no-NO.rc trunk/rosapps/applications/packmgr/lib/lang/no-NO.rc trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc Added: trunk/rosapps/applications/devutils/zoomin/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/lang/sk-SK.rc (added) +++ trunk/rosapps/applications/devutils/zoomin/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -1,0 +1,87 @@ +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 04-09-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ZOOMIN ICON DISCARDABLE "zoomin.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_ZOOMIN_MENU MENU DISCARDABLE +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Skonèi\tAlt-F4", ID_EDIT_EXIT + END + POPUP "&Upravi" + BEGIN + MENUITEM "&Kopírova\tCtrl+C", ID_EDIT_COPY, GRAYED + MENUITEM "&Obnovi\tF5", ID_EDIT_REFRESH + END + POPUP "&Monosi" + BEGIN + MENUITEM "&Obnovovací kmitoèet...", ID_OPTIONS_REFRESH_RATE, GRAYED + END + POPUP "&Pomocník" + BEGIN + MENUITEM "È&o je ...", ID_HELP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je Zoomin" +FONT 8, "System" +BEGIN + ICON IDI_ZOOMIN,IDI_ZOOMIN,14,9,16,16 + LTEXT "ReactOS zoomin verzia 1.0",IDC_STATIC,49,10,119,8, + SS_NOPREFIX + LTEXT "Autorské práva (C) 2002 ReactOS Team",IDC_STATIC,49,20,119,8 + DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "ReactOS Zoomin" +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_ZOOMIN ACCELERATORS DISCARDABLE +BEGIN + VK_F5, ID_REFRESH, VIRTKEY, NOINVERT +END Propchange: trunk/rosapps/applications/devutils/zoomin/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -10,3 +10,4 @@ #include "lang/en-US.rc" #include "lang/no-NO.rc" +#include "lang/sk-SK.rc" Modified: trunk/rosapps/applications/fraginator/Fraginator.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/Fr… ============================================================================== --- trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -15,3 +15,4 @@ #include "lang/en-US.rc" #include "lang/no-NO.rc" +#include "lang/sk-SK.rc" Modified: trunk/rosapps/applications/fraginator/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/lang/no-NO.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -47,7 +47,7 @@ CAPTION "Rapport" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Bytes",IDC_BYTES,7,148,50,14 + DEFPUSHBUTTON "Byte",IDC_BYTES,7,148,50,14 DEFPUSHBUTTON "KB",IDC_KILOBYTES,61,148,50,14 DEFPUSHBUTTON "MB",IDC_MEGABYTES,115,148,50,14 DEFPUSHBUTTON "GB",IDC_GIGABYTES,169,148,50,14 @@ -57,14 +57,14 @@ RTEXT "(Stasjon bokstav)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN RTEXT "(Disk størrelse, Byte)",IDC_DISKSIZEBYTES,63,51,117,10, SS_SUNKEN - RTEXT "(Disk størrelse, Clusters)",IDC_DISKSIZECLUSTERS,63,73,117, + RTEXT "(Disk størrelse, Cluster)",IDC_DISKSIZECLUSTERS,63,73,117, 10,SS_SUNKEN LTEXT "Total clusters",-1,7,73,43,8 RTEXT "(Cluster størrelse)",IDC_DISKCLUSTERSIZE,63,84,117,10, SS_SUNKEN LTEXT "Cluster størrelse",-1,7,84,36,8 RTEXT "(Files count)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN - RTEXT "(Fil størrelse, bytes)",IDC_FILESSIZEBYTES,267,29,117,10, + RTEXT "(Fil størrelse, byte)",IDC_FILESSIZEBYTES,267,29,117,10, SS_SUNKEN LTEXT "# filer",-1,194,18,28,8 LTEXT "Total størrelse",-1,194,29,31,8 @@ -74,14 +74,14 @@ RTEXT "(Fil slack byte)",IDC_FILESSLACKBYTES,267,51,117,10, SS_SUNKEN LTEXT "Wasted slack",-1,194,51,44,8 - RTEXT "(Ledig plass, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, + RTEXT "(Ledig plass, Byte)",IDC_DISKFREEBYTES,63,62,117,10, SS_SUNKEN LTEXT "Ledig plass",-1,7,62,36,8 RTEXT "(Filer fragmentert, count)",IDC_FILESFRAGGED,267,62,117, 10,SS_SUNKEN LTEXT "Fragmenterte filer",-1,194,62,52,8 RTEXT "(Dirs count)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN - LTEXT "# of directories",-1,194,7,48,8 + LTEXT "# mapper",-1,194,7,48,8 RTEXT "Filsystem",-1,7,40,36,8 RTEXT "(Filsystem navn)",IDC_FILESYSTEM,63,40,117,10, SS_SUNKEN @@ -93,9 +93,9 @@ RTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,267,73,117, 10,SS_SUNKEN LTEXT "Average fragments per file",-1,194,73,60,20 - LTEXT "XX.X% of the files on this drive are fragmented. It is recommended that you perform a SSSSSSS defragmentation.", + LTEXT "XX.X% av disse filene på denne stasjonen er fragmentert. Det er anbefalt at du utfører en SSSSSSS defragmentasjon.", IDC_RECOMMEND,7,106,377,38,SS_SUNKEN - LTEXT "Recommendations:",-1,7,96,62,8 + LTEXT "Anbefalinger:",-1,7,96,62,8 END Added: trunk/rosapps/applications/fraginator/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/sk-SK.rc (added) +++ trunk/rosapps/applications/fraginator/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -1,0 +1,234 @@ +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 04-09-2008 + */ + +// Microsoft Visual C++ generated resource script. +// + +///////////////////////////////////////////////////////////////////////////// +// Slovak resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT +#pragma code_page(1250) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_MAIN DIALOGEX 0, 0, 346, 103 +STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Zaèa",IDC_STARTSTOP,294,7,45,15 + PUSHBUTTON "Pomocník",ID_MAIN_HELP,294,28,45,15 + PUSHBUTTON "Ukonèi",IDC_QUIT,294,49,45,15 + CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | + WS_BORDER,7,7,63,58 + LTEXT "Vyberte jednotku:",-1,78,40,50,8 + LTEXT "Vyberte akciu:",-1,135,40,58,8 + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | + 0x1,7,71,299,10 + CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | + SS_SUNKEN | WS_GROUP,7,86,332,10 + LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 + LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT + LTEXT "Priorita procesu:",-1,223,40,51,8 +END + +IDD_REPORT DIALOGEX 0, 0, 391, 169 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "Hlásenie" //Report +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bajty",IDC_BYTES,7,148,50,14 + DEFPUSHBUTTON "Kilobajty",IDC_KILOBYTES,61,148,50,14 + DEFPUSHBUTTON "Megabajty",IDC_MEGABYTES,115,148,50,14 + DEFPUSHBUTTON "Gigabajty",IDC_GIGABYTES,169,148,50,14 + DEFPUSHBUTTON "OK",IDC_REPORTOK,334,148,50,14 + RTEXT "Médium",-1,7,7,24,8 //Volume + LTEXT "Kapacita",-1,7,51,28,8 + RTEXT "(Písmeno jednotky)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN + RTEXT "(Ve¾kos disku, bajty)",IDC_DISKSIZEBYTES,63,51,117,10, + SS_SUNKEN + RTEXT "(Ve¾kos disku, klastre)",IDC_DISKSIZECLUSTERS,63,73,117, + 10,SS_SUNKEN + LTEXT "Klastrov spolu",-1,7,73,43,8 //Total clusters, Súèet klastrov, Klastrov celkom + RTEXT "(Ve¾kos klastra)",IDC_DISKCLUSTERSIZE,63,84,117,10, + SS_SUNKEN + LTEXT "Ve¾kos klastra",-1,7,84,36,8 + RTEXT "(Poèe súborov)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN + RTEXT "(Poèe súborov, bajty)",IDC_FILESSIZEBYTES,267,29,117,10, + SS_SUNKEN + LTEXT "# súborov",-1,194,18,28,8 + LTEXT "Celková ve¾kos",-1,194,29,31,8 + LTEXT "Ve¾kos disku",-1,194,40,39,8 + RTEXT "(Celková ve¾kos, bajty)",IDC_FILESSIZEONDISK,267,40,117,10, + SS_SUNKEN + RTEXT "(Files slack bytes)",IDC_FILESSLACKBYTES,267,51,117,10, + SS_SUNKEN + LTEXT "Wasted slack",-1,194,51,44,8 + RTEXT "(Disk Free, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, + SS_SUNKEN + LTEXT "Vo¾né miesto",-1,7,62,36,8 + RTEXT "(Fragmentované súbory, poèet)",IDC_FILESFRAGGED,267,62,117, + 10,SS_SUNKEN + LTEXT "Fragmentované súbory",-1,194,62,52,8 + RTEXT "(Poèet adresárov)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN + LTEXT "# adresárov",-1,194,7,48,8 + RTEXT "Systém súborov",-1,7,40,36,8 + RTEXT "(Názov systému súborov)",IDC_FILESYSTEM,63,40,117,10, + SS_SUNKEN + RTEXT "Volume Label",-1,7,18,44,8 + RTEXT "(Volume Name)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN + RTEXT "Serial",-1,7,29,18,8 + RTEXT "(Volume Serial)",IDC_VOLUMESERIAL,63,29,117,10, + SS_SUNKEN + RTEXT "(Priemerne fragmentov na súbor)",IDC_AVERAGEFRAGS,267,73,117, + 10,SS_SUNKEN + LTEXT "Priemerne fragmentov na súbor",-1,194,73,60,20 + LTEXT "XX.X% súborov na tejto jednotke je fragmentovaných. Odporúèa sa, aby ste vykonali SSSSSSS defragmentáciu.", + IDC_RECOMMEND,7,106,377,38,SS_SUNKEN + LTEXT "Odporúèania:",-1,7,96,62,8 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_MAIN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 339 + TOPMARGIN, 7 + BOTTOMMARGIN, 96 + END + + IDD_REPORT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 384 + TOPMARGIN, 7 + BOTTOMMARGIN, 162 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""windows.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Názov spoloènosti", " " + VALUE "Popis súboru", "Fraginator" + VALUE "Verzia súboru", "1.03" + VALUE "Vnútorný názov", "Fraginator" + VALUE "Autorské práva", "Copyright © 2000-2002 Rick Brewster" + VALUE "Pôvodný názov súboru", "Fraginator.exe" + VALUE "Názov produktu", "Fraginator" + VALUE "Verzia produktu", "1.03" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_LOGO BITMAP "Fraginator Motif Icon.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON "icon1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// RT_MANIFEST +// + +1 RT_MANIFEST "default1.bin" +#endif // Slovak resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/fraginator/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/imagesoft/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… ============================================================================== --- trunk/rosapps/applications/imagesoft/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 02-02-2008 - * LAST CHANGE: 21-06-2008 + * LAST CHANGE: 29-08-2008 * ______________________________________________ * NOTE: this file is not fully translated */ @@ -164,7 +164,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU Ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Veobecnej verejnej licencie (GNU General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2 tejto licencie, alebo (pod¾a Váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detailov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." IDS_READY " Hotovo." IDS_TOOLBAR_STANDARD "Standard" IDS_TOOLBAR_TEST "Test" Modified: trunk/rosapps/applications/packmgr/gui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/l… ============================================================================== --- trunk/rosapps/applications/packmgr/gui/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/packmgr/gui/lang/no-NO.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -7,7 +7,7 @@ CAPTION "Valg" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "There are no options yet.", 0, 50, 95, 80, 8 + LTEXT "Det er ikke noen valg ennå.", 0, 50, 95, 80, 8 END IDD_DOIT DIALOGEX DISCARDABLE 0, 0, 180, 100 Modified: trunk/rosapps/applications/packmgr/lib/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/lib/l… ============================================================================== --- trunk/rosapps/applications/packmgr/lib/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/packmgr/lib/lang/no-NO.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -16,7 +16,7 @@ ERR_PARAMETER "Feil med skript utførelse.\nFeil Parameter(e)." ERR_DEP1 "For å installere denne pakken trenger du også å installere disse pakken(e) også:\n\n:\n\n" - ERR_DEP2 "\nDVil du gjøre dette ?" + ERR_DEP2 "\nVil du gjøre dette ?" ERR_READY "Du har valg å installere %d pakke(r). For å installere disse må du lese og godta hver av disse lisensene. \n\nØnsker du fortsatt å fortsette ?" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -4,28 +4,28 @@ BEGIN IDS_USAGE, "SYSTEMINFO [/S system [/U brukernavn [/P [passord]]]] [/FO format] [/NH]\n\n\ -Description:\n\ - This command line tool enables an administrator to query for basic\n\ - system configuration information.\n\n\ -Parameter List:\n\ - /S system Specifies the remote system to connect to.\n\n\ - /U [domene\\]bruker Specifies the user context under which\n\ - the command should execute.\n\n\ - /P [passord] Specifies the password for the given\n\ - user context. Prompts for input if omitted.\n\n\ - /FO format Specifies the format in which the output\n\ - is to be displayed.\n\ - Valid values: \"TABLE\", \"LIST\", \"CSV\".\n\n\ - /NH Specifies that the \"Column Header\" should\n\ - not be displayed in the output.\n\ - Valid only for \"TABLE\" and \"CSV\" formats.\n\n\ - /? Displays this help/usage.\n\n\ +Beskrivelse:\n\ + Denne komando linje verktøyet gjør det mulig for en administrator å spørre om basis\n\ + system konfigurasjon informasjon.\n\n\ +Parameter liste:\n\ + /S system Spesifisere eksternt system for å kunne kobles til.\n\n\ + /U [domene\\]bruker Spesifisere brukeren sammenheng under hvilken\n\ + av kommando som skal kjøres.\n\n\ + /P [passord] Spesifisere passord for gitt\n\ + bruker sammenheng. Prompts for input if omitted.\n\n\ + /FO format Spesifisere formatet som i utgående\n\ + som skal vises.\n\ + Gyldige verdier: \"TABLE\", \"LIST\", \"CSV\".\n\n\ + /NH Spesifisere at \"Column Header\" skal\n\ + ikke vises i utgående.\n\ + Gyldig for bare \"TABLE\" og \"CSV\" formater.\n\n\ + /? Vis denne hjelp/bruk meldingen.\n\n\ Eksempler:\n\ SYSTEMINFO\n\ SYSTEMINFO /?\n\ SYSTEMINFO /S system\n\ SYSTEMINFO /S system /U bruker\n\ - SYSTEMINFO /S system /U domene\\user /P passord /FO TABLE\n\ + SYSTEMINFO /S system /U domene\\bruker /P passord /FO TABLE\n\ SYSTEMINFO /S system /FO LIST\n\ SYSTEMINFO /S system /FO CSV /NH\n" @@ -38,10 +38,10 @@ IDS_PRODUCT_ID, "Produkt ID: %s\n" IDS_INST_DATE, "Installert dato: %s, " IDS_INST_TIME, "%s\n" -IDS_SYS_TYPE_UNKNOWN, "System type: Ukjent\n" -IDS_SYS_TYPE_X86, "System type: X86-basert PC\n" -IDS_SYS_TYPE_IA64, "System type: IA64-basert PC\n" -IDS_SYS_TYPE_AMD64, "System type: AMD64-based PC\n" +IDS_SYS_TYPE_UNKNOWN, "Systemtype: Ukjent\n" +IDS_SYS_TYPE_X86, "Systemtype: X86-basert PC\n" +IDS_SYS_TYPE_IA64, "Systemtype: IA64-basert PC\n" +IDS_SYS_TYPE_AMD64, "Systemtype: AMD64-basert PC\n" IDS_PROCESSORS, "Prosessor(er): %u Prosessor(er) installert.\n" IDS_ROS_DIR, "ReactOS mappe: %s\n" IDS_SYS_DIR, "System mappe: %s\n" Added: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc (added) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -1,0 +1,68 @@ +/* TRANSLATOR : M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 07-09-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "SYSTEMINFO [/S systm [/U pou§._meno [/P [heslo]]]] [/FO form t] [/NH]\n\n\ +Description:\n\ + This command line tool enables an administrator to query for basic\n\ + system configuration information.\n\n\ +Parameter List:\n\ + /S systm Specifies the remote system to connect to.\n\n\ + /U [domna\\]pou§¡vate Specifies the user context under which\n\ + the command should execute.\n\n\ + /P [heslo] Specifies the password for the given\n\ + user context. Prompts for input if omitted.\n\n\ + /FO form t Specifies the format in which the output\n\ + is to be displayed.\n\ + Valid values: \"TABLE\", \"LIST\", \"CSV\".\n\n\ + /NH Specifies that the \"Column Header\" should\n\ + not be displayed in the output.\n\ + Valid only for \"TABLE\" and \"CSV\" formats.\n\n\ + /? Displays this help/usage.\n\n\ +Examples:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S system\n\ + SYSTEMINFO /S system /U user\n\ + SYSTEMINFO /S system /U domain\\user /P password /FO TABLE\n\ + SYSTEMINFO /S system /FO LIST\n\ + SYSTEMINFO /S system /FO CSV /NH\n" + +IDS_OS_NAME, "N zov OS: %s\n" +IDS_OS_VERSION, "Verzia OS: %d.%d.%d %s" +IDS_OS_BUILD, " Build %s\n" +IDS_OS_BUILD_TYPE, "OS Build typ: %s\n" +IDS_REG_OWNER, "Registovanì vlastn¡k: %s\n" +IDS_REG_ORG, "Registrovan organiz cia: %s\n" +IDS_PRODUCT_ID, "ID produktu: %s\n" +IDS_INST_DATE, "D tum inçtal cie: %s, " +IDS_INST_TIME, "%s\n" +IDS_SYS_TYPE_UNKNOWN, "Typ systmu: Nezn my\n" +IDS_SYS_TYPE_X86, "Typ systmu: PC zalo§en na X86\n" +IDS_SYS_TYPE_IA64, "Typ systmu: PC zalo§en na IA64\n" +IDS_SYS_TYPE_AMD64, "Typ systmu: PC zalo§en na AMD64\n" +IDS_PROCESSORS, "Procesor(y): %u Procesor(y) nainçtalovanì.\n" +IDS_ROS_DIR, "Adres r ReactOS: %s\n" +IDS_SYS_DIR, "Adres r System: %s\n" +IDS_BOOT_DEV, "Zav dzacie zariadenie: %s\n" +IDS_SYS_LOCALE, "System Locale: %s\n" +IDS_INPUT_LOCALE, "Input Locale: %s\n" +IDS_TOTAL_PHYS_MEM, "Celkov fyzick pam: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Dostupn fyzick pam: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Virtu lna pam: Max Size: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Virtu lna pam: Available: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Virtu lna pam: In Use: %ld MB (%ld KB)\n" +IDS_HOST_NAME, "Host Name: %s\n" +IDS_PAGEFILE_LOC, "Umiestnenie(a) str nkovacieho s£boru: %s\n" +IDS_TIME_ZONE, "¬asov p smo: %s\n" +IDS_DOMINE, "Domna: %s\n" +IDS_BIOS_DATE, "D tum BIOSu: %s\n" +IDS_BIOS_VERSION, "Verzia BIOSu: %s\n" +IDS_NETWORK_CARDS, "Sieov karta(y) %u nainçtalovan .\n" + +END Propchange: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc [iso-8859-1] Tue Sep 9 16:18:12 2008 @@ -6,5 +6,6 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/no-NO.rc"

1 0

[sginsberg] 36095: - Free memory allocated by MmHeapAlloc through MmHeapFree
by sginsberg＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: sginsberg Date: Tue Sep 9 15:06:59 2008 New Revision: 36095 URL: http://svn.reactos.org/svn/reactos?rev=36095&view=rev Log: - Free memory allocated by MmHeapAlloc through MmHeapFree Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] Tue Sep 9 15:06:59 2008 @@ -123,7 +123,7 @@ /* Set 'Identifier' value */ FldrSetIdentifier(BiosKey, "ACPI BIOS"); - MmFreeMemory(PartialResourceList); + MmHeapFree(PartialResourceList); } }

1 0

[cgutman] 36094: - Fix a memory leak
by cgutman＠svn.reactos.org 09 Sep '08

09 Sep '08

Author: cgutman Date: Tue Sep 9 14:47:12 2008 New Revision: 36094 URL: http://svn.reactos.org/svn/reactos?rev=36094&view=rev Log: - Fix a memory leak Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Tue Sep 9 14:47:12 2008 @@ -642,6 +642,7 @@ AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; PollReeval( FCB->DeviceExt, FCB->FileObject ); + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } else { PollReeval( FCB->DeviceExt, FCB->FileObject );

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