Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 23111: - Added another MSVC intrinsic to gcc (BitScanReverse). Thanks to Vampyre. - Added very basic and skeletal NUMA code when creating a thread and process, currently only does some basic affinity checks and settings. - Added a table and helper function (KeFindNextRightSetAffinity) for calculating affinity masks and sets. - Split KeInitailizeThread into KeStartThread and KeInitThread, and modified Ps code to use the calls. Now added a failure case where Init fails, but we don't have to
by ion＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: ion Date: Mon Jul 17 05:40:10 2006 New Revision: 23111 URL: http://svn.reactos.org/svn/reactos?rev=23111&view=rev Log: - Added another MSVC intrinsic to gcc (BitScanReverse). Thanks to Vampyre. - Added very basic and skeletal NUMA code when creating a thread and process, currently only does some basic affinity checks and settings. - Added a table and helper function (KeFindNextRightSetAffinity) for calculating affinity masks and sets. - Split KeInitailizeThread into KeStartThread and KeInitThread, and modified Ps code to use the calls. Now added a failure case where Init fails, but we don't have to backout the entire effects of a "Start". - Changes based on WI4 and Windows Internals II. Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/kthread.c trunk/reactos/ntoskrnl/ke/process.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Mon Jul 17 05:40:10 2006 @@ -3814,6 +3814,19 @@ return OldBit; } +static __inline__ BOOLEAN +BitScanReverse(OUT ULONG *Index, + IN ULONG Mask) +{ + LONG OldBit; + __asm__ __volatile__("bsrl %1,%2\n\t" + "sbbl %0,%0\n\t" + :"=r" (OldBit),"=m" (*Index) + :"Ir" (Mask) + : "memory"); + return OldBit; +} + #endif #define YieldProcessor() __asm__ __volatile__("pause"); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Mon Jul 17 05:40:10 2006 @@ -44,6 +44,9 @@ extern ULONG KeI386NpxPresent; extern ULONG KeI386XMMIPresent; extern ULONG KeI386FxsrPresent; +extern PKNODE KeNodeBlock[1]; +extern UCHAR KeNumberNodes; +extern UCHAR KeProcessNodeSeed; /* MACROS *************************************************************************/ @@ -68,6 +71,8 @@ #define KeReleaseDispatcherDatabaseLockFromDpcLevel() #endif +#define AFFINITY_MASK(Id) KiMask32Array[Id] + /* The following macro initializes a dispatcher object's header */ #define KeInitializeDispatcherHeader(Header, t, s, State) \ { \ @@ -188,6 +193,13 @@ /* next file ***************************************************************/ +UCHAR +NTAPI +KeFindNextRightSetAffinity( + IN UCHAR Number, + IN ULONG Set +); + VOID STDCALL DbgBreakPointNoBugCheck(VOID); @@ -267,16 +279,35 @@ ); VOID -STDCALL +NTAPI KeInitializeThread( - struct _KPROCESS* Process, - PKTHREAD Thread, - PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - PCONTEXT Context, - PVOID Teb, - PVOID KernelStack + IN PKPROCESS Process, + IN OUT PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context, + IN PVOID Teb, + IN PVOID KernelStack +); + +NTSTATUS +NTAPI +KeInitThread( + IN OUT PKTHREAD Thread, + IN PVOID KernelStack, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context, + IN PVOID Teb, + IN PKPROCESS Process +); + +VOID +NTAPI +KeStartThread( + IN OUT PKTHREAD Thread ); VOID Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Mon Jul 17 05:40:10 2006 @@ -16,6 +16,10 @@ /* GLOBALS *******************************************************************/ +KNODE KiNode0; +PKNODE KeNodeBlock[1]; +UCHAR KeNumberNodes = 1; +UCHAR KeProcessNodeSeed; ULONG KiPcrInitDone = 0; static ULONG PcrsAllocated = 0; static ULONG Ke386CpuidFlags2, Ke386CpuidExFlags, Ke386CpuidExMisc; @@ -340,6 +344,10 @@ KeActiveProcessors |= 1 << 0; + /* Set Node Data */ + KeNodeBlock[0] = &KiNode0; + KPCR->PrcbData.ParentNode = KeNodeBlock[0]; + KeNodeBlock[0]->ProcessorMask = KPCR->PrcbData.SetMember; if (KPCR->PrcbData.FeatureBits & X86_FEATURE_PGE) { Modified: trunk/reactos/ntoskrnl/ke/kthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/kthread.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/kthread.c (original) +++ trunk/reactos/ntoskrnl/ke/kthread.c Mon Jul 17 05:40:10 2006 @@ -24,7 +24,36 @@ ULONG IdleProcessorMask = 0; extern LIST_ENTRY PspReaperListHead; +ULONG KiMask32Array[MAXIMUM_PRIORITY] = +{ + 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, + 0x40, 0x80, 0x100, 0x200, 0x4000, 0x800, + 0x1000, 0x2000, 0x4000, 0x8000, 0x10000, 0x20000, + 0x40000, 0x80000, 0x100000, 0x200000, 0x400000, 0x800000, + 0x1000000, 0x2000000, 0x4000000, 0x8000000, 0x10000000, 0x20000000, + 0x40000000, 0x80000000 +}; + /* FUNCTIONS *****************************************************************/ + +UCHAR +NTAPI +KeFindNextRightSetAffinity(IN UCHAR Number, + IN ULONG Set) +{ + ULONG Bit, Result; + ASSERT(Set != 0); + + /* Calculate the mask */ + Bit = (AFFINITY_MASK(Number) - 1) & Set; + + /* If it's 0, use the one we got */ + if (!Bit) Bit = Set; + + /* Now find the right set and return it */ + BitScanReverse(&Result, Bit); + return (UCHAR)Result; +} STATIC VOID @@ -699,35 +728,29 @@ UNIMPLEMENTED; } -/* - * FUNCTION: Initialize the microkernel state of the thread - */ -VOID -STDCALL -KeInitializeThread(PKPROCESS Process, - PKTHREAD Thread, - PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - PCONTEXT Context, - PVOID Teb, - PVOID KernelStack) -{ +NTSTATUS +NTAPI +KeInitThread(IN OUT PKTHREAD Thread, + IN PVOID KernelStack, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context, + IN PVOID Teb, + IN PKPROCESS Process) +{ + BOOLEAN AllocatedStack = FALSE; ULONG i; PKWAIT_BLOCK TimerWaitBlock; PKTIMER Timer; + NTSTATUS Status; /* Initalize the Dispatcher Header */ - DPRINT("Initializing Dispatcher Header for New Thread: %x in Process: %x\n", Thread, Process); KeInitializeDispatcherHeader(&Thread->DispatcherHeader, ThreadObject, sizeof(KTHREAD) / sizeof(LONG), FALSE); - DPRINT("Thread Header Created. SystemRoutine: %x, StartRoutine: %x with Context: %x\n", - SystemRoutine, StartRoutine, StartContext); - DPRINT("UserMode Information. Context: %x, Teb: %x\n", Context, Teb); - /* Initialize the Mutant List */ InitializeListHead(&Thread->MutantListHead); @@ -737,6 +760,15 @@ /* Put our pointer */ Thread->WaitBlock[i].Thread = Thread; } + + /* Set swap settings */ + Thread->EnableStackSwap = FALSE;//TRUE; + Thread->IdealProcessor = 1; + Thread->SwapBusy = FALSE; + Thread->AdjustReason = 0; + + /* Initialize the lock */ + KeInitializeSpinLock(&Thread->ThreadLock); /* Setup the Service Descriptor Table for Native Calls */ Thread->ServiceTable = KeServiceDescriptorTable; @@ -762,7 +794,7 @@ NULL); /* Initialize the Suspend Semaphore */ - KeInitializeSemaphore(&Thread->SuspendSemaphore, 0, 128); + KeInitializeSemaphore(&Thread->SuspendSemaphore, 0, 2); /* Setup the timer */ Timer = &Thread->Timer; @@ -780,53 +812,148 @@ /* Set the TEB */ Thread->Teb = Teb; + /* Check if we have a kernel stack */ + if (!KernelStack) + { + /* We don't, allocate one */ + KernelStack = (PVOID)((ULONG_PTR)MmCreateKernelStack(FALSE) + + KERNEL_STACK_SIZE); + if (!KernelStack) return STATUS_INSUFFICIENT_RESOURCES; + + /* Remember for later */ + AllocatedStack = TRUE; + } + /* Set the Thread Stacks */ Thread->InitialStack = (PCHAR)KernelStack; Thread->StackBase = (PCHAR)KernelStack; Thread->StackLimit = (ULONG_PTR)KernelStack - KERNEL_STACK_SIZE; Thread->KernelStackResident = TRUE; - /* - * Establish the pde's for the new stack and the thread structure within the - * address space of the new process. They are accessed while taskswitching or - * while handling page faults. At this point it isn't possible to call the - * page fault handler for the missing pde's. - */ - MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread->StackLimit, KERNEL_STACK_SIZE); + /* ROS Mm HACK */ + MmUpdatePageDir((PEPROCESS)Process, + (PVOID)Thread->StackLimit, + KERNEL_STACK_SIZE); MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); - /* Initalize the Thread Context */ - DPRINT("Initializing the Context for the thread: %x\n", Thread); - KiArchInitThreadWithContext(Thread, + /* Enter SEH to avoid crashes due to user mode */ + Status = STATUS_SUCCESS; + _SEH_TRY + { + /* Initalize the Thread Context */ + KiArchInitThreadWithContext(Thread, + SystemRoutine, + StartRoutine, + StartContext, + Context); + } + _SEH_HANDLE + { + /* Set failure status */ + Status = STATUS_UNSUCCESSFUL; + + /* Check if a stack was allocated */ + if (AllocatedStack) + { + /* Delete the stack */ + MmDeleteKernelStack(Thread->StackBase, FALSE); + Thread->InitialStack = NULL; + } + } + _SEH_END; + + /* Set the Thread to initalized */ + Thread->State = Initialized; + return Status; +} + +VOID +NTAPI +KeStartThread(IN OUT PKTHREAD Thread) +{ + KIRQL OldIrql; + PKPROCESS Process = Thread->ApcState.Process; + PKNODE Node; + PKPRCB NodePrcb; + ULONG Set, Mask; + UCHAR IdealProcessor; + + /* Setup static fields from parent */ + Thread->Iopl = Process->Iopl; + Thread->Quantum = Process->QuantumReset; + Thread->QuantumReset = Process->QuantumReset; + Thread->SystemAffinityActive = FALSE; + + /* Lock the process */ + KeAcquireSpinLock(&Process->ProcessLock, &OldIrql); + + /* Setup volatile data */ + Thread->Priority = Process->BasePriority; + Thread->BasePriority = Process->BasePriority; + Thread->Affinity = Process->Affinity; + Thread->UserAffinity = Process->Affinity; + + /* Get the KNODE and its PRCB */ + Node = KeNodeBlock[Process->IdealNode]; + NodePrcb = (PKPRCB)(KPCR_BASE + (Process->ThreadSeed * PAGE_SIZE)); + + /* Calculate affinity mask */ + Set = ~NodePrcb->MultiThreadProcessorSet; + Mask = (ULONG)(Node->ProcessorMask & Process->Affinity); + Set &= Mask; + if (Set) Mask = Set; + + /* Get the new thread seed */ + IdealProcessor = KeFindNextRightSetAffinity(Process->ThreadSeed, Mask); + Process->ThreadSeed = IdealProcessor; + + /* Sanity check */ + ASSERT((Thread->UserAffinity & AFFINITY_MASK(IdealProcessor))); + + /* Set the Ideal Processor */ + Thread->IdealProcessor = IdealProcessor; + Thread->UserIdealProcessor = IdealProcessor; + + /* Lock the Dispatcher Database */ + KeAcquireDispatcherDatabaseLockAtDpcLevel(); + + /* Insert the thread into the process list */ + InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); + + /* Increase the stack count */ + ASSERT(Process->StackCount != MAXULONG_PTR); + Process->StackCount++; + + /* Release locks and return */ + KeReleaseDispatcherDatabaseLockFromDpcLevel(); + KeReleaseSpinLock(&Process->ProcessLock, OldIrql); +} + +VOID +NTAPI +KeInitializeThread(IN PKPROCESS Process, + IN OUT PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context, + IN PVOID Teb, + IN PVOID KernelStack) +{ + /* Initailize and start the thread on success */ + if (NT_SUCCESS(KeInitThread(Thread, + KernelStack, SystemRoutine, StartRoutine, StartContext, - Context); - - /* Setup scheduler Fields based on Parent */ - DPRINT("Thread context created, setting Scheduler Data\n"); - Thread->BasePriority = Process->BasePriority; - Thread->Quantum = Process->QuantumReset; - Thread->QuantumReset = Process->QuantumReset; - Thread->Affinity = Process->Affinity; - Thread->Priority = Process->BasePriority; - Thread->UserAffinity = Process->Affinity; - Thread->DisableBoost = Process->DisableBoost; - Thread->AutoAlignment = Process->AutoAlignment; - Thread->Iopl = Process->Iopl; - - /* Set the Thread to initalized */ - Thread->State = Initialized; - - /* - * Insert the Thread into the Process's Thread List - * Note, this is the KTHREAD Thread List. It is removed in - * ke/kthread.c!KeTerminateThread. - */ - InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); - DPRINT("Thread initalized\n"); -} - + Context, + Teb, + Process))) + { + /* Start it */ + KeStartThread(Thread); + } +} /* * @implemented Modified: trunk/reactos/ntoskrnl/ke/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/process.c (original) +++ trunk/reactos/ntoskrnl/ke/process.c Mon Jul 17 05:40:10 2006 @@ -113,13 +113,14 @@ VOID NTAPI -KeInitializeProcess(PKPROCESS Process, - KPRIORITY Priority, - KAFFINITY Affinity, - LARGE_INTEGER DirectoryTableBase) -{ - DPRINT("KeInitializeProcess. Process: %x, DirectoryTableBase: %x\n", - Process, DirectoryTableBase); +KeInitializeProcess(IN OUT PKPROCESS Process, + IN KPRIORITY Priority, + IN KAFFINITY Affinity, + IN LARGE_INTEGER DirectoryTableBase) +{ + ULONG i = 0; + UCHAR IdealNode = 0; + PKNODE Node; /* Initialize the Dispatcher Header */ KeInitializeDispatcherHeader(&Process->Header, @@ -127,19 +128,58 @@ sizeof(KPROCESS), FALSE); - /* Initialize Scheduler Data, Disable Alignment Faults and Set the PDE */ + /* Initialize Scheduler Data, Alignment Faults and Set the PDE */ Process->Affinity = Affinity; - Process->BasePriority = Priority; + Process->BasePriority = (CHAR)Priority; Process->QuantumReset = 6; Process->DirectoryTableBase = DirectoryTableBase; Process->AutoAlignment = TRUE; Process->IopmOffset = 0xFFFF; + + /* Initialize the lists */ + InitializeListHead(&Process->ThreadListHead); + InitializeListHead(&Process->ProfileListHead); + InitializeListHead(&Process->ReadyListHead); + + /* Initialize the current State */ Process->State = ProcessInMemory; - /* Initialize the Thread List */ - InitializeListHead(&Process->ThreadListHead); - KeInitializeSpinLock(&Process->ProcessLock); - DPRINT("The Process has now been initalized with the Kernel\n"); + /* Check how many Nodes there are on the system */ + if (KeNumberNodes > 1) + { + /* Set the new seed */ + KeProcessNodeSeed = (KeProcessNodeSeed + 1) / KeNumberNodes; + IdealNode = KeProcessNodeSeed; + + /* Loop every node */ + do + { + /* Check if the affinity matches */ + if (KeNodeBlock[IdealNode]->ProcessorMask != Affinity) break; + + /* No match, try next Ideal Node and increase node loop index */ + IdealNode++; + i++; + + /* Check if the Ideal Node is beyond the total number of nodes */ + if (IdealNode >= KeNumberNodes) + { + /* Normalize the Ideal Node */ + IdealNode -= KeNumberNodes; + } + } while (i < KeNumberNodes); + } + + /* Set the ideal node and get the ideal node block */ + Process->IdealNode = IdealNode; + Node = KeNodeBlock[IdealNode]; + ASSERT(Node->ProcessorMask & Affinity); + + /* Find the matching affinity set to calculate the thread seed */ + Affinity &= Node->ProcessorMask; + Process->ThreadSeed = KeFindNextRightSetAffinity(Node->Seed, + (ULONG)Affinity); + Node->Seed = Process->ThreadSeed; } ULONG Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Mon Jul 17 05:40:10 2006 @@ -15,7 +15,6 @@ * - MAJOR: Use Guarded Mutex instead of Fast Mutex for Active Process Locks. * - Generate process cookie for user-more thread. * - Add security calls where necessary. - * - KeInit/StartThread for better isolation of code */ /* INCLUDES ****************************************************************/ @@ -56,7 +55,7 @@ { /* Remember that we're dead */ DeadThread = TRUE; -} + } else { /* Get the Locale ID and save Preferred Proc */ @@ -157,12 +156,11 @@ HANDLE hThread; PEPROCESS Process; PETHREAD Thread; - PTEB TebBase; + PTEB TebBase = NULL; KIRQL OldIrql; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; HANDLE_TABLE_ENTRY CidEntry; - ULONG_PTR KernelStack; PAGED_CODE(); /* If we were called from PsCreateSystemThread, then we're kernel mode */ @@ -260,9 +258,6 @@ /* Acquire rundown protection */ ExAcquireRundownProtection(&Process->RundownProtect); - /* Allocate Stack for non-GUI Thread */ - KernelStack = (ULONG_PTR)MmCreateKernelStack(FALSE) + KERNEL_STACK_SIZE; - /* Now let the kernel initialize the context */ if (ThreadContext) { @@ -281,14 +276,14 @@ Thread->Win32StartAddress = (PVOID)ThreadContext->Eax; /* Let the kernel intialize the Thread */ - KeInitializeThread(&Process->Pcb, - &Thread->Tcb, - PspUserThreadStartup, - NULL, - NULL, - ThreadContext, - TebBase, - (PVOID)KernelStack); + Status = KeInitThread(&Thread->Tcb, + NULL, + PspUserThreadStartup, + NULL, + Thread->StartAddress, + ThreadContext, + TebBase, + &Process->Pcb); } else { @@ -297,15 +292,29 @@ InterlockedOr((PLONG)&Thread->CrossThreadFlags, CT_SYSTEM_THREAD_BIT); /* Let the kernel intialize the Thread */ - KeInitializeThread(&Process->Pcb, - &Thread->Tcb, - PspSystemThreadStartup, - StartRoutine, - StartContext, - NULL, - NULL, - (PVOID)KernelStack); - } + Status = KeInitThread(&Thread->Tcb, + NULL, + PspSystemThreadStartup, + StartRoutine, + StartContext, + NULL, + NULL, + &Process->Pcb); + } + + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Delete the TEB if we had done */ + if (TebBase) MmDeleteTeb(Process, TebBase); + + /* Release rundown and dereference */ + ExReleaseRundownProtection(&Process->RundownProtect); + ObDereferenceObject(Thread); + return Status; + } + + /* FIXME: Acquire exclusive pushlock */ /* * Insert the Thread into the Process's Thread List @@ -315,6 +324,11 @@ InsertTailList(&Process->ThreadListHead, &Thread->ThreadListEntry); Process->ActiveThreads++; + /* Start the thread */ + KeStartThread(&Thread->Tcb); + + /* FIXME: Wake pushlock */ + /* Release rundown */ ExReleaseRundownProtection(&Process->RundownProtect); @@ -326,10 +340,7 @@ PspRunCreateThreadNotifyRoutines(Thread, TRUE); /* Suspend the Thread if we have to */ - if (CreateSuspended) - { - KeSuspendThread(&Thread->Tcb); - } + if (CreateSuspended) KeSuspendThread(&Thread->Tcb); /* Check if we were already terminated */ if (Thread->Terminated)

