Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 51347: property svn:executable removed
by mkupfer＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: mkupfer Date: Fri Apr 15 12:17:50 2011 New Revision: 51347 URL: http://svn.reactos.org/svn/reactos?rev=51347&view=rev Log: property svn:executable removed Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c (props changed) Propchange: trunk/reactos/subsystems/win32/win32k/objects/drawing.c ------------------------------------------------------------------------------ --- svn:executable (original) +++ svn:executable (removed) @@ -1,1 +1,0 @@ -*

1 0

[mkupfer] 51346: potential memory problem fixed, obsolete assignment removed
by mkupfer＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: mkupfer Date: Fri Apr 15 12:16:26 2011 New Revision: 51346 URL: http://svn.reactos.org/svn/reactos?rev=51346&view=rev Log: potential memory problem fixed, obsolete assignment removed Modified: trunk/reactos/base/applications/taskmgr/trayicon.c Modified: trunk/reactos/base/applications/taskmgr/trayicon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/trayicon.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/trayicon.c [iso-8859-1] Fri Apr 15 12:16:26 2011 @@ -100,8 +100,6 @@ hOldBitmap = NULL; iconInfo.fIcon = TRUE; - iconInfo.xHotspot = 0; - iconInfo.yHotspot = 0; iconInfo.hbmMask = hBitmapMask; iconInfo.hbmColor = hBitmap; @@ -133,7 +131,7 @@ NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; - WCHAR szMsg[256]; + WCHAR szMsg[64]; memset(&nid, 0, sizeof(NOTIFYICONDATAW)); @@ -181,7 +179,7 @@ NOTIFYICONDATAW nid; HICON hIcon = NULL; BOOL bRetVal; - WCHAR szTemp[256]; + WCHAR szTemp[64]; memset(&nid, 0, sizeof(NOTIFYICONDATAW)); @@ -193,7 +191,7 @@ nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szTemp, 256); + LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szTemp, sizeof(szTemp)/sizeof(szTemp[0])); wsprintfW(nid.szTip, szTemp, PerfDataGetProcessorUsage()); bRetVal = Shell_NotifyIconW(NIM_MODIFY, &nid);

1 0

[mjmartin] 51345: [win32k] - Move dereferencing of the MessageQueue from co_UserDestroyWindow to co_UserFreeWindow. A reference is added to the MessageQueue for all windows created.co_UserFreeWindo...
by mjmartin＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: mjmartin Date: Fri Apr 15 07:10:00 2011 New Revision: 51345 URL: http://svn.reactos.org/svn/reactos?rev=51345&view=rev Log: [win32k] - Move dereferencing of the MessageQueue from co_UserDestroyWindow to co_UserFreeWindow. A reference is added to the MessageQueue for all windows created.co_UserFreeWindow is called for all windows and needs to be where the dereferencing of MessageQueue occurs. This fixes NonPagedPool memory leak. See bug 6112 for more info. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Apr 15 07:10:00 2011 @@ -447,6 +447,8 @@ /* flush the message queue */ MsqRemoveWindowMessagesFromQueue(Window); + + IntDereferenceMessageQueue(Window->head.pti->MessageQueue); /* from now on no messages can be sent to this window anymore */ Window->state |= WNDS_DESTROYED; @@ -2507,8 +2509,6 @@ ti->pDeskInfo->hShellWindow = NULL; } } - - IntDereferenceMessageQueue(Window->head.pti->MessageQueue); IntEngWindowChanged(Window, WOC_DELETE);

1 0

[mjmartin] 51344: [usbdriver] - KbdDispatch: Set Status vice IoStatus.Status for all branches of switch. Use break instead of goto intcontfailure. The previous code would set Status to what ever wa...
by mjmartin＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: mjmartin Date: Fri Apr 15 06:44:13 2011 New Revision: 51344 URL: http://svn.reactos.org/svn/reactos?rev=51344&view=rev Log: [usbdriver] - KbdDispatch: Set Status vice IoStatus.Status for all branches of switch. Use break instead of goto intcontfailure. The previous code would set Status to what ever was in the IoStatus.Status of the IRP and return that Status. Some times this would be STATUS_PENDING, which IIRC is a no-no. This caused the kbdclass to enter into a wait that would never be satisifed hence blocking the keyboard thread. This should fix the failure of keyboard input bugs. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Fri Apr 15 06:44:13 2011 @@ -392,8 +392,8 @@ if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(CONNECT_DATA)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_INTERNAL_KEYBOARD_CONNECT " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - goto intcontfailure; + Status = STATUS_INVALID_PARAMETER; + break; } RtlCopyMemory(&DeviceExtension->ConnectData, @@ -408,14 +408,14 @@ sizeof(KEYBOARD_ATTRIBUTES)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_ATTRIBUTES: " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; + Status = STATUS_BUFFER_TOO_SMALL; + break; } /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &DevExt->KeyboardAttributes, sizeof(KEYBOARD_ATTRIBUTES));*/ - Irp->IoStatus.Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; case IOCTL_KEYBOARD_QUERY_INDICATORS: usb_dbg_print(DBGLVL_MAXIMUM, ("IOCTL_KEYBOARD_QUERY_INDICATORS\n")); @@ -439,8 +439,8 @@ sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_QUERY_TYPEMATIC: " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; + Status = STATUS_BUFFER_TOO_SMALL; + break; } /*RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, &DevExt->KeyboardTypematic, @@ -454,8 +454,8 @@ sizeof(KEYBOARD_INDICATOR_PARAMETERS)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_SET_INDICTATORS: " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; + Status = STATUS_BUFFER_TOO_SMALL; + break; } RtlCopyMemory(&DeviceExtension->KeyboardIndicators, @@ -472,8 +472,8 @@ sizeof(KEYBOARD_TYPEMATIC_PARAMETERS)) { usb_dbg_print(DBGLVL_MAXIMUM, ("Keyboard IOCTL_KEYBOARD_SET_TYPEMATIC " "invalid buffer size\n")); - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - goto intcontfailure; + Status = STATUS_BUFFER_TOO_SMALL; + break; } /*RtlCopyMemory(&DevExt->KeyboardTypematic, @@ -501,10 +501,7 @@ Status = STATUS_SUCCESS;//STATUS_INVALID_DEVICE_REQUEST; break; } -intcontfailure: - Status = Irp->IoStatus.Status; - } - + } if (Status == STATUS_INVALID_DEVICE_REQUEST) {

1 0