1 0

[greatlrd] 23110: patch from LMH1 : Bug#: 1641 : Norwegian translation
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 05:15:56 2006 New Revision: 23110 URL: http://svn.reactos.org/svn/reactos?rev=23110&view=rev Log: patch from LMH1 : Bug#: 1641 : Norwegian translation Added: trunk/reactos/base/system/rundll32/No.rc (with props) Modified: trunk/reactos/base/system/rundll32/rundll32.rc Added: trunk/reactos/base/system/rundll32/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/No.rc… ============================================================================== --- trunk/reactos/base/system/rundll32/No.rc (added) +++ trunk/reactos/base/system/rundll32/No.rc Mon Jul 17 05:15:56 2006 @@ -1,0 +1,12 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 magnus(a)itkonsult-olsen.com + */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +STRINGTABLE DISCARDABLE +{ +IDS_DllNotLoaded, "LoadLibrary mislykket å laste '%s'" +IDS_MissingEntry, "Mistet oppføring moment:%s\nIn %s" +} Propchange: trunk/reactos/base/system/rundll32/No.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/rundll32/rundll32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.rc (original) +++ trunk/reactos/base/system/rundll32/rundll32.rc Mon Jul 17 05:15:56 2006 @@ -11,4 +11,5 @@ #include "Hu.rc" #include "Ru.rc" #include "Gr.rc" +#include "No.rc"

1 0

[greatlrd] 23109: patch from LMH1 : Bug#: 1637 : Norwegian translation
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 05:10:56 2006 New Revision: 23109 URL: http://svn.reactos.org/svn/reactos?rev=23109&view=rev Log: patch from LMH1 : Bug#: 1637 : Norwegian translation Added: trunk/reactos/base/shell/explorer/explorer-no.rc (with props) Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc Added: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc (added) +++ trunk/reactos/base/shell/explorer/explorer-no.rc Mon Jul 17 05:10:56 2006 @@ -1,0 +1,399 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Utfør...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "A&vslutt", ID_FILE_EXIT + END + POPUP "&Vis" + BEGIN + MENUITEM "&Verktøylinje", ID_VIEW_TOOL_BAR + MENUITEM "&Ekstra verktøylinje", ID_VIEW_EXTRA_BAR + MENUITEM "&Stasjonlinje", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&idelinje", ID_VIEW_SIDE_BAR + MENUITEM "Status&linje", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Oppdater\tF5", ID_REFRESH + MENUITEM "F&ull Skjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Vindu" + BEGIN + MENUITEM "Nytt &vindu", ID_WINDOW_NEW + MENUITEM "Som liste\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Sorter &horisontalt", ID_WINDOW_TILE_HORZ + MENUITEM "Sorter &vertikalt \tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Ordne Automatisk", ID_WINDOW_AUTOSORT + MENUITEM "Ordne &Symboler", ID_WINDOW_ARRANGE + END + POPUP "&Verktøy" + BEGIN + MENUITEM "&Innstillinger", ID_TOOLS_OPTIONS + END + POPUP "&Hjelp" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Innstillinger...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Oppgavebehandling...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Åpne volum kontroll", ID_TRAY_VOLUME + MENUITEM "Still lyd innstillinger", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Vis skjulte ikoner", ID_SHOW_HIDDEN_ICONS + MENUITEM "Vis Ikon &knapp", ID_SHOW_ICON_BUTTON + MENUITEM "&konfigurere Notifikasjoner...", ID_CONFIG_NOTIFYAREA + MENUITEM "Still Dato/&Tid...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Utfør...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Avslutt", ID_FILE_EXIT + END + POPUP "&Vis" + BEGIN + MENUITEM "&Verktøylinje", ID_VIEW_TOOL_BAR + MENUITEM "&Sidelinje", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "S&tatuslinje", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Oppdater\tF5", ID_REFRESH + MENUITEM "F&ull Skjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Verktøy" + BEGIN + MENUITEM "&Innstillinger", ID_TOOLS_OPTIONS + END + POPUP "&Hjelp" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&Om Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Om &OS...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Utfør" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Kommando:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Som &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Avbryt",2,158,23,47,14 + PUSHBUTTON "&Hjelp",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Søk Programmer i Start meny" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Sjekk oppføringer",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Skrivebord innstillinger" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Vennligst velg din foretrukne ikon justering algoritme:", + IDC_STATIC,7,7,166,8 + CONTROL "Venstre/topp dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "Venstre/topp høyre",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "Høyre/topp venstre",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./topp dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "Venstre/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "Venstre/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "høyre/bot. left",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 | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "kanter ned",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "kanter H/V",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 | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Knapp",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Vis &Versjon Nummer",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "oppgavelinje egenskaper" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "Vis &klokken",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&Skjul inaktive kunngjøring ikoner", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&kunngjøringer...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Start meny egenskaper" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Konfigurer underretning Ikoner" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Verktøylinje Tekst:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "V&indu tittel:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Modul Mappe:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Skjerm modus",IDC_LABEL4,7,96,157,28 + CONTROL "&vis",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&skjul",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "skjul a&utomatisk",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Sist endret:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "V&is skjulte",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Avbryt",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Velg Explorer vindu mode" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Vennligst velg din foretrukne explorer bruker grensesnitt:", + IDC_STATIC,7,7,160,8 + CONTROL "&SSDB (sammensatt dokument brukergrensesnitt)",IDC_MDI,"Button", + BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDB (separat dokument brukergrensesnitt)",IDC_SDI,"Button", + BS_AUTORADIOBUTTON,7,62,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Åpne undermapper i s&eparate vinduer", + IDC_SEPARATE_SUBFOLDERS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,90,135,10 + LTEXT "Denne innstillingen vil bli brukt som standard for alle explorer vinduer i fremtiden.", + IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Avbryt",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Om ReactOS Explorer" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "ReactOS Explorer" + IDS_START "Start" + IDS_LOGOFF "Logg av..." + IDS_SHUTDOWN "Slå av..." + IDS_LAUNCH "Kjør..." + IDS_START_HELP "Hjelp" + IDS_SEARCH_FILES "Søk..." + IDS_DOCUMENTS "Mine Dokumenter" + IDS_FAVORITES "Favoritter" + IDS_PROGRAMS "Programmer" + IDS_SETTINGS "Innstillinger" + IDS_EXPLORE "Explore" + IDS_EMPTY "(Tom)" + IDS_RECENT "Siste Dokumenter" + IDS_ADMIN "Administrasjon" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Start meny" + IDS_MINIMIZE_ALL "minimalisere alle vinduer" + IDS_DESKTOP_NUM "Skrivebord %d" + IDS_VOLUME "Volum" + IDS_ITEMS_CUR "gjeldende element" + IDS_ITEMS_CONFIGURED "Konfigurasjon" + IDS_ITEMS_VISIBLE "synlig" + IDS_ITEMS_HIDDEN "Skjult" + IDS_NOTIFY_SHOW "Vise" + IDS_NOTIFY_HIDE "skjule" + IDS_NOTIFY_AUTOHIDE "Skjul automatisk" + IDS_SHOW_HIDDEN_ICONS "Vis skjulte ikoner" + IDS_HIDE_ICONS "Skjul ikoner" + IDS_TERMINATE "Avslutte ROS Explorer" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "Nettverk" + IDS_CONNECTIONS "Nettverk tilkoblinger" + IDS_DRIVES "Drivere" + IDS_SEARCH_COMPUTER "Søk etter datamaskiner..." + IDS_SETTINGS_MENU "Innstilling Meny" + IDS_CONTROL_PANEL "Kontroll Panel" + IDS_PRINTERS "Skrivere" + IDS_BROWSE "Bla gjennom filer" + IDS_SEARCH_PRG "Søk etter Programmer..." + IDS_ALL_USERS "Alle brukere\\" + IDS_SEARCH "Søk" + IDS_ABOUT_EXPLORER "&Om Explorer..." + IDS_LAUNCH_MANY_PROGRAMS + "Du har valgt mer enn et program.\nEr du sikker på at du vil kjøre alle på en gang?" + IDS_DESKTOPBAR_SETTINGS "Skrivebord Innstillinger" + IDS_DESKTOP "Skrivebord" + IDS_TASKBAR "oppgavelinje" +END + +#endif // Norwegian (N.O.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/shell/explorer/explorer-no.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Mon Jul 17 05:10:56 2006 @@ -219,6 +219,7 @@ #include "explorer-it.rc" #include "explorer-nl.rc" #include "explorer-gr.rc" +#include "explorer-no.rc" #ifndef __WINDRES__ #include "explorer-cn.rc"