[janderwald] 51343: [USBEHCI_NEW] - Implement CHCDController::Initialize, CHCDController::HandlePnp for PDO / FDO, - Partly implement CHCDController::HandleDeviceControl - Based on mjmartin usbehci...
by janderwald＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: janderwald Date: Thu Apr 14 16:42:02 2011 New Revision: 51343 URL: http://svn.reactos.org/svn/reactos?rev=51343&view=rev Log: [USBEHCI_NEW] - Implement CHCDController::Initialize, CHCDController::HandlePnp for PDO / FDO, - Partly implement CHCDController::HandleDeviceControl - Based on mjmartin usbehci sources - Driver now startups and acquires pnp resources - Fails in HandleDeviceControl with IOCTL_GET_HCD_DRIVERKEY_NAME when usbview is launched - Tested in Windows XP SP2 + Vmware Server 2.0.2 Added: branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp (with props) Modified: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h Modified: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] Thu Apr 14 16:42:02 2011 @@ -8,6 +8,7 @@ usbehci.cpp hcd_controller.cpp hardware.cpp + misc.cpp usbehci.rc) target_link_libraries(usbehci Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Thu Apr 14 16:42:02 2011 @@ -1,13 +1,14 @@ /* * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbehci_new/hcd_controller.cpp + * FILE: drivers/usb/usbehci/hcd_controller.cpp * PURPOSE: USB EHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ +#define INITGUID #include "usbehci.h" class CHCDController : public IHCDController @@ -38,12 +39,29 @@ NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + // local functions + NTSTATUS CreateFDO(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT * OutDeviceObject); + NTSTATUS CreatePDO(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT * OutDeviceObject); + NTSTATUS HandleQueryInterface(PIO_STACK_LOCATION IoStack); + NTSTATUS SetDeviceInterface(BOOLEAN bEnable); + // constructor / destructor CHCDController(IUnknown *OuterUnknown){} virtual ~CHCDController(){} protected: LONG m_Ref; + PROOTHDCCONTROLLER m_RootController; + PDRIVER_OBJECT m_DriverObject; + PDEVICE_OBJECT m_PhysicalDeviceObject; + PDEVICE_OBJECT m_FunctionalDeviceObject; + PDEVICE_OBJECT m_NextDeviceObject; + PUSBHARDWAREDEVICE m_Hardware; + PDEVICE_OBJECT m_BusPDO; + UNICODE_STRING m_HubDeviceInterfaceString; + BOOLEAN m_InterfaceEnabled; + ULONG m_PDODeviceNumber; + ULONG m_FDODeviceNumber; }; //================================================================================================= @@ -67,23 +85,237 @@ return STATUS_UNSUCCESSFUL; } +//------------------------------------------------------------------------------------------------- NTSTATUS CHCDController::Initialize( IN PROOTHDCCONTROLLER RootHCDController, IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PCOMMON_DEVICE_EXTENSION DeviceExtension; + + // + // create usb hardware + // + Status = CreateUSBHardware(&m_Hardware); + if (!NT_SUCCESS(Status)) + { + // + // failed to create hardware object + // + DPRINT1("Failed to create hardware object\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize members + // + m_DriverObject = DriverObject; + m_PhysicalDeviceObject = PhysicalDeviceObject; + m_RootController = RootHCDController; + + // + // create FDO + // + Status = CreateFDO(m_DriverObject, &m_FunctionalDeviceObject); + if (!NT_SUCCESS(Status)) + { + // + // failed to create PDO + // + return Status; + } + + // + // now attach to device stack + // + m_NextDeviceObject = IoAttachDeviceToDeviceStack(m_FunctionalDeviceObject, m_PhysicalDeviceObject); + if (!m_NextDeviceObject) + { + // + // failed to attach to device stack + // + IoDeleteDevice(m_FunctionalDeviceObject); + m_FunctionalDeviceObject = 0; + + return STATUS_NO_SUCH_DEVICE; + } + + // + // initialize hardware object + // + Status = m_Hardware->Initialize(m_DriverObject, m_FunctionalDeviceObject, m_PhysicalDeviceObject, m_NextDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize hardware object %x\n", Status); + + // + // failed to initialize hardware object, detach from device stack + // + IoDetachDevice(m_NextDeviceObject); + + // + // now delete the device + // + IoDeleteDevice(m_FunctionalDeviceObject); + + // + // nullify pointers :) + // + m_FunctionalDeviceObject = 0; + m_NextDeviceObject = 0; + + return Status; + } + + + // + // set device flags + // + m_FunctionalDeviceObject->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; + + + // + // get device extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)m_FunctionalDeviceObject->DeviceExtension; + PC_ASSERT(DeviceExtension); + + // + // initialize device extension + // + DeviceExtension->IsFDO = TRUE; + DeviceExtension->IsHub = FALSE; + DeviceExtension->HcdController = PHCDCONTROLLER(this); + + // + // device is initialized + // + m_FunctionalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + + // + // is there a root controller + // + if (m_RootController) + { + // + // add reference + // + m_RootController->AddRef(); + + // + // register with controller + // + m_RootController->RegisterHCD(this); + } + + + // + // done + // + return STATUS_SUCCESS; } +//------------------------------------------------------------------------------------------------- NTSTATUS CHCDController::HandleDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PCOMMON_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PUSB_HCD_DRIVERKEY_NAME DriverKey; + ULONG ResultLength; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get device extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + + DPRINT1("HandleDeviceControl>Type: FDO %u IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", + DeviceExtension->IsFDO, + IoStack->Parameters.DeviceIoControl.IoControlCode, + IoStack->Parameters.DeviceIoControl.InputBufferLength, + IoStack->Parameters.DeviceIoControl.OutputBufferLength); + + // + // get device type + // + if (DeviceExtension->IsFDO) + { + // + // perform ioctl for FDO + // + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_GET_HCD_DRIVERKEY_NAME) + { + // + // check if sizee is at least >= USB_HCD_DRIVERKEY_NAME + // + if(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(USB_HCD_DRIVERKEY_NAME)) + { + // + // get device property size + // + Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &ResultLength); + + DriverKey = (PUSB_HCD_DRIVERKEY_NAME)Irp->AssociatedIrp.SystemBuffer; + + // + // check result + // + if (Status == STATUS_BUFFER_TOO_SMALL) + { + // + // does the caller provide enough buffer space + // + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength >= ResultLength) + { + // + // it does + // + Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, IoStack->Parameters.DeviceIoControl.OutputBufferLength, DriverKey->DriverKeyName, &ResultLength); + + //DPRINT1("Result %S\n", DriverKey->DriverKeyName); + } + + // + // FIXME + // + + // + // store result + // + DriverKey->ActualLength = ResultLength; + Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + Status = STATUS_BUFFER_OVERFLOW; + } + } + else + { + // + // buffer is certainly too small + // + Status = STATUS_BUFFER_OVERFLOW; + Irp->IoStatus.Information = sizeof(USB_HCD_DRIVERKEY_NAME); + } + } + } + +// + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } NTSTATUS @@ -91,12 +323,336 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PCOMMON_DEVICE_EXTENSION DeviceExtension; + PCM_RESOURCE_LIST RawResourceList; + PCM_RESOURCE_LIST TranslatedResourceList; + PDEVICE_RELATIONS DeviceRelations; + PDEVICE_CAPABILITIES DeviceCapabilities; + LPGUID Guid; + NTSTATUS Status; + ULONG Index; + + DPRINT("HandlePnp\n"); + + // + // get device extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch(IoStack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + DPRINT1("IRP_MN_START FDO: %lu\n", DeviceExtension->IsFDO); + + if (DeviceExtension->IsFDO) + { + // + // first start lower device object + // + Status = SyncForwardIrp(m_NextDeviceObject, Irp); + + if (NT_SUCCESS(Status)) + { + // + // operation succeeded, lets start the device + // + RawResourceList = IoStack->Parameters.StartDevice.AllocatedResources; + TranslatedResourceList = IoStack->Parameters.StartDevice.AllocatedResourcesTranslated; + + if (m_Hardware) + { + // + // start the hardware + // + Status = m_Hardware->PnpStart(RawResourceList, TranslatedResourceList); + } + } + + // + // HACK / FIXME: Windows XP SP3 fails to enumerate the PDO correctly, which + // causes the PDO device never to startup. + // + Status = SetDeviceInterface(TRUE); + } + else + { + // + // start the PDO device + // + ASSERT(0); + + // + //FIXME create the parent root hub device + // + + // + // register device interface + // + Status = SetDeviceInterface(TRUE); + } + + DPRINT1("IRP_MN_START FDO: %lu Status %x\n", DeviceExtension->IsFDO, Status); + + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS Type %lx FDO: \n", IoStack->Parameters.QueryDeviceRelations.Type, DeviceExtension->IsFDO); + + if (m_BusPDO == NULL) + { + // + // create bus PDO + // + Status = CreatePDO(m_DriverObject, &m_BusPDO); + + if (!NT_SUCCESS(Status)) + { + // + // failed to create bus device object + // + break; + } + + // + // initialize extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)m_BusPDO->DeviceExtension; + DeviceExtension->IsFDO = FALSE; + DeviceExtension->IsHub = FALSE; + DeviceExtension->HcdController = (this); + + // + // clear init flag + // + m_BusPDO->Flags &= ~DO_DEVICE_INITIALIZING; + } + + if (IoStack->Parameters.QueryDeviceRelations.Type == BusRelations) + { + // + // allocate device relations + // + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); + + if (!DeviceRelations) + { + // + // no memory + // + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // + // init device relations + // + DeviceRelations->Count = 1; + DeviceRelations->Objects [0] = m_BusPDO; + + ObReferenceObject(m_BusPDO); + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + Status = STATUS_SUCCESS; + } + break; + } + + case IRP_MN_STOP_DEVICE: + { + DPRINT1("IRP_MN_STOP_DEVICE FDO: %lu\n", DeviceExtension->IsFDO); + + if (m_Hardware) + { + // + // stop the hardware + // + Status = m_Hardware->PnpStop(); + } + else + { + // + // fake success + // + Status = STATUS_SUCCESS; + } + + if (NT_SUCCESS(Status)) + { + // + // stop lower device + // + Status = SyncForwardIrp(m_NextDeviceObject, Irp); + } + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + DPRINT1("IRP_MN_QUERY_CAPABILITIES FDO: %lu\n", DeviceExtension->IsFDO); + + if (DeviceExtension->IsFDO == FALSE) + { + DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; + + DeviceCapabilities->LockSupported = FALSE; + DeviceCapabilities->EjectSupported = FALSE; + DeviceCapabilities->Removable = FALSE; + DeviceCapabilities->DockDevice = FALSE; + DeviceCapabilities->UniqueID = FALSE; + DeviceCapabilities->SilentInstall = FALSE; + DeviceCapabilities->RawDeviceOK = FALSE; + DeviceCapabilities->SurpriseRemovalOK = FALSE; + DeviceCapabilities->Address = 0; + DeviceCapabilities->UINumber = 0; + DeviceCapabilities->DeviceD2 = 1; + + /* FIXME */ + DeviceCapabilities->HardwareDisabled = FALSE; + DeviceCapabilities->NoDisplayInUI = FALSE; + DeviceCapabilities->DeviceState[0] = PowerDeviceD0; + for (Index = 0; Index < PowerSystemMaximum; Index++) + DeviceCapabilities->DeviceState[Index] = PowerDeviceD3; + DeviceCapabilities->DeviceWake = PowerDeviceUnspecified; + DeviceCapabilities->D1Latency = 0; + DeviceCapabilities->D2Latency = 0; + DeviceCapabilities->D3Latency = 0; + + Status = STATUS_SUCCESS; + } + else + { + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); + } + + break; + } + case IRP_MN_QUERY_INTERFACE: + { + DPRINT1("IRP_MN_QUERY_INTERFACE FDO %u\n", DeviceExtension->IsFDO); + // + // check if the device is FDO + // + if (DeviceExtension->IsFDO) + { + // + // just pass the irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); + } + + // + // handle device interface requests + // + Status = HandleQueryInterface(IoStack); + break; + } + case IRP_MN_QUERY_BUS_INFORMATION: + { + DPRINT1("IRP_MN_QUERY_BUS_INFORMATION FDO %lx\n", DeviceExtension->IsFDO); + + if (DeviceExtension->IsFDO == FALSE) + { + // + // allocate buffer for bus guid + // + Guid = (LPGUID)ExAllocatePool(PagedPool, sizeof(GUID)); + if (Guid) + { + // + // copy BUS guid + // + RtlMoveMemory(Guid, &GUID_BUS_TYPE_USB, sizeof(GUID)); + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = (ULONG_PTR)Guid; + } + } + break; + } + case IRP_MN_REMOVE_DEVICE: + { + DPRINT1("IRP_MN_REMOVE_DEVICE FDO: %lu\n", DeviceExtension->IsFDO); + + if (DeviceExtension->IsFDO == FALSE) + { + // + // deactivate device interface for BUS PDO + // + SetDeviceInterface(FALSE); + + // + // complete the request first + // + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // now delete device + // + IoDeleteDevice(m_BusPDO); + + // + // nullify pointer + // + m_BusPDO = 0; + return STATUS_SUCCESS; + } + else + { + // + // detach device from device stack + // + IoDetachDevice(m_NextDeviceObject); + + // + // delete device + // + IoDeleteDevice(m_FunctionalDeviceObject); + } + + Status = STATUS_SUCCESS; + break; + } + default: + { + if (DeviceExtension->IsFDO) + { + DPRINT1("HandlePnp> FDO Dispatch to lower device object %lu\n", IoStack->MinorFunction); + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); + } + else + { + DPRINT1("UNHANDLED PDO Request %lu\n", IoStack->MinorFunction); + } + } + } + + // + // store result and complete request + // + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return Status; } NTSTATUS @@ -112,8 +668,263 @@ return STATUS_NOT_IMPLEMENTED; } - - +NTSTATUS +CHCDController::HandleQueryInterface( + PIO_STACK_LOCATION IoStack) +{ + UNICODE_STRING GuidBuffer; + NTSTATUS Status; + + if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType, USB_BUS_INTERFACE_HUB_GUID)) + { + DPRINT1("HandleQueryInterface> UNIMPLEMENTED USB_BUS_INTERFACE_HUB_GUID Version %x\n", IoStack->Parameters.QueryInterface.Version); + + } + else if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType, USB_BUS_INTERFACE_USBDI_GUID)) + { + DPRINT1("HandleQueryInterface> UNIMPLEMENTED USB_BUS_INTERFACE_USBDI_GUID Version %x\n", IoStack->Parameters.QueryInterface.Version); + } + else + { + // + // convert guid to string + // + Status = RtlStringFromGUID(*IoStack->Parameters.QueryInterface.InterfaceType, &GuidBuffer); + if (NT_SUCCESS(Status)) + { + // + // print interface + // + DPRINT1("HandleQueryInterface GUID: %wZ Version %x\n", &GuidBuffer, IoStack->Parameters.QueryInterface.Version); + + // + // free guid buffer + // + RtlFreeUnicodeString(&GuidBuffer); + } + } + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +CHCDController::CreateFDO( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT * OutDeviceObject) +{ + WCHAR CharDeviceName[64]; + NTSTATUS Status; + ULONG UsbDeviceNumber = 0; + UNICODE_STRING DeviceName; + + while (TRUE) + { + // + // construct device name + // + swprintf(CharDeviceName, L"\\Device\\USBFDO-%d", UsbDeviceNumber); + + // + // initialize device name + // + RtlInitUnicodeString(&DeviceName, CharDeviceName); + + // + // create device + // + Status = IoCreateDevice(DriverObject, + sizeof(COMMON_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_CONTROLLER, + 0, + FALSE, + OutDeviceObject); + + // + // check for success + // + if (NT_SUCCESS(Status)) + break; + + // + // is there a device object with that same name + // + if ((Status == STATUS_OBJECT_NAME_EXISTS) || (Status == STATUS_OBJECT_NAME_COLLISION)) + { + // + // Try the next name + // + UsbDeviceNumber++; + continue; + } + + // + // bail out on other errors + // + if (!NT_SUCCESS(Status)) + { + DPRINT1("CreateFDO: Failed to create %wZ, Status %x\n", &DeviceName, Status); + return Status; + } + } + + // + // store FDO number + // + m_FDODeviceNumber = UsbDeviceNumber; + + DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); + + /* done */ + return Status; +} + +NTSTATUS +CHCDController::SetDeviceInterface( + BOOLEAN Enable) +{ + NTSTATUS Status; + WCHAR LinkName[32]; + WCHAR FDOName[32]; + UNICODE_STRING Link, FDO; + + if (Enable) + { + // + // register device interface + // + Status = IoRegisterDeviceInterface(m_PhysicalDeviceObject, &GUID_DEVINTERFACE_USB_HUB, 0, &m_HubDeviceInterfaceString); + + if (NT_SUCCESS(Status)) + { + // + // now enable the device interface + // + Status = IoSetDeviceInterfaceState(&m_HubDeviceInterfaceString, TRUE); + + // + // enable interface + // + m_InterfaceEnabled = TRUE; + } + + // + // create legacy link + // + swprintf(LinkName, L"\\DosDevices\\HCD%d", m_PDODeviceNumber); + swprintf(FDOName, L"\\Device\\USBFDO-%d", m_FDODeviceNumber); + RtlInitUnicodeString(&Link, LinkName); + RtlInitUnicodeString(&FDO, FDOName); + + // + // create symbolic link + // + Status = IoCreateSymbolicLink(&Link, &FDO); + + if (!NT_SUCCESS(Status)) + { + // + // FIXME: handle me + // + ASSERT(0); + } + } + else if (m_InterfaceEnabled) + { + // + // disable device interface + // + Status = IoSetDeviceInterfaceState(&m_HubDeviceInterfaceString, FALSE); + + if (NT_SUCCESS(Status)) + { + // + // now delete interface string + // + RtlFreeUnicodeString(&m_HubDeviceInterfaceString); + } + + // + // disable interface + // + m_InterfaceEnabled = FALSE; + + } + + // + // done + // + return Status; +} + +NTSTATUS +CHCDController::CreatePDO( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT * OutDeviceObject) +{ + WCHAR CharDeviceName[64]; + NTSTATUS Status; + ULONG UsbDeviceNumber = 0; + UNICODE_STRING DeviceName; + + while (TRUE) + { + // + // construct device name + // + swprintf(CharDeviceName, L"\\Device\\USBPDO-%d", UsbDeviceNumber); + + // + // initialize device name + // + RtlInitUnicodeString(&DeviceName, CharDeviceName); + + // + // create device + // + Status = IoCreateDevice(DriverObject, + sizeof(COMMON_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_CONTROLLER, + 0, + FALSE, + OutDeviceObject); + + /* check for success */ + if (NT_SUCCESS(Status)) + break; + + // + // is there a device object with that same name + // + if ((Status == STATUS_OBJECT_NAME_EXISTS) || (Status == STATUS_OBJECT_NAME_COLLISION)) + { + // + // Try the next name + // + UsbDeviceNumber++; + continue; + } + + // + // bail out on other errors + // + if (!NT_SUCCESS(Status)) + { + DPRINT1("CreatePDO: Failed to create %wZ, Status %x\n", &DeviceName, Status); + return Status; + } + } + + // + // store PDO number + // + m_PDODeviceNumber = UsbDeviceNumber; + + DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); + + /* done */ + return Status; +} NTSTATUS CreateHCDController( @@ -121,14 +932,30 @@ { PHCDCONTROLLER This; + // + // allocate controller + // This = new(NonPagedPool, 0) CHCDController(0); if (!This) + { + // + // failed to allocate + // return STATUS_INSUFFICIENT_RESOURCES; - + } + + // + // add reference count + // This->AddRef(); + // // return result + // *OutHcdController = (PHCDCONTROLLER)This; + // + // done + // return STATUS_SUCCESS; } Added: branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp [iso-8859-1] Thu Apr 14 16:42:02 2011 @@ -1,0 +1,82 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/misc.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" + +// +// driver verifier +// +IO_COMPLETION_ROUTINE SyncForwardIrpCompletionRoutine; + +NTSTATUS +NTAPI +SyncForwardIrpCompletionRoutine( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) +{ + if (Irp->PendingReturned) + { + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + } + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + KEVENT Event; + NTSTATUS Status; + + // + // initialize event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // copy irp stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, SyncForwardIrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + + // + // call driver + // + Status = IoCallDriver(DeviceObject, Irp); + + + // + // check if pending + // + if (Status == STATUS_PENDING) + { + // + // wait for the request to finish + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // copy status code + // + Status = Irp->IoStatus.Status; + } + + // + // done + // + return Status; +} + Propchange: branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Thu Apr 14 16:42:02 2011 @@ -50,4 +50,9 @@ // NTSTATUS CreateUSBHardware(PUSBHARDWAREDEVICE *OutHardware); +// +// misc.cpp +// +NTSTATUS NTAPI SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp); + #endif