1 0

[greatlrd] 23108: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 04:51:49 2006 New Revision: 23108 URL: http://svn.reactos.org/svn/reactos?rev=23108&view=rev Log: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations Added: trunk/reactos/dll/cpl/desk/Uk.rc (with props) Modified: trunk/reactos/dll/cpl/desk/desk.rc Added: trunk/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/Uk.rc?rev=231… ============================================================================== --- trunk/reactos/dll/cpl/desk/Uk.rc (added) +++ trunk/reactos/dll/cpl/desk/Uk.rc Mon Jul 17 04:51:49 2006 @@ -1,0 +1,124 @@ +/* + * PROJECT: Display Control Panel Applet + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/desk/Uk.rc + * PURPOSE: Ukraianian Language File for Display Control Panel Applet + * PROGRAMMERS: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 205 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Òëî" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER + | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Âèáåð³òü çîáðàæåííÿ äëÿ øïàëåð ðîáî÷îãî ñòîëó:", IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&Îãëÿä...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Êîë³ð...", IDC_COLOR_BUTTON, 188, 177, 50, 15 + LTEXT "Ðîçòàøóâàííÿ:", IDC_STATIC, 188, 138, 36, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çáåð³ãà÷ åêðàíà" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "&Çáåð³ãà÷ åêðàíà",IDC_SCREENS_DUMMY, 5, 7, 238, 136 + + LTEXT "Ñïèñîê çáåð³ãà÷³â åêðàíà:",IDC_STATIC,13, 24, 150, 9 + CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP,13, 34, 170, 69 + + PUSHBUTTON "&Íàñòðîéêè",IDC_SCREENS_SETTINGS,188, 34, 50, 15,WS_GROUP + PUSHBUTTON "Ïåðå&ãëÿä",IDC_SCREENS_TESTSC,188, 52, 50, 15 + + CONTROL "Çàõèùàòè &ïàðîëåì.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 + + LTEXT "&×åêàòè",IDC_STATIC,13, 110, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP,52, 109, 12, 12 + LTEXT "õâèëèí äî â³äîáðàæåííÿ çáåð³ãà÷à åêðàíà.",IDC_STATIC,70, 111, 147, 9 + + GROUPBOX "&Åíåðãîçáåð³ãàþ÷³ ôóíêö³¿ ìîí³òîðà",IDC_SCREENS_DUMMY2,5, 146, 238, 50 + LTEXT "Äëÿ çì³íè ïàðàìåòð³â æèâëåííÿ ìîí³òîðà íàòèñí³òü Ïàðàìåòðè æèâëåííÿ.", + IDC_STATIC,16, 159, 145, 35 + PUSHBUTTON "Ïàðàìåòðè &æèâëåííÿ",IDC_SCREENS_POWER_BUTTON,165, 162, 73, 15 +END + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 +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_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Íàñòðîéêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Äèñïëåé:",1820,3,100,30,8 + LTEXT "<íåìàº>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Îáëàñòü åêðàíó",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, + 30,130,58,17 + LTEXT "Ìåíøå",1815,9,130,15,8,NOT WS_GROUP + LTEXT "Á³ëüøå",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Êîëüîðè",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "Äîä&àòêîâî...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +IDR_POPUP_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Êîíô³ãóðóâàòè", ID_MENU_CONFIG + MENUITEM "Ïåðå&ãëÿä", ID_MENU_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Äîäàòè", ID_MENU_ADD + MENUITEM "Â&èäàëèòè\tDel", ID_MENU_DELETE + END +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Äèñïëåé" + IDS_CPLDESCRIPTION "Âèáåð³òü â³äîáðàæåííÿ ðîáî÷îãî ñòîëó é çáåð³ãà÷à åêðàíó." + + IDS_NONE "(Íåìàº)" + IDS_CENTER "Ïî öåíòðó" + IDS_STRETCH "Ðîçòÿãíóòè" + IDS_TILE "Ïëèòêîþ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 êîëüîð³â" + IDS_COLOR_8BIT "256 êîëüîð³â" + IDS_COLOR_16BIT "High Color (16 á³ò³â)" + IDS_COLOR_24BIT "True Color (24 á³òè)" + IDS_COLOR_32BIT "True Color (32 á³òè)" + IDS_PIXEL "%lux%lu ï³êñåë³â" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Ìàëþíêè (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END Propchange: trunk/reactos/dll/cpl/desk/Uk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Mon Jul 17 04:51:49 2006 @@ -27,3 +27,4 @@ #include "Fr.rc" #include "Ru.rc" #include "It.rc" +#include "Uk.rc"

1 0

[greatlrd] 23107: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 04:49:43 2006 New Revision: 23107 URL: http://svn.reactos.org/svn/reactos?rev=23107&view=rev Log: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations Modified: trunk/reactos/dll/cpl/timedate/Uk.rc Modified: trunk/reactos/dll/cpl/timedate/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Uk.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Uk.rc (original) +++ trunk/reactos/dll/cpl/timedate/Uk.rc Mon Jul 17 04:49:43 2006 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/timedate/Uk.rc * PURPOSE: Ukraianian Language File for Timedate Control Panel Applet - * PROGRAMMERS: temarez + * PROGRAMMERS: Artem Reznikov */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT

1 0

[greatlrd] 23106: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 04:49:01 2006 New Revision: 23106 URL: http://svn.reactos.org/svn/reactos?rev=23106&view=rev Log: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations Modified: trunk/reactos/dll/cpl/mmsys/Uk.rc Modified: trunk/reactos/dll/cpl/mmsys/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/Uk.rc?rev=23… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/Uk.rc (original) +++ trunk/reactos/dll/cpl/mmsys/Uk.rc Mon Jul 17 04:49:01 2006 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/mmsys/Uk.rc * PURPOSE: Ukraianian Language File for Multimedia Control Panel Applet - * PROGRAMMERS: temarez + * PROGRAMMERS: Artem Reznikov */ LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL @@ -18,7 +18,7 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Çâóêîâ³ ³ Àóä³î Ïðèñòðî¿" + IDS_CPLNAME "Çâóêîâ³ ³ àóä³î ïðèñòðî¿" IDS_CPLDESCRIPTION "Çì³íà çâóêîâèõ ñõåì âàøîãî êîìï'þòåðà, íàñòðîþâàííÿ êîëîíîê ³ çàïèñóþ÷èõ ïðèñòðî¿â." END