1 0

[janderwald] 51342: [USBEHCI_NEW] - Fix build breakage from 51341
by janderwald＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: janderwald Date: Thu Apr 14 13:03:01 2011 New Revision: 51342 URL: http://svn.reactos.org/svn/reactos?rev=51342&view=rev Log: [USBEHCI_NEW] - Fix build breakage from 51341 Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Apr 14 13:03:01 2011 @@ -41,6 +41,7 @@ NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager); NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); NTSTATUS ResetController(); + NTSTATUS ResetPort(ULONG PortIndex); KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); // local @@ -75,8 +76,6 @@ IN REFIID refiid, OUT PVOID* Output) { - UNICODE_STRING GuidString; - if (IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNKNOWN(this));

1 0

[janderwald] 51341: [USBEHCI_NEW] - Implement CUSBHardwareDevice::Initialize, CUSBHardwareDevice::AcquireDeviceLock, CUSBHardwareDevice::ReleaseDeviceLock - Partly implement CUSBHardwareDevice::Pnp...
by janderwald＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: janderwald Date: Thu Apr 14 12:55:41 2011 New Revision: 51341 URL: http://svn.reactos.org/svn/reactos?rev=51341&view=rev Log: [USBEHCI_NEW] - Implement CUSBHardwareDevice::Initialize, CUSBHardwareDevice::AcquireDeviceLock, CUSBHardwareDevice::ReleaseDeviceLock - Partly implement CUSBHardwareDevice::PnpStart - Code from CUSBHardwareDevice::PnpStart was taken from mjmartin usbehci implementation Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Apr 14 12:55:41 2011 @@ -1,13 +1,14 @@ /* * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbehci_new/hcd_controller.cpp + * FILE: drivers/usb/usbehci/hcd_controller.cpp * PURPOSE: USB EHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ +#define INITGUID #include "usbehci.h" class CUSBHardwareDevice : public IUSBHardwareDevice @@ -40,9 +41,13 @@ NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager); NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); NTSTATUS ResetController(); - NTSTATUS ResetPort(ULONG PortIndex); KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); + // local + BOOLEAN InterruptService(); + + // friend function + friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); // constructor / destructor CUSBHardwareDevice(IUnknown *OuterUnknown){} @@ -50,8 +55,15 @@ protected: LONG m_Ref; + PDRIVER_OBJECT m_DriverObject; + PDEVICE_OBJECT m_PhysicalDeviceObject; + PDEVICE_OBJECT m_FunctionalDeviceObject; + PDEVICE_OBJECT m_NextDeviceObject; KSPIN_LOCK m_Lock; - + PKINTERRUPT m_Interrupt; + PULONG m_Base; + PDMA_ADAPTER m_Adapter; + ULONG m_MapRegisters; }; //================================================================================================= @@ -82,8 +94,23 @@ PDEVICE_OBJECT PhysicalDeviceObject, PDEVICE_OBJECT LowerDeviceObject) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + + DPRINT1("CUSBHardwareDevice::Initialize\n"); + + // + // store device objects + // + m_DriverObject = DriverObject; + m_FunctionalDeviceObject = FunctionalDeviceObject; + m_PhysicalDeviceObject = PhysicalDeviceObject; + m_NextDeviceObject = LowerDeviceObject; + + // + // initialize device lock + // + KeInitializeSpinLock(&m_Lock); + + return STATUS_SUCCESS; } @@ -92,8 +119,100 @@ PCM_RESOURCE_LIST RawResources, PCM_RESOURCE_LIST TranslatedResources) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + ULONG Index; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + DEVICE_DESCRIPTION DeviceDescription; + PVOID ResourceBase; + NTSTATUS Status; + + DPRINT1("CUSBHardwareDevice::PnpStart\n"); + for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++) + { + // + // get resource descriptor + // + ResourceDescriptor = &TranslatedResources->List[0].PartialResourceList.PartialDescriptors[Index]; + + switch(ResourceDescriptor->Type) + { + case CmResourceTypeInterrupt: + { + Status = IoConnectInterrupt(&m_Interrupt, + InterruptServiceRoutine, + (PVOID)this, + NULL, + ResourceDescriptor->u.Interrupt.Vector, + (KIRQL)ResourceDescriptor->u.Interrupt.Level, + (KIRQL)ResourceDescriptor->u.Interrupt.Level, + (KINTERRUPT_MODE)(ResourceDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED), + (ResourceDescriptor->ShareDisposition != CmResourceShareDeviceExclusive), + ResourceDescriptor->u.Interrupt.Affinity, + FALSE); + + if (!NT_SUCCESS(Status)) + { + // + // failed to register interrupt + // + DPRINT1("IoConnect Interrupt failed with %x\n", Status); + return Status; + } + break; + } + case CmResourceTypeMemory: + { + // + // get resource base + // + ResourceBase = MmMapIoSpace(ResourceDescriptor->u.Memory.Start, ResourceDescriptor->u.Memory.Length, MmNonCached); + if (!ResourceBase) + { + // + // failed to map registers + // + DPRINT1("MmMapIoSpace failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + //FIXME: query capabilities and update m_Base + // + break; + } + } + } + + + // + // zero device description + // + RtlZeroMemory(&DeviceDescription, sizeof(DEVICE_DESCRIPTION)); + + // + // initialize device description + // + DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; + DeviceDescription.Master = TRUE; + DeviceDescription.ScatterGather = TRUE; + DeviceDescription.Dma32BitAddresses = TRUE; + DeviceDescription.DmaWidth = Width32Bits; + DeviceDescription.InterfaceType = PCIBus; + DeviceDescription.MaximumLength = MAXULONG; + + // + // get dma adapter + // + m_Adapter = IoGetDmaAdapter(m_PhysicalDeviceObject, &DeviceDescription, &m_MapRegisters); + if (!m_Adapter) + { + // + // failed to get dma adapter + // + DPRINT1("Failed to acquire dma adapter\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + return STATUS_SUCCESS; } NTSTATUS @@ -159,10 +278,25 @@ KIRQL CUSBHardwareDevice::AcquireDeviceLock(void) { - KIRQL OldLevel = 0; - - UNIMPLEMENTED + KIRQL OldLevel; + + // + // acquire lock + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // return old irql + // return OldLevel; +} + + +VOID +CUSBHardwareDevice::ReleaseDeviceLock( + KIRQL OldLevel) +{ + KeReleaseSpinLock(&m_Lock, OldLevel); } BOOLEAN @@ -175,14 +309,6 @@ return FALSE; } -VOID -CUSBHardwareDevice::ReleaseDeviceLock( - KIRQL OldLevel) -{ - UNIMPLEMENTED -} - - NTSTATUS CreateUSBHardware( PUSBHARDWAREDEVICE *OutHardware)