1 0

[greatlrd] 23105: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 04:48:07 2006 New Revision: 23105 URL: http://svn.reactos.org/svn/reactos?rev=23105&view=rev Log: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations Modified: trunk/reactos/dll/cpl/intl/uk.rc Modified: trunk/reactos/dll/cpl/intl/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/uk.rc?rev=231… ============================================================================== --- trunk/reactos/dll/cpl/intl/uk.rc (original) +++ trunk/reactos/dll/cpl/intl/uk.rc Mon Jul 17 04:48:07 2006 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/intl/Uk.rc * PURPOSE: Ukraianian Language File for International Control Panel Applet - * PROGRAMMERS: temarez + * PROGRAMMERS: Artem Reznikov */ LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL

1 0

[greatlrd] 23104: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 04:47:19 2006 New Revision: 23104 URL: http://svn.reactos.org/svn/reactos?rev=23104&view=rev Log: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations Modified: trunk/reactos/dll/cpl/hdwwiz/Uk.rc Modified: trunk/reactos/dll/cpl/hdwwiz/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/Uk.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/Uk.rc (original) +++ trunk/reactos/dll/cpl/hdwwiz/Uk.rc Mon Jul 17 04:47:19 2006 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/hdwwiz/Uk.rc * PURPOSE: Ukraianian Language File for Add Hardware Control Panel Applet - * PROGRAMMERS: temarez + * PROGRAMMERS: Artem Reznikov */ LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL

1 0

[greatlrd] 23103: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 04:46:30 2006 New Revision: 23103 URL: http://svn.reactos.org/svn/reactos?rev=23103&view=rev Log: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations Modified: trunk/reactos/dll/cpl/appwiz/Uk.rc Modified: trunk/reactos/dll/cpl/appwiz/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/Uk.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/Uk.rc (original) +++ trunk/reactos/dll/cpl/appwiz/Uk.rc Mon Jul 17 04:46:30 2006 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/appwiz/Uk.rc * PURPOSE: Ukraianian Language File for Software Control Panel Applet - * PROGRAMMERS: temarez + * PROGRAMMERS: Artem Reznikov */ LANGUAGE LANG_UKRAINIAN, SUBLANG_NEUTRAL

1 0

[greatlrd] 23102: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations
by greatlrd＠svn.reactos.org 17 Jul '06

17 Jul '06

Author: greatlrd Date: Mon Jul 17 04:45:10 2006 New Revision: 23102 URL: http://svn.reactos.org/svn/reactos?rev=23102&view=rev Log: patch from temarez : Bug#: 1635 : Ukrainian translation update and some new translations Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc 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 (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc Mon Jul 17 04:45:10 2006 @@ -262,9 +262,9 @@ BEGIN LTEXT "Îáåð³òü íàéá³ëüø çðó÷íèé äëÿ âàñ ³íòåðôåéñ ïðîâ³äíèêà:", IDC_STATIC,7,7,160,8 - CONTROL "&MDI (áàãàòîäîêóìåíòíèé ³íòåðôåéñ)",IDC_MDI,"Button", + CONTROL "&MDI (áàãàòîäîêóìåíòíèé)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 - CONTROL "&SDI (îäíîäîêóìåíòíèé ³íòåðôåéñ)",IDC_SDI,"Button", + CONTROL "&SDI (îäíîäîêóìåíòíèé)",IDC_SDI,"Button", BS_AUTORADIOBUTTON,7,62,118,10 CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13

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