1 0

[akhaldi] 51340: [CMAKE] * Sync with trunk r51339. * Move the static lib creation command from the toolchain file to gcc.cmake
by akhaldi＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: akhaldi Date: Thu Apr 14 12:50:32 2011 New Revision: 51340 URL: http://svn.reactos.org/svn/reactos?rev=51340&view=rev Log: [CMAKE] * Sync with trunk r51339. * Move the static lib creation command from the toolchain file to gcc.cmake Added: branches/cmake-bringup/dll/cpl/usrmgr/lang/uk-UA.rc - copied unchanged from r51338, trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c branches/cmake-bringup/base/applications/cmdutils/doskey/lang/uk-UA.rc branches/cmake-bringup/base/applications/cmdutils/more/lang/uk-UA.rc branches/cmake-bringup/base/applications/dxdiag/lang/ua-UA.rc branches/cmake-bringup/base/applications/fontview/lang/uk-UA.rc branches/cmake-bringup/base/applications/mmc/lang/uk-UA.rc branches/cmake-bringup/base/applications/network/ping/lang/uk-UA.rc branches/cmake-bringup/base/applications/sndvol32/lang/uk-UA.rc branches/cmake-bringup/base/applications/taskmgr/trayicon.c branches/cmake-bringup/base/setup/reactos/lang/bg-BG.rc branches/cmake-bringup/base/setup/reactos/lang/cs-CZ.rc branches/cmake-bringup/base/setup/reactos/lang/de-DE.rc branches/cmake-bringup/base/setup/reactos/lang/el-GR.rc branches/cmake-bringup/base/setup/reactos/lang/en-US.rc branches/cmake-bringup/base/setup/reactos/lang/es-ES.rc branches/cmake-bringup/base/setup/reactos/lang/et-EE.rc branches/cmake-bringup/base/setup/reactos/lang/fi-FI.rc branches/cmake-bringup/base/setup/reactos/lang/fr-FR.rc branches/cmake-bringup/base/setup/reactos/lang/hu-HU.rc branches/cmake-bringup/base/setup/reactos/lang/it-IT.rc branches/cmake-bringup/base/setup/reactos/lang/no-NO.rc branches/cmake-bringup/base/setup/reactos/lang/pl-PL.rc branches/cmake-bringup/base/setup/reactos/lang/pt-BR.rc branches/cmake-bringup/base/setup/reactos/lang/ro-RO.rc branches/cmake-bringup/base/setup/reactos/lang/ru-RU.rc branches/cmake-bringup/base/setup/reactos/lang/sk-SK.rc branches/cmake-bringup/base/setup/reactos/lang/uk-UA.rc branches/cmake-bringup/base/setup/vmwinst/lang/uk-UA.rc branches/cmake-bringup/base/shell/explorer-new/lang/uk-UA.rc branches/cmake-bringup/base/shell/explorer/desktop/desktop.cpp branches/cmake-bringup/base/shell/explorer/explorer-uk.rc branches/cmake-bringup/base/system/format/lang/uk-UA.rc branches/cmake-bringup/dll/cpl/usrmgr/rsrc.rc branches/cmake-bringup/drivers/usb/CMakeLists.txt branches/cmake-bringup/drivers/usb/usbehci/common.c branches/cmake-bringup/drivers/usb/usbehci/fdo.c branches/cmake-bringup/drivers/usb/usbehci/hardware.c branches/cmake-bringup/drivers/usb/usbehci/hardware.h branches/cmake-bringup/drivers/usb/usbehci/hwiface.c branches/cmake-bringup/drivers/usb/usbehci/hwiface.h branches/cmake-bringup/drivers/usb/usbehci/irp.c branches/cmake-bringup/drivers/usb/usbehci/pdo.c branches/cmake-bringup/drivers/usb/usbehci/physmem.c branches/cmake-bringup/drivers/usb/usbehci/physmem.h branches/cmake-bringup/drivers/usb/usbehci/transfer.c branches/cmake-bringup/drivers/usb/usbehci/transfer.h branches/cmake-bringup/drivers/usb/usbehci/usbehci.c branches/cmake-bringup/drivers/usb/usbehci/usbehci.h branches/cmake-bringup/drivers/usb/usbehci/usbiffn.c branches/cmake-bringup/gcc.cmake branches/cmake-bringup/lib/rtl/actctx.c branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/uk-UA.rc branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c branches/cmake-bringup/subsystems/win32/win32k/objects/coord.c branches/cmake-bringup/toolchain-mingw32.cmake [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/more/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/dxdiag/lang/ua-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mmc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/network/ping/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/taskmgr/trayicon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/vmwinst/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… Modified: branches/cmake-bringup/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/system/format/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… Modified: branches/cmake-bringup/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/usrmgr/rs… Modified: branches/cmake-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/CMake… Modified: branches/cmake-bringup/drivers/usb/usbehci/common.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/hwiface.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/hwiface.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/physmem.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/physmem.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/transfer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/transfer.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=513… Modified: branches/cmake-bringup/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/actctx.c?… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32…

1 0

[fireball] 51339: [RTL] - If there is no data provided and parameters are valid, fail with STATUS_SXS_KEY_NOT_FOUND.
by fireball＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: fireball Date: Thu Apr 14 12:20:47 2011 New Revision: 51339 URL: http://svn.reactos.org/svn/reactos?rev=51339&view=rev Log: [RTL] - If there is no data provided and parameters are valid, fail with STATUS_SXS_KEY_NOT_FOUND. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=51339… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Apr 14 12:20:47 2011 @@ -2710,6 +2710,10 @@ status = STATUS_SXS_KEY_NOT_FOUND; + /* if there is no data, but params are valid, + we return that sxs key is not found to be at least somehow compatible */ + if (!data) return status; + ASSERT(NtCurrentTeb()); ASSERT(NtCurrentTeb()->ActivationContextStackPointer);

1 0

[akhaldi] 51338: [TRANSLATIONS] Igor Paliychuk (mansonigor at gmail dot com): * Update Ukrainian localization. * Leftover from r51055: Update reactos.exe strings and resource sizes. * Fix displayin...
by akhaldi＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: akhaldi Date: Thu Apr 14 12:13:38 2011 New Revision: 51338 URL: http://svn.reactos.org/svn/reactos?rev=51338&view=rev Log: [TRANSLATIONS] Igor Paliychuk (mansonigor at gmail dot com): * Update Ukrainian localization. * Leftover from r51055: Update reactos.exe strings and resource sizes. * Fix displaying of doskey localizations. Added: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc trunk/reactos/base/applications/fontview/lang/uk-UA.rc trunk/reactos/base/applications/mmc/lang/uk-UA.rc trunk/reactos/base/applications/network/ping/lang/uk-UA.rc trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/bg-BG.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/el-GR.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/et-EE.rc trunk/reactos/base/setup/reactos/lang/fi-FI.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/hu-HU.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/shell/explorer/explorer-uk.rc trunk/reactos/base/system/format/lang/uk-UA.rc trunk/reactos/dll/cpl/usrmgr/rsrc.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -2,6 +2,7 @@ #include <stdio.h> #include <wchar.h> #include <assert.h> +#include <locale.h> #include "doskey.h" #define MAX_STRING 2000 @@ -190,6 +191,8 @@ int wmain(VOID) { + setlocale(LC_ALL, ""); + /* Get the full command line using GetCommandLine(). We can't just use argv, * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ WCHAR *pArgStart; Modified: trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/cmdutils/doskey/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for ReactOS DOSKey - * TRANSLATOR: Sakara Yevhen + * TRANSLATOR: Sakara Yevhen, Igor Paliychuk */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -11,25 +11,25 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_HELP, "Ìåíåäæåð êîìàíäíîãî ðÿäêà äëÿ ðåäàãóâàííÿ íàëàøòóâàíü, ³ñòîð³¿ òà ìàêðîñ³â.\n\ +IDS_HELP, "Ìåíåäæåð êîìàíäíîãî ðÿäêà äëÿ ðåäàãóâàííÿ íàëàøòóâàíü, iñòîði¿ òà ìàêðîñiâ.\n\ \n\ DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\ [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\ \n\ - /INSERT Äîçâ³ë âêëþ÷åííÿ ðåæèìó.\n\ - /OVERSTRIKE Çàáîðîíà âêëþ÷åííÿ ðåæèìó.\n\ - /EXENAME=exename Âñòàíîâëåííÿ ³ì'ÿ ïðîãðàìè äëÿ ïåðåãëÿäó/çì³íè ³ñòîð³¿\n\ - ³ ìàêðîñ³â. Çíà÷åííÿ çà çàìîâ÷óâàííÿì cmd.exe.\n\ - /HISTORY Â³äîáðàæåííÿ ³ñòîð³¿ êîìàíä.\n\ - /LISTSIZE=size Âñòàíîâëåííÿ ê³ëüêîñò³ êîìàíä çà ³ñòîð³þ áóôåðà.\n\ - /REINSTALL Î÷èùåííÿ ³ñòîð³¿ êîìàíä.\n\ - /MACROS Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü.\n\ - /MACROS:exename Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü äëÿ êîíêðåòíî¿ ïðîãðàìè.\n\ - /MACROS:ALL Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü äëÿ âñ³õ ïðîãðàì.\n\ - /MACROFILE=filename Çàâàíòàæåííÿ ìàêðîñ³ âèçíà÷åíü ç ôàéëó.\n\ - macroname Âèçíà÷åííÿ ³ì'ÿ ìàêðîñó äëÿ ñòâîðåííÿ.\n\ - text Âèçíà÷åííÿ çàì³íè òåêñòó â ìàêðîñ³.\n" + /INSERT Âêëþ÷àº ðåæèì âñòàâêè.\n\ + /OVERSTRIKE Âiäêëþ÷àº ðåæèì âñòàâêè.\n\ + /EXENAME=exename Âñòàíîâëåííÿ íàçâè ïðîãðàìè äëÿ ïåðåãëÿäó/çìiíè iñòîði¿\n\ + i ìàêðîñiâ. Çíà÷åííÿ çà çàìîâ÷óâàííÿì cmd.exe.\n\ + /HISTORY Âiäîáðàæåííÿ iñòîði¿ êîìàíä.\n\ + /LISTSIZE=size Âñòàíîâëåííÿ êiëüêîñòi êîìàíä â áóôåð³ iñòîði¿.\n\ + /REINSTALL Î÷èùåííÿ iñòîði¿ êîìàíä.\n\ + /MACROS Âiäîáðàæåííÿ âèçíà÷åíü ìàêðîñiâ.\n\ + /MACROS:exename Âiäîáðàæåííÿ âèçíà÷åíü ìàêðîñiâ äëÿ êîíêðåòíî¿ ïðîãðàìè.\n\ + /MACROS:ALL Âiäîáðàæåííÿ âèçíà÷åíü ìàêðîñiâ äëÿ âñiõ ïðîãðàì.\n\ + /MACROFILE=filename Çàâàíòàæåííÿ âèçíà÷åíü ìàêðîñiâ ç ôàéëó.\n\ + macroname Âèçíà÷åííÿ iìåíi ìàêðîñó äëÿ ñòâîðåííÿ.\n\ + text Âèçíà÷åííÿ çàìiíè òåêñòó â ìàêðîñi.\n" -IDS_INVALID_MACRO_DEF, "Íåä³éñíèé ìàêðîñ âèçíà÷åííÿ: %s\n" +IDS_INVALID_MACRO_DEF, "Íåäiéñíèé ìàêðîñ âèçíà÷åííÿ: %s\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -9,15 +9,15 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_USAGE, "Âèâîäèòü ³íôðìàö³þ ïîåêðàííî. Âèêîðèñòàííÿ:\n\n\ - MORE < [Drive:][Path]²ì'ÿ_ôàéëó\n\ + IDS_USAGE, "Âèâîäèòü iíôðìàö³þ ïîåêðàííî. Âèêîðèñòàííÿ:\n\n\ + MORE < [Äèñê:][Øëÿõ]Iì'ÿ_ôàéëó\n\ Command | MORE \n\ - MORE [Drive:][Path]²ì'ÿ_ôàéëó\n\n\ + MORE [Äèñê:][Øëÿõ]Iì'ÿ_ôàéëó\n\n\ Äå: \n\ - [Drive:][Path]²ì'ÿ_ôàéëó Ôàéë, âì³ñò ÿêîãî òðåáà âèâåñòè íà åêðàí.\n\ + [Äèñê:][Øëÿõ]²ì'ÿ_ôàéëó Ôàéë, âìiñò ÿêîãî òðåáà âèâåñòè íà åêðàí.\n\ Command\t\t Êîìàíäà, ðåçóëüòàò ðîáîòè ÿêî¿ òðåáà âèâåñòè íà åêðàí.\n\n\ - Íà çàïðîøåííÿ ""-- Äàë³ --"" Âè ìîæåòå íàòèñíóòè áóäü-ÿêó êëàâ³øó ùîá ïîáà÷èòè íàñòóïíó ñòîð³íêó.\n" + Íà çàïðîøåííÿ ""-- Äàëi --"" Âè ìîæåòå íàòèñíóòè áóäü-ÿêó êëàâiøó ùîá ïîáà÷èòè íàñòóïíó ñòîðiíêó.\n" - IDS_CONTINUE, " -- Äàë³ (100%) -- " + IDS_CONTINUE, " -- Äàëi (100%) -- " IDS_FILE_ACCESS, "Íå ìîæó îòðèìàòè äîñòóï äî ôàéëà %s." END Modified: trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -219,7 +219,7 @@ IDS_REG_SUCCESS "Òàê" IDS_REG_FAIL "Ïîìèëêà" IDS_DDTEST_ERROR "Çá³é ó ïåðåâ³ðö³!" - IDS_DDTEST_DESCRIPTION "Áóäå âèêîíàíà ïåðåâ³ðêà DirecDraw íà öåé ïðèñòð³é. Ïðîäîâæèòè?" + IDS_DDTEST_DESCRIPTION "Áóäå âèêîíàíà ïåðåâ³ðêà ³íòåðôåéñó DirecDraw. Ïðîäîâæèòè?" IDS_DDPRIMARY_DESCRIPTION "Öåé òåñò áóäå âèêîðèñòîâóâàòè DirectDraw äëÿ ìàëþâàííÿ íà ïåðâèíí³é ïîâåðõí³. Áóäóòü âèâîäèòèñü ÷îðí³ òà á³ë³ ïðÿìîêóòíèêè. Ïðîäîâæèòè?" IDS_DDPRIMARY_RESULT "Âè áà÷èëè ÷îðí³ òà á³ë³ ïðÿìîêóòíèêè?" IDS_DDOFFSCREEN_DESCRIPTION "Öåé òåñò áóäå âèêîðèñòîâóâàòè DirectDraw äëÿ ìàëþâàííÿ â çàêàäðîâèé áóôåð. Ïîâèíåí ðóõàòèñü á³ëèé ïðÿìîêóòíèê. Ïðîäîâæèòè?" @@ -229,4 +229,6 @@ IDS_FORMAT_ADAPTER_MEM "%u Ìá" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u á³ò)(%uÃö)" IDS_OPTION_NO "Í³" -END + IDS_D3DTEST_DESCRIPTION "Áóäå âèêîíàíà ïåðåâ³ðêà ³íòåðôåéñó Direct3D. Ïðîäîâæèòè?" + IDS_D3DTEST_D3Dx "Öåé òåñò âèêîðèñòàº àïàðàòíî-ïðèñêîðåíèé Direct3D ³íòåðôåéñ %u." +END Modified: trunk/reactos/base/applications/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -14,7 +14,7 @@ IDS_PRINT, "Äðóê" IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890" IDS_ERROR, "Ïîìèëêà" - IDS_ERROR_NOMEM, "Íåäîñòàòíüî ïàì'ÿò³ äëÿ çàâåðøåííÿ îïåðàö³þ." + IDS_ERROR_NOMEM, "Íåäîñòàòíüî ïàì'ÿò³ äëÿ çàâåðøåííÿ îïåðàö³¿." IDS_ERROR_NOFONT, "Ôàéë %1 íå º êîðåêòíèì ôàéëîì øðèôòó." IDS_ERROR_NOCLASS, "Íåìîæëèâî ³í³ö³àë³çóâàòè â³êîííèé êëàñ." IDS_ERROR_BADCMD, "Íå âêàçàíèé ôàéë øðèôòó.\nÑèíòàêñèñ:\n fontview.exe <ôàéë øðèôòó>" Modified: trunk/reactos/base/applications/mmc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -25,5 +25,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_APPTITLE "Êîíñîëü êåðóâàííÿ ReactOS" - IDS_CONSOLETITLE "Console%1!u!" + IDS_CONSOLETITLE "Êîíñîëü%1!u!" END Modified: trunk/reactos/base/applications/network/ping/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -12,9 +12,9 @@ BEGIN IDS_USAGE "\nÂèêîðèñòàííÿ: ping [-t] [-n count] [-l size] [-w timeout] õîñò\n\n\ Îïö³¿:\n\ - -t Ï³íã âêàçàíîãî âóçëà ïîêè íå áóäå çä³éñòåíà ðó÷íà çóïèíêà.\n\ + -t Ï³íã âêàçàíîãî âóçëà ïîêè íå áóäå çä³éñíåíà ðó÷íà çóïèíêà.\n\ Äëÿ çóïèíêè íàòèñí³òü Control-C.\n\ - -n count ×èñëî çàïèò³â, ÿê³ áóäóòü ï³äïðàâëåí³.\n\ + -n count Ê³ëüê³ñòü çàïèò³â, ÿê³ áóäóòü ï³äïðàâëåí³.\n\ -l size Ðîçì³ð áóôåðà â³äïðàâêè.\n\ -w timeout ×àñ î÷³êóâàííÿ êîæíî¿ â³äïîâ³ä³ â ì³ë³ñåêóíäàõ.\n\n\0" @@ -28,7 +28,7 @@ IDS_SETSOCKOPT_FAILED "setsockopt íåâäàëèé (%1!d!).\n\0" IDS_COULD_NOT_CREATE_SOCKET "Íå âäàëîñÿ ñòâîðèòè ñîêåò (#%1!d!).\n\0" IDS_COULD_NOT_INIT_WINSOCK "Íå âäàëîñÿ ³í³ö³àë³çóâàòè winsock dll.\n\0" - IDS_DEST_MUST_BE_SPECIFIED "²ì'ÿ àáî IP-àäðåñà õîñòó ïîâèííå áóòè âêàçàíå.\n\0" + IDS_DEST_MUST_BE_SPECIFIED "²ì'ÿ àáî IP-àäðåñà õîñòó ïîâèíí³ áóòè âêàçàí³.\n\0" IDS_BAD_PARAMETER "Ïîãàíèé ïàðàìåòð %1.\n\0" IDS_BAD_OPTION_FORMAT "Íåâ³ðíèé ôîðìàò îïö³¿ %1.\n\0" IDS_BAD_OPTION "Ïîãàíà îïö³ÿ %1.\n\0" Modified: trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -54,12 +54,12 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + LTEXT "Ãîëîâíà", IDC_LINE_NAME, 4, 7, 100, 15 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Balance", -1, 4, 35, 80, 42 - LTEXT "Volume", -1, 4, 100, 77, 108 + LTEXT "Áàëàíñ", -1, 4, 35, 80, 42 + LTEXT "Ãó÷í³ñòü", -1, 4, 100, 77, 108 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 - CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CHECKBOX "&Òèøà", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Îòêàç",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Ðàçøèðåíè äÿëîâè íàñòðîéñêè" FONT 8, "MS Shell Dlg" @@ -89,12 +89,13 @@ CONTROL "Ïàïêà çà ñëàãàíå", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Ñëàãàíå íà çàðåæäà÷", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Ñëàãàíå íà çàðåæäà÷", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Ñëàãàíå íà íà÷àëåí çàðåæäà÷ (MBR) íà òâúðäèÿ äèñê", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Áåç ñëàãàíå íà íà÷àëåí çàðåæäà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&Äîáðå", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Îòêàç", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Ñëàãàíå íà íà÷àëåí çàðåæäà÷ (MBR è VBR) íà òâúðäèÿ äèñê", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Ñëàãàíå íà íà÷àëåí çàðåæäà÷ (ñàìî VBR) íà òâúðäèÿ äèñê", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Áåç ñëàãàíå íà íà÷àëåí çàðåæäà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&Äîáðå", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Îòêàç", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 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] Thu Apr 14 12:13:38 2011 @@ -85,7 +85,7 @@ PUSHBUTTON "&Storno",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Pokroèilá nastavení oddílu" FONT 8, "MS Shell Dlg" @@ -93,13 +93,13 @@ CONTROL "Instalaèní sloka", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Instalace zavadìèe", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Instalace zavadìèe", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Nainstalovat zavadìè na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Nainstalovat zavadìè na pevný disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "Zavadìè neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Storno", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Storno", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 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] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Abbrechen",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Erweiterte Partitionseinstellungen" FONT 8, "MS Shell Dlg" @@ -89,13 +89,13 @@ CONTROL "Installationsverzeichnis", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Bootloader-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Bootloader-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Installiere Bootloader auf Festplatte (MBR und VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Installiere Bootloader auf Festplatte (VBR nur)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "Keine Bootloader-Installation", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Abbrechen", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Abbrechen", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&¢êõñï",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Ñõèìßóåéò Partition ãéá ðñï÷ùñçìÝíïõò" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "ÖÜêåëïò åãêáôÜóôáóçò", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "ÅãêáôÜóôáóç Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "ÅãêáôÜóôáóç Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "ÅãêáôÜóôáóç boot loader óôï óêëçñü äßóêï (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Íá ìç ãßíåé åãêáôÜóôáóç ôïõ bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&¢êõñï", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "ÅãêáôÜóôáóç boot loader óôï óêëçñü äßóêï (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "ÅãêáôÜóôáóç boot loader óôï óêëçñü äßóêï (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Íá ìç ãßíåé åãêáôÜóôáóç ôïõ bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&¢êõñï", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -89,13 +89,13 @@ 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 "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 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] Thu Apr 14 12:13:38 2011 @@ -83,7 +83,7 @@ PUSHBUTTON "&Cancelar",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Ajustes avanzados de la partición" FONT 8, "MS Shell Dlg" @@ -91,12 +91,13 @@ 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 "Instalación del cargador de arranque", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - 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 - PUSHBUTTON "&Aceptar", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancelar", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Instalar el cargador de arranque en el disco duro (MBR y VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Instalar el cargador de arranque en el disco duro (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&Aceptar", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancelar", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/et… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Tühista",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Täpsemad vormindamise seaded" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Paigaldamise kaust", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Alglaaduri paigaldamine", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Alglaaduri paigaldamine", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Paigalda alglaadur kõvakettale (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Ära paigalda alglaadurit", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&Olgu", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Tühista", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Paigalda alglaadur kõvakettale (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Paigalda alglaadur kõvakettale (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Ära paigalda alglaadurit", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&Olgu", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Tühista", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fi… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ 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 "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - 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 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 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] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -87,13 +87,13 @@ 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 "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/hu… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -89,12 +89,13 @@ 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 "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - 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 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Annulla",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Impostazioni avanzate delle partizioni" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Cartella di installazione", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Installazione del Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Installazione del Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Installazione del Boot loader sul disco fisso (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Annulla", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Installazione del Boot loader sul disco fisso (MBR e VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Installazione del Boot loader sul disco fisso (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Annulla", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Avbryt",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Avansert partisjon innstillinger" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Installasjon mappe", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Oppstartslaster installasjon", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Oppstartslaster installasjon", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Installer oppstartslaster på harddiskens (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Avbryt", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Installer oppstartslaster på harddiskens (MBR og VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Installer oppstartslaster på harddiskens (bare VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Avbryt", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 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] Thu Apr 14 12:13:38 2011 @@ -88,7 +88,7 @@ PUSHBUTTON "&Anuluj",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Zaawansowane ustawienia partycji" FONT 8, "MS Shell Dlg" @@ -96,13 +96,13 @@ CONTROL "Folder instalacji", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Instalacja bootloadera", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Instalacja bootloadera", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Wgraj bootloader na dysk twardy (MBR i VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Wgraj bootloader na dysk twardy (tylko VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 - CONTROL "Pomiñ wgrywanie bootloadera", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Anuluj", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Pomiñ wgrywanie bootloadera", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ 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 "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - 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 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Revocare",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Setari avansate partitie" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Folder instalare", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Instalare incarcator", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Instalare incarcator", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Instalare incarcator pe hard disc (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Nu se instaleaza incarcator", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Revocare", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Instalare incarcator pe hard disc (MBR si VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Instalare incarcator pe hard disc (numai VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Nu se instaleaza incarcator", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Revocare", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Îòñòàâèòü",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Äîïîëíèòåëüíûå ïàðàìåòðû óñòàíîâêè" FONT 8, "MS Shell Dlg" @@ -89,12 +89,13 @@ CONTROL "Áàçîâûé êàòàëîã", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,12,283,14, WS_VISIBLE - CONTROL "Óñòàíîâêà çàãðóç÷èêà", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Óñòàíîâêà çàãðóç÷èêà", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,49,278,11 - CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,60,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Îòìåíà", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR è VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,49,278,11 + CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (òîëüêî VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Îòìåíà", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 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] Thu Apr 14 12:13:38 2011 @@ -84,7 +84,7 @@ PUSHBUTTON "&Zrui",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Rozírené nastavenia partície" FONT 8, "MS Shell Dlg" @@ -92,13 +92,13 @@ CONTROL "Intalaèný prieèinok", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Intalácia zavádzaèa systému", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Intalácia zavádzaèa systému", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Naintalova zavádzaè systému na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Naintalova zavádzaè systému na pevný disk (iba VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "Nenaintalova zavádzaè systému", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Zrui", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Zrui", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -67,7 +67,7 @@ PUSHBUTTON "&Ñòâîðèòè", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Âèäàëèòè", IDC_PARTDELETE, 76,155,50,15 PUSHBUTTON "Ä&ðàéâåð", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED - PUSHBUTTON "&Äîäàòêîâ³ ïàðàìåòðè...", IDC_PARTMOREOPTS, 218,155,80,15 + PUSHBUTTON "&Äîäàòêîâ³ Îïö³¿...", IDC_PARTMOREOPTS, 218,155,80,15 LTEXT "Äëÿ ïî÷àòêó âñòàíîâëåííÿ íàòèñí³òü Äàë³", IDC_STATIC, 10, 180 ,277, 20 END @@ -87,20 +87,21 @@ PUSHBUTTON "&Ñêàñóâàòè",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Äîäàòêîâ³ ïàðàìåòðè âñòàíîâëåííÿ" +CAPTION "Ðîçøèðåí³ ïàðàìåòðè ðîçä³ëó" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Áàçîâèé êàòàëîã", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + CONTROL "Òåêà âñòàíîâëåííÿ", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Âñòàíîâëåííÿ çàâàíòàæóâà÷à", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Âñòàíîâëåííÿ çàâàíòàæóâà÷à", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Âñòàíîâèòè çàâàíòàæóâà÷ íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Íå âñòàíîâëþâàòè çàâàíòàæóâà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Ñêàñóâàòè", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Âñòàíîâèòè çàâàíòàæóâà÷ íà æîñòêèé äèñê (MBR òà VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Âñòàíîâèòè çàâàíòàæóâà÷ íà æîñòêèé äèñê (ëèøå VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Íå âñòàíîâëþâàòè çàâàíòàæóâà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Ñêàñóâàòè", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 @@ -108,7 +109,7 @@ CAPTION "Âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Âñòàíîâëåííÿ Àêàóíòà", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "²íôîðìàö³ÿ ïðî Âñòàíîâëåííÿ", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Äëÿ ïî÷àòêó âñòàíîâëåííÿ íàòèñí³òü Äàë³.", IDC_STATIC, 10, 180 ,277, 20 END @@ -151,8 +152,8 @@ IDS_PROCESSSUBTITLE "Ñòâîðåííÿ ðîçä³ëó íà äèñêó, êîï³þâàííÿ ôàéë³â, âñòàíîâëåííÿ çàâàíòàæóâà÷à" IDS_RESTARTTITLE "Ïåðøèé åòàï âñòàíîâëåííÿ çàâåðøåíî" IDS_RESTARTSUBTITLE "Ïåðøèé åòàï çàâåðøåíî, äëÿ ïðîäîâæåííÿ ïîòð³áíå ïåðåçàâàíòàæåííÿ" - IDS_SUMMARYTITLE "Âñòàíîâëåííÿ Àêàóíòà" - IDS_SUMMARYSUBTITLE "Ñïèñîê âñòàíîâëåííÿ âëàñòèâîñòåé äëÿ ïåðåâ³ðêè, ïåðø í³æ çâåðíóòèñÿ ïðè âñòàíîâëåíí³ ïðèñòðî¿â" + IDS_SUMMARYTITLE "²íôîðìàö³ÿ ïðî Âñòàíîâëåííÿ" + IDS_SUMMARYSUBTITLE "Ïåðåâ³ðòå ñïèñîê âëàñòèâîñòåé âñòàíîâëåííÿ, ïåðø í³æ ïî÷àòè âñòàíîâëåííÿ ñèñòåìè" IDS_ABORTSETUP "ReactOS âñòàíîâëåíèé íà êîìï'þòåð íå ïîâí³ñòþ. ßêùî âè çàêðèºòå ïðîãðàìó âñòàíîâëåííÿ çàðàç, â ïîäàëüøîìó âàì äîâåäåòüñÿ ïîâòîðèòè âñòàíîâëåííÿ ReactOS. Âè âïåâíåí³, ùî íåîáõ³äíî ïåðåðâàòè âñòàíîâëåííÿ?" IDS_ABORTSETUP2 "Ïåðåðâàòè âñòàíîâëåííÿ?" END Modified: trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/uk… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -10,24 +10,24 @@ IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 117, 8, 140, 24 - LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü ""Äàë³"", ³íàêøå íàòèñí³òü ""Ñêàñóâàòè"".", -1, 117, 140, 140, 17 + LTEXT "Ïðîãðàìà âñòàíîâëåííÿ ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 117, 8, 140, 24 + LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü ""Äàë³"", ³íàêøå íàòèñí³òü ""Ñêàñóâàòè"".", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå âêëþ÷àº SVGA äðàéâåð VMware(r).\n\nÒîìó éä³òü äî ìåíþ ""VM"" ó VMware(r) workstation ³ âèáåð³òü ""Install VMware tools...""\n\n\nÍàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"", ùîá ïðîïóñòèòè óñòàíîâêó SVGA äðàéâåðà.",-1,25,25,225,85 + LTEXT "Ïðîãðàìà âñòàíîâëåííÿ ReactOS íå âêëþ÷àº SVGA äðàéâåð VMware(r).\n\nÒîìó éä³òü äî ìåíþ ""VM"" ó VMware(r) workstation ³ âèáåð³òü ""Install VMware tools...""\n\n\nÍàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"", ùîá ïðîïóñòèòè âñòàíîâëåííÿ SVGA äðàéâåðà.",-1,25,25,225,85 END IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 @@ -36,10 +36,10 @@ IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Óñòàíîâêó SVGA äðàéâåðà VMware(r) çàâåðøåíî óñï³øíî. Îáåð³òü ïåðåâàæíó ðîçä³ëüíó çäàòí³ñòü åêðàíó:",-1,25,5,225,20 + LTEXT "Âñòàíîâëåííÿ SVGA äðàéâåðà VMware(r) çàâåðøåíî óñï³øíî. Îáåð³òü ïîòð³áíó ðîçä³ëüíó çäàòí³ñòü åêðàíó:",-1,25,5,225,20 PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON @@ -57,48 +57,48 @@ IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà âñòàíîâèòè SVGA äðàéâåð VMware(r).\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ ïðîäîâæåííÿ ïðîöåñó óñòàíîâêè.",-1,25,25,225,85 + LTEXT "Ïðîãðàìà âñòàíîâëåííÿ ReactOS íå çìîãëà âñòàíîâèòè SVGA äðàéâåð VMware(r).\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ ïðîäîâæåííÿ ïðîöåñó âñòàíîâëåííÿ.",-1,25,25,225,85 END IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "SVGA äðàéâåð VMware(r) SVGA âæå âñòàíîâëåíèé.\n\nÎáåð³òü, ùî Âè õî÷åòå çðîáèòè:",-1,25,5,225,30 PUSHBUTTON "Íàëàøòóâàòè ïàðàìåòðè åêðàíó", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Ñêîðèñòàòèñÿ ³íøèì ãðàô³÷íèì äðàéâåðîì", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Âèäàëèòè SVGA äðàéâåð VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Íàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ìàéñòðà.", -1, 25, 93, 225, 12 + LTEXT "Íàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ìàéñòðà.", -1, 25, 93, 225, 17 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Áóäü ëàñêà îáåð³òü ãðàô³÷íèé äðàéâåð, ÿêèé Âè õîò³ëè á âèêîðèñòîâóâàòè:",-1,25,25,225,15 PUSHBUTTON "ReactOS VGA äðàéâåð", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON PUSHBUTTON "ReactOS VBE äðàéâåð (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON - LTEXT "Íàòèñí³òü ""Çàâåðøèòè"" äëÿ çàâåðøåííÿ îïåðàö³¿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ïðîãðàìè óñòàíîâêè áåç çáåðåæåííÿ çì³í.", -1, 25, 93, 225, 20 + LTEXT "Íàòèñí³òü ""Çàâåðøèòè"" äëÿ çàâåðøåííÿ îïåðàö³¿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ïðîãðàìè âñòàíîâëåííÿ áåç çáåðåæåííÿ çì³í.", -1, 25, 93, 225, 20 END IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS ãîòîâà âèäàëèòè SVGA äðàéâåð VMWare(r)!!!\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ âèäàëåííÿ äðàéâåðà àáî ""Ñêàñóâàòè"" ùîá çàëèøèòè éîãî ÿê º.",-1,25,25,225,85 + LTEXT "Ïðîãðàìà âñòàíîâëåííÿ ReactOS ãîòîâà âèäàëèòè SVGA äðàéâåð VMWare(r)!!!\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ âèäàëåííÿ äðàéâåðà àáî ""Ñêàñóâàòè"" ùîá çàëèøèòè éîãî ÿê º.",-1,25,25,225,85 END STRINGTABLE BEGIN IDS_WIZARD_NAME "Âèÿâëåíèé VMware(r)" - IDS_FAILEDTOLOCATEDRIVERS "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà çíàéòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé." - IDS_FAILEDTOCOPYFILES "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà ñêîï³þâàòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé.\n" + IDS_FAILEDTOLOCATEDRIVERS "Ïðîãðàìà âñòàíîâëåííÿ ReactOS íå çìîãëà çíàéòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé." + IDS_FAILEDTOCOPYFILES "Ïðîãðàìà âñòàíîâëåííÿ ReactOS íå çìîãëà ñêîï³þâàòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé.\n" IDS_FAILEDTOACTIVATEDRIVER "Íå âäàëîñÿ çàïóñòèòè SVGA äðàéâåð VMware(r)!" IDS_FAILEDTOSELVGADRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VGA äðàéâåð!" IDS_FAILEDTOSELVBEDRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VBE äðàéâåð!" @@ -122,18 +122,18 @@ STRINGTABLE BEGIN - IDD_INSERT_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSERT_VMWARE_TOOLSTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_INSERT_VMWARE_TOOLSSUBTITLE "Áóäü ëàñêà âñòàâòå äèñê VMware tools." - IDD_INSTALLING_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSTALLING_VMWARE_TOOLSTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Ïîøóê ³ êîï³þâàííÿ SVGA äðàéâåðà VMware (r)." - IDD_CONFIGTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" - IDD_CONFIGSUBTITLE "Îáåð³òü Âàøó óëþáëåíó ðîçä³ëüíó çäàòí³ñòü åêðàíó." - IDD_INSTALLATION_FAILEDTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" - IDD_INSTALLATION_FAILEDSUBTITLE "Óñòàíîâêà SVGA äðàéâåðà VMware (r) íå âäàëàñÿ." - IDD_CHOOSEACTIONTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_CONFIGTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" + IDD_CONFIGSUBTITLE "Îáåð³òü ïîòð³áíó Âàì ðîçä³ëüíó çäàòí³ñòü åêðàíó." + IDD_INSTALLATION_FAILEDTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" + IDD_INSTALLATION_FAILEDSUBTITLE "Âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r) íå âäàëàñÿ." + IDD_CHOOSEACTIONTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_CHOOSEACTIONSUBTITLE "Âèáåð³òü, ùî Âè õî÷åòå çðîáèòè." - IDD_SELECTDRIVERTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_SELECTDRIVERTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_SELECTDRIVERSUBTITLE "Îáðàòè äðàéâåð." - IDD_DOUNINSTALLTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_DOUNINSTALLTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_DOUNINSTALLSUBTITLE "Âèäàëèòè äðàéâåð." END Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -128,7 +128,7 @@ IDS_PROPERTIES "Â&ëàñòèâîñò³" IDS_OPEN_ALL_USERS "&Âñ³ êîðèñòóâà÷³" IDS_EXPLORE_ALL_USERS "&Îãëÿä âñ³õ êîðèñòóâà÷³â" - IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." + IDS_STARTUP_ERROR "Ñèñòåìà íå ìîæå ñòàðòóâàòè explorer, îñê³ëüêè ðåºñòð ïîøêîäæåíèé àáî â³äñóòí³é." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -174,27 +174,27 @@ BEGIN LTEXT "Îáåð³òü íàéá³ëüø çðó÷íèé äëÿ âàñ àëãîðèòì âèð³âíþâàííÿ çíà÷ê³â:", IDC_STATIC,7,7,166,16 - CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + CONTROL "ë³â/âåðõ íèç",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + CONTROL "ë³â/âåðõ ïðâ",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + CONTROL "ïðâ/âåðõ ë³â",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + CONTROL "ïðâ/âåðõ íèç",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + CONTROL "ë³â/íèç âåðõ",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + CONTROL "ë³â/íèç ïðàâ",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + CONTROL "ïðàâ/íèç ë³â",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + CONTROL "ïðâ/íèç âåðõ",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + CONTROL "ïî êðàÿõ",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + CONTROL "âåðõí³ êóòè",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + CONTROL "íàâêîëî",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 Modified: trunk/reactos/base/system/format/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/uk… ============================================================================== --- trunk/reactos/base/system/format/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -69,7 +69,7 @@ STRING_NO_LABEL "Íå ìîæó âñòàíîâèòè ì³òêó äèñêó" -STRING_FREE_SPACE "\n%I64d áàéò³â íà äèñêó.\n%I64d áàéò³â íàÿâíî íà äèñêó.\n" +STRING_FREE_SPACE "\n%I64d áàéò³â íà äèñêó.\n%I64d áàéò³â äîñòóïíî íà äèñêó.\n" STRING_SERIAL_NUMBER "\nÑåð³éíèé íîìåð äèñêó - %04X-%04X\n" END Added: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc (added) +++ trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -1,0 +1,223 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +/* + * Attention Translators: + * DO NOT TRANSLATE THESE RESOURCES YET! + */ + +/* Dialogs */ + +IDD_USERS DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Êîðèñòóâà÷³" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 7, 238, 85, WS_EX_CLIENTEDGE +END + + +IDD_GROUPS DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ãðóïè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 7, 238, 85, WS_EX_CLIENTEDGE +END + + +IDD_EXTRA DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Äîäàòêîâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Öå ì³ñöå íàâìèñíî çàëèøåíå ïîðîæí³ì", IDC_STATIC, 66, 90, 112, 8 +END + + +IDD_USER_GENERAL DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "Ïîâíå ²ì'ÿ:", -1, 7, 46, 63, 8 + EDITTEXT IDC_USER_GENERAL_FULL_NAME,77,43,168,13,ES_AUTOHSCROLL + LTEXT "Îïèñ:", -1, 7, 64, 63, 8 + EDITTEXT IDC_USER_GENERAL_DESCRIPTION,77,61,168,13,ES_AUTOHSCROLL + AUTOCHECKBOX "Êîðèñòóâà÷ ìàº çì³íèòè ïàðîëü ïðè ïåðøîìó âõîä³",IDC_USER_GENERAL_FORCE_CHANGE,7,82,210,10 + AUTOCHECKBOX "Êîðèñòóâà÷ íå ìîæå çì³íþâàòè ïàðîëü",IDC_USER_GENERAL_CANNOT_CHANGE,7,95,210,10 + AUTOCHECKBOX "Òåðì³í ä³¿ ïàðîëþ íåîáìåæåíèé",IDC_USER_GENERAL_NEVER_EXPIRES,7,108,210,10 + AUTOCHECKBOX "Îáë³êîâèé çàïèñ âèìêíåíî",IDC_USER_GENERAL_DISABLED,7,121,210,10 + AUTOCHECKBOX "Îáë³êîâèé çàïèñ çàáëîêîâàíî",IDC_USER_GENERAL_LOCKED,7,134,210,10 +END + + +IDD_USER_MEMBERSHIP DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "×ëåíñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "×ëåí Ãðóïè:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 18, 238, 173, WS_EX_CLIENTEDGE + PUSHBUTTON "Äîäàòè...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 + PUSHBUTTON "Âèëó÷èòè", IDC_USER_MEMBERSHIP_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + + +IDD_USER_PROFILE DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ïðîô³ëü" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïðîô³ëü Êîðèñòóâà÷à", -1, 7, 7, 238, 54 + LTEXT "Øëÿõ äî Ïðîô³ëþ:", -1, 16, 22, 55, 8 + EDITTEXT IDC_USER_PROFILE_PATH, 78, 19, 160, 13, ES_AUTOHSCROLL + LTEXT "Ñöåíàð³é âõîäó:", -1, 16, 40, 55, 8 + EDITTEXT IDC_USER_PROFILE_SCRIPT, 78, 37, 160, 13, ES_AUTOHSCROLL + + GROUPBOX "Äîìàøíÿ òåêà", -1, 7, 68, 238, 54 + AUTORADIOBUTTON "Ëîêàëüíèé øëÿõ:", IDC_USER_PROFILE_LOCAL, 16, 83, 60, 10 + AUTORADIOBUTTON "Ï³ä'ºäíàòè:", IDC_USER_PROFILE_REMOTE, 16, 100, 60, 10 + EDITTEXT IDC_USER_PROFILE_LOCAL_PATH, 78, 81, 160, 13, ES_AUTOHSCROLL + COMBOBOX IDC_USER_PROFILE_DRIVE, 78, 99, 26, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "äî:", -1, 112, 101, 12, 8 + EDITTEXT IDC_USER_PROFILE_REMOTE_PATH, 130, 99, 108, 13, ES_AUTOHSCROLL +END + + +IDD_GROUP_GENERAL DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "Îïèñ:", -1, 7, 45, 46, 8 + EDITTEXT IDC_GROUP_GENERAL_DESCRIPTION,65,42,180,13,ES_AUTOHSCROLL + LTEXT "×ëåíè:", -1, 7, 63, 45, 8 + CONTROL "", IDC_GROUP_GENERAL_MEMBERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 74, 238, 117, WS_EX_CLIENTEDGE + PUSHBUTTON "Äîäàòè...", IDC_GROUP_GENERAL_ADD, 7, 197, 50, 14 + PUSHBUTTON "Âèëó÷èòè", IDC_GROUP_GENERAL_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + + +IDD_CHANGE_PASSWORD DIALOGEX DISCARDABLE 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Çì³íà Ïàðîëþ" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_EDIT_PASSWORD1,107,7,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Íîâèé Ïàðîëü:", -1,7,10,96,8 + EDITTEXT IDC_EDIT_PASSWORD2,107,25,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Ïîâòîð Ïàðîëþ:", -1,7,28,96,8 + DEFPUSHBUTTON "OK",IDOK,156,53,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,210,53,50,14 +END + + +IDD_USER_NEW DIALOGEX DISCARDABLE 0, 0, 267, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Íîâèé Êîðèñòóâà÷" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_USER_NEW_NAME,107,7,153,14,ES_AUTOHSCROLL + RTEXT "²ì'ÿ Êîðèñòóâà÷à:", -1,7,10,96,8 + EDITTEXT IDC_USER_NEW_FULL_NAME,107,25,153,14,ES_AUTOHSCROLL + RTEXT "Ïîâíå ²ì'ÿ Êîðèñòóâà÷à:", -1,7,28,96,8 + EDITTEXT IDC_USER_NEW_DESCRIPTION,107,43,153,14,ES_AUTOHSCROLL + RTEXT "Îïèñ:", -1,7,46,96,8 + EDITTEXT IDC_USER_NEW_PASSWORD1,107,67,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Ïàðîëü:", -1,7,70,96,8 + EDITTEXT IDC_USER_NEW_PASSWORD2,107,85,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Ïîâòîð Ïàðîëþ:", -1,7,88,96,8 + AUTOCHECKBOX "Êîðèñòóâà÷ ìàº çì³íèòè ïàðîëü ïðè ïåðøîìó âõîä³",IDC_USER_NEW_FORCE_CHANGE,7,109,200,10 + AUTOCHECKBOX "Êîðèñòóâà÷ íå ìîæå çì³íþâàòè ïàðîëü",IDC_USER_NEW_CANNOT_CHANGE,7,123,200,10,WS_DISABLED + AUTOCHECKBOX "Òåðì³í ä³¿ ïàðîëþ íåîáìåæåíèé",IDC_USER_NEW_NEVER_EXPIRES,7,137,200,10,WS_DISABLED + AUTOCHECKBOX "Îáë³êîâèé çàïèñ âèìêíåíî",IDC_USER_NEW_DISABLED,7,151,200,10 + DEFPUSHBUTTON "OK",IDOK,156,179,50,14,WS_DISABLED + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,210,179,50,14 +END + + +IDD_GROUP_NEW DIALOGEX DISCARDABLE 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Íîâà Ãðóïà" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GROUP_NEW_NAME,107,7,153,14,ES_AUTOHSCROLL + RTEXT "Íàçâà Ãðóïè:", -1,7,10,96,8 + EDITTEXT IDC_GROUP_NEW_DESCRIPTION,107,25,153,14,ES_AUTOHSCROLL + RTEXT "Îïèñ:", -1,7,28,96,8 + DEFPUSHBUTTON "OK",IDOK,156,53,50,14,WS_DISABLED + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,210,53,50,14 +END + + +IDD_USER_ADD_MEMBERSHIP DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "×ëåíñòâî â Ãðóïàõ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "×ëåí Ãðóïè:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 18, 238, 173, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "OK",IDOK,141,197,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,195,197,50,14 +END + + +/* Menus */ + +IDM_POPUP_GROUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Ñòâîðèòè Ãðóïó...", IDM_GROUP_NEW + END + POPUP "" + BEGIN + MENUITEM "Äîäàòè â Ãðóïó", IDM_GROUP_ADD_MEMBER, GRAYED + MENUITEM SEPARATOR + MENUITEM "Âèäàëèòè", IDM_GROUP_DELETE + MENUITEM "Ïåðåéìåíóâàòè", IDM_GROUP_RENAME + MENUITEM SEPARATOR + MENUITEM "Âëàñòèâîñò³", IDM_GROUP_PROPERTIES + END +END + + +IDM_POPUP_USER MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Íîâèé Êîðèñòóâà÷...", IDM_USER_NEW + END + POPUP "" + BEGIN + MENUITEM "Çì³íèòè Ïàðîëü", IDM_USER_CHANGE_PASSWORD + MENUITEM SEPARATOR + MENUITEM "Âèäàëèòè", IDM_USER_DELETE + MENUITEM "Ïåðåéìåíóâàòè", IDM_USER_RENAME + MENUITEM SEPARATOR + MENUITEM "Âëàñòèâîñò³", IDM_USER_PROPERTIES + END +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CPLNAME "Îáë³êîâ³ çàïèñè êîðèñòóâà÷³â" + IDS_CPLDESCRIPTION "Êåðóâàííÿ Êîðèñòóâà÷àìè òà Ãðóïàìè." +END + +STRINGTABLE +BEGIN + IDS_NAME "²ì'ÿ" + IDS_FULLNAME "Ïîâíå ²ì'ÿ" + IDS_DESCRIPTION "Îïèñ" +END Propchange: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/rsrc.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -7,3 +7,4 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -62,5 +62,5 @@ IDS_SCROLLUP "Ïðîêðóòèòè äîãîðè" IDS_SCROLLDOWN "Ïðîêðóòèòè äîíèçó" - IDS_COMMAND_PROMPT "Command Prompt" + IDS_COMMAND_PROMPT "Êîìàíäíèé ðÿäîê" END

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