Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[arty] 40970: Patch by Alexander Potashev <aspotashev@gmail.com> LDRP_PROCESS_CREATION_TIME was a _flag_ which is now removed, the new 'LDRP_PROCESS_CREATION_TIME' is not a flag, it's just a constant to identify a special value of LoadCount.
by arty＠svn.reactos.org 18 May '09

18 May '09

Author: arty Date: Tue May 19 00:26:13 2009 New Revision: 40970 URL: http://svn.reactos.org/svn/reactos?rev=40970&view=rev Log: Patch by Alexander Potashev <aspotashev(a)gmail.com> LDRP_PROCESS_CREATION_TIME was a _flag_ which is now removed, the new 'LDRP_PROCESS_CREATION_TIME' is not a flag, it's just a constant to identify a special value of LoadCount. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Tue May 19 00:26:13 2009 @@ -21,7 +21,7 @@ #define NDEBUG #include <debug.h> -#define LDRP_PROCESS_CREATION_TIME 0x8000000 +#define LDRP_PROCESS_CREATION_TIME 0xffff #define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m))) /* GLOBALS *******************************************************************/ @@ -105,7 +105,7 @@ RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); } LoadCount = Module->LoadCount; - if (Module->LoadCount > 0 && Module->LoadCount != 0xFFFF) + if (Module->LoadCount > 0 && Module->LoadCount != LDRP_PROCESS_CREATION_TIME) { Module->LoadCount--; } @@ -124,7 +124,7 @@ RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); } LoadCount = Module->LoadCount; - if (Module->LoadCount != 0xFFFF) + if (Module->LoadCount != LDRP_PROCESS_CREATION_TIME) { Module->LoadCount++; } @@ -153,7 +153,7 @@ static __inline VOID LdrpTlsCallback(PLDR_DATA_TABLE_ENTRY Module, ULONG dwReason) { PIMAGE_TLS_CALLBACK *TlsCallback; - if (Module->TlsIndex != 0xFFFF && Module->LoadCount == 0xFFFF) + if (Module->TlsIndex != 0xFFFF && Module->LoadCount == LDRP_PROCESS_CREATION_TIME) { TlsCallback = LdrpTlsArray[Module->TlsIndex].TlsAddressOfCallBacks; if (TlsCallback) @@ -365,7 +365,7 @@ while (Entry != ModuleListHead) { Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - if (Module->LoadCount == 0xFFFF && + if (Module->LoadCount == LDRP_PROCESS_CREATION_TIME && Module->TlsIndex != 0xFFFF) { TlsDirectory = (PIMAGE_TLS_DIRECTORY) @@ -592,7 +592,7 @@ * loading while app is initializing * dll must not be unloaded */ - Module->LoadCount = 0xFFFF; + Module->LoadCount = LDRP_PROCESS_CREATION_TIME; } Module->Flags = 0; @@ -998,7 +998,7 @@ 0 == RtlCompareUnicodeString(&LdrpLastModule->FullDllName, &AdjustedName, TRUE))) { *Module = LdrpLastModule; - if (Ref && (*Module)->LoadCount != 0xFFFF) + if (Ref && (*Module)->LoadCount != LDRP_PROCESS_CREATION_TIME) { (*Module)->LoadCount++; } @@ -1019,7 +1019,7 @@ 0 == RtlCompareUnicodeString(&ModulePtr->FullDllName, &AdjustedName, TRUE))) { *Module = LdrpLastModule = ModulePtr; - if (Ref && ModulePtr->LoadCount != 0xFFFF) + if (Ref && ModulePtr->LoadCount != LDRP_PROCESS_CREATION_TIME) { ModulePtr->LoadCount++; } @@ -1078,9 +1078,8 @@ */ if (!NT_SUCCESS(Status)) { - ULONG Flags = LDRP_PROCESS_CREATION_TIME; Status = LdrLoadDll(NULL, - &Flags, + NULL, &DllName, &BaseAddress); if (NT_SUCCESS(Status)) @@ -1449,10 +1448,10 @@ if (Load && !NT_SUCCESS(Status)) { Status = LdrpLoadModule(SearchPath, - NtCurrentPeb()->Ldr->Initialized ? 0 : LDRP_PROCESS_CREATION_TIME, + 0, &DllName, Module, - NULL); + NULL); if (NT_SUCCESS(Status)) { Status = LdrFindEntryForName (&DllName, Module, FALSE); @@ -2669,7 +2668,7 @@ while (Entry != ModuleListHead) { Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); - if (((UnloadAll && Module->LoadCount == 0xFFFF) || Module->LoadCount == 0) && + if (((UnloadAll && Module->LoadCount == LDRP_PROCESS_CREATION_TIME) || Module->LoadCount == 0) && Module->Flags & LDRP_ENTRY_PROCESSED && !(Module->Flags & LDRP_UNLOAD_IN_PROGRESS)) { @@ -2682,7 +2681,7 @@ { TRACE_LDR("Unload %wZ - Calling entry point at %x\n", &Module->BaseDllName, Module->EntryPoint); - LdrpCallDllEntry(Module, DLL_PROCESS_DETACH, (PVOID)(Module->LoadCount == 0xFFFF ? 1 : 0)); + LdrpCallDllEntry(Module, DLL_PROCESS_DETACH, (PVOID)(Module->LoadCount == LDRP_PROCESS_CREATION_TIME ? 1 : 0)); } else { @@ -2704,7 +2703,7 @@ Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InInitializationOrderModuleList); Entry = Entry->Blink; if (Module->Flags & LDRP_UNLOAD_IN_PROGRESS && - ((UnloadAll && Module->LoadCount != 0xFFFF) || Module->LoadCount == 0)) + ((UnloadAll && Module->LoadCount != LDRP_PROCESS_CREATION_TIME) || Module->LoadCount == 0)) { /* remove the module entry from the list */ RemoveEntryList (&Module->InLoadOrderLinks); @@ -2767,7 +2766,7 @@ Module->Flags |= LDRP_LOAD_IN_PROGRESS; TRACE_LDR("%wZ loaded - Calling init routine at %x for process attaching\n", &Module->BaseDllName, Module->EntryPoint); - Result = LdrpCallDllEntry(Module, DLL_PROCESS_ATTACH, (PVOID)(Module->LoadCount == 0xFFFF ? 1 : 0)); + Result = LdrpCallDllEntry(Module, DLL_PROCESS_ATTACH, (PVOID)(Module->LoadCount == LDRP_PROCESS_CREATION_TIME ? 1 : 0)); if (!Result) { Status = STATUS_DLL_INIT_FAILED;

1 0

[dgorbachev] 40969: Japanese translation of USetup. Patch by Tomoya Kitagawa, fixes bug #4523.
by dgorbachev＠svn.reactos.org 18 May '09

18 May '09

Author: dgorbachev Date: Mon May 18 23:51:13 2009 New Revision: 40969 URL: http://svn.reactos.org/svn/reactos?rev=40969&view=rev Log: Japanese translation of USetup. Patch by Tomoya Kitagawa, fixes bug #4523. Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Mon May 18 23:51:13 2009 @@ -13,37 +13,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Language Selection", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 Please choose the language used for the installation process.", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¹ÞÝºÞÉ ¾ÝÀ¸", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 ²Ý½Ä°Ù¼ÞÆ ¼Ö³½Ù ¹ÞÝºÞ¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 11, - " Then press ENTER.", + " Â·ÞÆ¤ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 This Language will be the default language for the final system.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue F3 = Quit", + "\x07 ººÃÞ ¾ÝÀ¸ ¼À ¹ÞÝºÞÊ »²¼³Ã·Æ ¼½ÃÑÉ ·Ã²É ¹ÞÝºÞÆ ¾¯Ã²»ÚÏ½¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -60,55 +60,54 @@ 4, 3, " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", - // TEXT_STYLE_UNDERLINE - TEXT_STYLE_NORMAL - }, - { - 6, - 8, - "ReactOS¾¯Ä±¯ÌßÍÖ³º¿", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS ¾¯Ä±¯ÌßÍ Ö³º¿", TEXT_STYLE_HIGHLIGHT }, { 6, 11, - "This part of the setup copies the ReactOS Operating System to your", + "ºÉ ¾¯Ä±¯ÌßÉ ÀÞÝ¶²ÃÞÊ ReactOS µÍßÚ°Ã¨Ý¸Þ¼½ÃÑ¦", TEXT_STYLE_NORMAL }, { 6, 12, - "computer and prepares the second part of the setup.", + "ºÝËß°ÀÆ ºËß°¼¤ ¾¯Ä±¯ÌßÉ Â·ÞÉ ÀÞÝ¶²ÍÉ ¼ÞÝËÞ¦ ¼Ï½¡", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Press ENTER to install ReactOS.", + "\x07 ReactOS¦ ²Ý½Ä°Ù ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R to repair or update ReactOS.", + "\x07 ReactOS¦ ¼³Ì¸ Ó¼¸Ê º³¼Ý ½ÙÆÊ R·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press L to view the ReactOS Licensing Terms and Conditions", + "\x07 ReactOSÉ ×²¾Ý½¼Þ®³¹Ý ¦Ë®³¼Þ ½ÙÆÊ L·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press F3 to quit without installing ReactOS.", + "\x07 ReactOS¦ ²Ý½Ä°Ù¾½ÞÆ Á³¼½Ù ÊÞ±²Ê F3·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 6, 23, - "For more information on ReactOS, please visit:", + "ReactOSÉ ¼®³»²Å ¼Þ®³Î³Æ ¶Ý¼ÃÊ ¶·¦ ºÞ×Ý¸ÀÞ»²:", TEXT_STYLE_NORMAL }, { @@ -120,7 +119,7 @@ { 0, 0, - "ENTER = Continue R = Repair L = Licence F3 = Quit", + "ENTER = ¿Þ¯º³ R = ¼³Ì¸ L = ×²¾Ý½ F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -136,85 +135,85 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS Setup is in an early development phase. It does not yet", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS ¾¯Ä±¯ÌßÊ ¼®· ¶²ÊÂ ÀÞÝ¶²Æ ±ØÏ½¡ ¿ÉÀÒ¤ ÏÀÞ", TEXT_STYLE_NORMAL }, { 6, 9, - "support all the functions of a fully usable setup application.", + "¼Þ³ÌÞÝÆ ØÖ³ÃÞ·Ù ¾¯Ä±¯Ìß±ÌßØ¹°¼®Ý É ½ÍÞÃÉ·É³Ê »Îß°Ä »ÚÏ¾Ý¡", TEXT_STYLE_NORMAL }, { 6, 12, - "The following limitations apply:", + "Â·ÞÉ ¾²Ô¸¶Þ Ã·Ö³ »ÚÏ½:", TEXT_STYLE_NORMAL }, { 8, 13, - "- Setup can not handle more than one primary partition per disk.", + "- ¾¯Ä±¯ÌßÊ 1ÂÉ ÃÞ¨½¸Æ Â· 1Â²¼Þ®³É Ìß×²ÏØ Êß°Ã¨¼®Ý¦ ±Â¶³ºÄÊ ÃÞ·Ï¾Ý¡", TEXT_STYLE_NORMAL }, { 8, 14, - "- Setup can not delete a primary partition from a disk", + "- ¶¸Á®³ Êß°Ã¨¼®Ý ¶Þ ºÉÃÞ¨½¸¼Þ®³Æ ¿Ý»Þ²½Ù ÊÞ±²¤ ¾¯Ä±¯ÌßÊ", TEXT_STYLE_NORMAL }, { 8, 15, - " as long as extended partitions exist on this disk.", + " Ìß×²ÏØ Êß°Ã¨¼®Ý¦ ÃÞ¨½¸¶× »¸¼Þ® ÃÞ·Ï¾Ý¡", TEXT_STYLE_NORMAL }, { 8, 16, - "- Setup can not delete the first extended partition from a disk", + "- ÀÉ ¶¸Á®³ Ø®³²·¶Þ ºÉ ÃÞ¨½¸¼Þ®³Æ ¿Ý»Þ² ¼Ã²Ù ÊÞ±²¤ ¾¯Ä±¯ÌßÊ", TEXT_STYLE_NORMAL }, { 8, 17, - " as long as other extended partitions exist on this disk.", + " »²¼®É ¶¸Á®³ Ø®³²·¦ ÃÞ¨½¸¶× »¸¼Þ® ÃÞ·Ï¾Ý¡", TEXT_STYLE_NORMAL }, { 8, 18, - "- Setup supports FAT file systems only.", + "- ¾¯Ä±¯ÌßÊ FAT Ì§²Ù¼½ÃÑ ÉÐ »Îß°Ä ¼Ï½¡", TEXT_STYLE_NORMAL }, { 8, 19, - "- File system checks are not implemented yet.", + "- Ì§²Ù¼½ÃÑÉ Áª¯¸·É³Ê ÏÀÞ ¼Þ¯¿³ »ÚÃ ²Ï¾Ý¡", TEXT_STYLE_NORMAL }, { 8, 23, - "\x07 Press ENTER to install ReactOS.", + "\x07 ReactOS¦ ²Ý½Ä°Ù ½ÙÆÊ ENTER ·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 25, - "\x07 Press F3 to quit without installing ReactOS.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue F3 = Quit", + "\x07 ReactOS¦ ²Ý½Ä°Ù¾½ÞÆ Á³¼ ½Ù ÊÞ±²Ê F3·°¦ µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ F3 = Á³¼", TEXT_TYPE_STATUS| TEXT_PADDING_BIG }, { @@ -230,79 +229,79 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 6, - "Licensing:", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "¼Ö³ ·®ÀÞ¸:", TEXT_STYLE_HIGHLIGHT }, { 8, 8, - "The ReactOS System is licensed under the terms of the", + "ºÉ ReactOS ¼½ÃÑÊ ¸Ð±Ü¾ ¶É³Å ×²¾Ý½(X11Ô¤BSD µÖËÞ", TEXT_STYLE_NORMAL }, { 8, 9, - "GNU GPL with parts containing code from other compatible", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "licenses such as the X11 or BSD and GNU LGPL licenses.", + "GNU LGPL×²¾Ý½ ÅÄÞ) É º°ÄÞ¦ Ì¸Ñ Êß°ÂÄ ÄÓÆ GNU GPLÉ", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "¼Þ®³¹Ý É ÓÄÆ ×²¾Ý½ »ÚÃ²Ï½¡", TEXT_STYLE_NORMAL }, { 8, 11, - "All software that is part of the ReactOS system is", + "ReactOS ¼½ÃÑÉ ²ÁÌÞÉ ½ÍÞÃÉ ¿ÌÄ³ª±Ê ReactOS ¼½ÃÑÉ ²ÁÌÞÃÞ", TEXT_STYLE_NORMAL }, { 8, 12, - "therefore released under the GNU GPL as well as maintaining", + "±ÙÕ´Æ GNU GPLÀÞ¹ÃÞÅ¸¤ ¿É ¿ÌÄ³ª±É µØ¼ÞÅÙ×²¾Ý½É ÓÄÆÓ", TEXT_STYLE_NORMAL }, { 8, 13, - "the original license.", + "ØØ°½ »ÚÃ ²Ï½¡", TEXT_STYLE_NORMAL }, { 8, 15, - "This software comes with NO WARRANTY or restrictions on usage", + "ºÉ ¿ÌÄ³ª±Ê 'ÑÎ¼®³' ÃÞ Ã³·®³ »Ú¤ Á²·Î³Ô º¸»²Î³¶Þ Ã·µ³»ÚÙ", TEXT_STYLE_NORMAL }, { 8, 16, - "save applicable local and international law. The licensing of", + "ÊÞ±²¦ É¿Þ²Ã¤ ØÖ³ ¾²¹ÞÝ¦ ³¹Ï½¡ ReactOSÉ ×²¾Ý½ ·®³ÖÊ", TEXT_STYLE_NORMAL }, { 8, 17, - "ReactOS only covers distribution to third parties.", + "ÀÞ²»Ý¼¬ÍÉ ÊÝÊÞ²¦ Ì¾¸Þ ÀÞ¹ ÃÞ½¡", TEXT_STYLE_NORMAL }, { 8, 18, - "If for some reason you did not receive a copy of the", + "GNU General Public License¦ ReactOSÄ ÄÓÆ ³¹Ä×Å¶¯À", TEXT_STYLE_NORMAL }, { 8, 19, - "GNU General Public License with ReactOS please visit", + "ÊÞ±²Ê¤ Â·Þ¦ ºÞ»Ý¼®³ ¸ÀÞ»²", TEXT_STYLE_NORMAL }, { @@ -314,31 +313,31 @@ { 8, 22, - "Warranty:", + "ËÝ¼Â Î¼®³:", TEXT_STYLE_HIGHLIGHT }, { 8, 24, - "This is free software; see the source for copying conditions.", + "ºÚÊ ÌØ°¿ÌÄ³ª± ÃÞ½¡ ¼®³»²Ê ¿°½É ºËß°¼Þ®³¹Ý¦ ºÞ×Ý ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 25, - "There is NO warranty; not even for MERCHANTABILITY or", + "Î¼®³Ê Ï¯À¸ '±ØÏ¾Ý'¡ '¼¼Þ®³¾²' Ô 'Ã·ºÞ³¾²'", TEXT_STYLE_NORMAL }, { 8, 26, - "FITNESS FOR A PARTICULAR PURPOSE", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Return", + "Æµ²ÃÓ ÄÞ³Ö³ ÃÞ½¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ÓÄÞÙ", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -354,84 +353,84 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "The list below shows the current device settings.", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "²¶É Ø½ÄÊ ¹ÞÝ»Þ²É ÃÞÊÞ²½ ¾¯Ã²ÃÞ½¡", TEXT_STYLE_NORMAL }, { 24, 11, - "Computer:", + "ºÝËß°À:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 12, - "Display:", + "ÃÞ¨½ÌßÚ²:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 13, - "Keyboard:", + "·°ÎÞ°ÄÞ:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 14, - "Keyboard layout:", + "·°ÎÞ°ÄÞ Ú²±³Ä:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 24, 16, - "Accept:", + "¼ÞÀÞ¸:", TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT }, { 25, - 16, "Accept these device settings", + 16, "ºÚ×É ÃÞÊÞ²½ ¾¯Ã²¦ ¼ÞÀÞ¸ ½Ù", TEXT_STYLE_NORMAL }, { 6, 19, - "You can change the hardware settings by pressing the UP or DOWN keys", + "UP Ó¼¸Ê DOWN·°¦ µ¼Ã ´ÝÄØ°¦ ¾ÝÀ¸ ½Ù ºÄÆÖØ", TEXT_STYLE_NORMAL }, { 6, 20, - "to select an entry. Then press the ENTER key to select alternative", + "Ê°ÄÞ³ª±É ¾¯Ã²¦ ÍÝº³ ÃÞ·Ï½¡ ¾ÝÀ¸ ¼À×¤ ENTER·°¦ µ¼Ã Ã·¾ÂÅ ¾¯Ã²¦", TEXT_STYLE_NORMAL }, { 6, 21, - "settings.", + "¾ÝÀ¸ ¼Ï½¡", TEXT_STYLE_NORMAL }, { 6, 23, - "When all settings are correct, select \"Accept these device settings\"", + "ºÚ×É ¾¯Ã²¶Þ ½ÍÞÃ ÀÀÞ¼² ÊÞ±²Ê¤ \"ºÚ×É ÃÞÊÞ²½ ¾¯Ã²¦ ¼ÞÀÞ¸ ½Ù\" ¦ ¾ÝÀ¸ ¼Ã¤", TEXT_STYLE_NORMAL }, { 6, 24, - "and press ENTER.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue F3 = Quit", + "ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -447,55 +446,55 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "ReactOS Setup is in an early development phase. It does not yet", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS ¾¯Ä±¯ÌßÊ ¼®·¶²ÊÂ ÀÞÝ¶²Æ ±ØÏ½¡ ¿ÉÀÒ¤ ÏÀÞ", TEXT_STYLE_NORMAL }, { 6, 9, - "support all the functions of a fully usable setup application.", + "¼Þ³ÌÞÝÆ ØÖ³ ÃÞ·Ù ¾¯Ä±¯Ìß ±ÌßØ¹°¼®ÝÉ ½ÍÞÃÉ ·É³Ê »Îß°Ä »ÚÏ¾Ý¡", TEXT_STYLE_NORMAL }, { 6, 12, - "The repair functions are not implemented yet.", + "¼³Ì¸·É³Ê ÏÀÞ ¼Þ¯¿³ »ÚÃ ²Ï¾Ý¡", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Press U for Updating OS.", + "\x07 OS¦ º³¼Ý ½Ù ÆÊ U·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press R for the Recovery Console.", + "\x07 ¶²Ì¸ ºÝ¿°Ù¦ Ë×¸ÆÊ R·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press ESC to return to the main page.", + "\x07 Ò²ÝÍß°¼ÞÆ ÓÄÞÙ ÆÊ ESC·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ESC = Main page U = Update R = Recovery ENTER = Reboot", + "\x07 ºÝËß°À¦ »²·ÄÞ³ ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ESC = Ò²ÝÍß°¼Þ U = º³¼Ý R = ¶²Ì¸ ENTER = »²·ÄÞ³", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -510,43 +509,43 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You want to change the type of computer to be installed.", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired computer type.", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "²Ý½Ä°Ù »ÚÙ ºÝËß°ÀÉ ¼Ù²¦ ÍÝº³ ½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À¡", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ã·½Ù ºÝËß°ÀÉ ¼Ù²¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 11, - " Then press ENTER.", + " Â·ÞÆ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 ºÝËß°ÀÉ ¼Ù²¦ ÍÝº³¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙ ÊÞ±²Ê ESC·°¦", TEXT_STYLE_NORMAL }, { 8, 14, - " the computer type.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue ESC = Cancel F3 = Quit", + " µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ ESC = ·¬Ý¾Ù F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -562,31 +561,31 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 10, - 6, - "The system is now making sure all data is stored on your disk", - TEXT_STYLE_NORMAL - }, - { - 10, - 8, - "This may take a minute", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "¼½ÃÑÊ ¶¸¼ÞÂÆ ½ÍÞÃÉ ½ÍÞÃÉ ÃÞ°À¶Þ ÃÞ¨½¸¼Þ®³Æ Î¿ÞÝ »ÚÙ Ö³Æ ¼Ã²Ï½", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "ºÚÆÊ ¼®³¼®³ ¼Þ¶Ý¶Þ ¶¶Ù ÊÞ±²¶Þ ±ØÏ½", TEXT_STYLE_NORMAL }, { 10, 9, - "When finished, your computer will reboot automatically", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "Flushing cache", + "¶ÝØ®³ºÞ¤ ºÝËß°ÀÊ ¼ÞÄÞ³ÃÆ »²·ÄÞ³ »ÚÏ½", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "·¬¯¼¦ ¼®³·® ¼Ã ²Ï½", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -602,37 +601,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 10, - 6, - "ReactOS is not completely installed", - TEXT_STYLE_NORMAL - }, - { - 10, - 8, - "Remove floppy disk from Drive A: and", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOSÊ Ï¯À¸ ²Ý½Ä°Ù »ÚÏ¾Ý", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "ÄÞ×²ÌÞ A: ¶× ÌÛ¯Ëß° ÃÞ¨½¸¤ CD ÄÞ×²ÌÞ ¶×", TEXT_STYLE_NORMAL }, { 10, 9, - "all CD-ROMs from CD-Drives.", + "½ÍÞÃÉ CD-ROM¦ ÄØÀÞ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 10, 11, - "Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "Please wait ...", + "ºÝËß°À¦ »²·ÄÞ³ ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "µÏÁ¸ÀÞ»² ...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, }, { @@ -648,42 +647,42 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You want to change the type of display to be installed.", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "²Ý½Ä°Ù »ÚÙ ÃÞ¨½ÌßÚ²É ¼Ù²¦ ÍÝº³ ½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À¡", TEXT_STYLE_NORMAL }, { 8, 10, - "\x07 Press the UP or DOWN key to select the desired display type.", + "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ã·½Ù ÃÞ¨½ÌßÚ²É ¼Ù²¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 11, - " Then press ENTER.", + " Â·ÞÆ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 ÃÞ¨½ÌßÚ²É ¼Ù²¦ ÍÝº³¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙÆÊ ESC·°¦", TEXT_STYLE_NORMAL }, { 8, 14, - " the display type.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue ESC = Cancel F3 = Quit", + " µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ ESC = ·¬Ý¾Ù F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -699,37 +698,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 10, - 6, - "The basic components of ReactOS have been installed successfully.", - TEXT_STYLE_NORMAL - }, - { - 10, - 8, - "Remove floppy disk from Drive A: and", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOSÉ ·ÎÝÌÞÌÞÝÉ ²Ý½Ä°ÙÊ ¾²º³ ¼Ï¼À¡", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "ÄÞ×²ÌÞ A: ¶× ÌÛ¯Ëß° ÃÞ¨½¸¤ CD ÄÞ×²ÌÞ ¶×", TEXT_STYLE_NORMAL }, { 10, 9, - "all CD-ROMs from CD-Drive.", + "½ÍÞÃÉ CD-ROM¦ ÄØÀÞ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 10, 11, - "Press ENTER to reboot your computer.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Reboot computer", + "ºÝËß°À¦ »²·ÄÞ³ ½Ù ÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -745,37 +744,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Setup cannot install the bootloader on your computers", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¾¯Ä±¯ÌßÊ ÌÞ°ÄÛ°ÀÞ¦ ºÝËß°ÀÉ Ê°ÄÞÃÞ¨½¸ ¼Þ®³ Æ ²Ý½Ä°Ù", TEXT_STYLE_NORMAL }, { 6, 9, - "hardisk", + "ÃÞ·Ï¾ÝÃÞ¼À", TEXT_STYLE_NORMAL }, { 6, 13, - "Please insert a formatted floppy disk in drive A: and", + "ÄÞ×²ÌÞ A: Æ Ì«°Ï¯Ä»ÚÀ ÌÛ¯Ëß° ÃÞ¨½¸¦ ²ÚÃ¤", TEXT_STYLE_NORMAL }, { 6, 14, - "press ENTER.", + "ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL, }, { 0, 0, - "ENTER = Continue F3 = Quit", + "ENTER = ¿Þ¯º³ F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -792,49 +791,49 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "The list below shows existing partitions and unused disk", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "²¶É Ø½ÄÊ ¿Ý»Þ²½Ù Êß°Ã¨¼®ÝÄ ¼Ý· Êß°Ã¨¼®ÝÆ Ã·¼À Ð¼Ö³É", TEXT_STYLE_NORMAL }, { 6, 9, - "space for new partitions.", + "ÃÞ²½¸ ½Íß°½É ²Á×Ý ÃÞ½¡", TEXT_STYLE_NORMAL }, { 8, 11, - "\x07 Press UP or DOWN to select a list entry.", + "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ø½Ä´ÝÄØ°¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press ENTER to install ReactOS onto the selected partition.", + "\x07 ¾ÝÀ¸»ÚÀ Êß°Ã¨¼®ÝÆ ReactOS¦ ²Ý½Ä°Ù½Ù ÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Press C to create a new partition.", + "\x07 ±À×¼² Êß°Ã¨¼®Ý ¦ »¸¾²½Ù ÆÊ C·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press D to delete an existing partition.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "Please wait...", + "\x07 ·¿ÝÉ Êß°Ã¨¼®Ý¦ »¸¼Þ®½Ù ÆÊ D·°¦ µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "µÏÁ¸ÀÞ»²...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -850,25 +849,25 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Format partition", - TEXT_STYLE_NORMAL - }, - { - 6, - 10, - "Setup will now format the partition. Press ENTER to continue.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue F3 = Quit", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Êß°Ã¨¼®ÝÉ Ì«°Ï¯Ä", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "¾¯Ä±¯ÌßÊ Êß°Ã¨¼®Ý¦ Ì«°Ï¯Ä ¼Ï½¡ ¿Þ¯º³ ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -884,43 +883,43 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Setup installs ReactOS files onto the selected partition. Choose a", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¾¯Ä±¯ÌßÊ ReactOSÉ Ì§²Ù¦ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡ ReactOS¦", TEXT_STYLE_NORMAL }, { 6, 9, - "directory where you want ReactOS to be installed:", + "²Ý½Ä°Ù½Ù ÃÞ¨Ú¸ÄØ¦ ¾¯Ã² ¼Ã ¸ÀÞ»²:", TEXT_STYLE_NORMAL }, { 6, 14, - "To change the suggested directory, press BACKSPACE to delete", + "½²¼®³ ÃÞ¨Ú¸ÄØ¦ ÍÝº³½ÙÆÊABACKSPACE·°ÃÞ »¸¼Þ®¼À ±ÄÆ¤", TEXT_STYLE_NORMAL }, { 6, 15, - "characters and then type the directory where you want ReactOS to", + "ReactOS¦ ²Ý½Ä°Ù ½Ù ÃÞ¨Ú¸ÄØ¦ Æ³Ø®¸", TEXT_STYLE_NORMAL }, { 6, 16, - "be installed.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue F3 = Quit", + "¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -936,31 +935,31 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", TEXT_STYLE_UNDERLINE }, { 0, 12, - "Please wait while ReactOS Setup copies files to your ReactOS", + "ReactOS ¾¯Ä±¯Ìß¶Þ ReactOS ²Ý½Ä°Ù Ì«ÙÀÞÆ Ì§²Ù¦", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, 13, - "installation folder.", + "ºËß°½Ù ±²ÀÞ ¼ÊÞ×¸ µÏÁ ¸ÀÞ»²¡", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 0, 14, - "This may take several minutes to complete.", + "¶ÝØ®³ÏÃÞÆ ½³ÌÝ ¶¶Ù ÊÞ±²¶Þ ±ØÏ½¡", TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER }, { 50, 0, - "\xB3 Please wait... ", + "\xB3 µÏÁ ¸ÀÞ»²... ", TEXT_TYPE_STATUS }, { @@ -976,37 +975,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Setup is installing the boot loader", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¾¯Ä±¯ÌßÊ ÌÞ°ÄÛ°ÀÞ¦ ²Ý½Ä°Ù ¼Ï½", TEXT_STYLE_NORMAL }, { 8, 12, - "Install bootloader on the harddisk (MBR).", + "ÌÞ°ÄÛ°ÀÞ¦ Ê°ÄÞÃÞ¨½¸ (MBR) Æ ²Ý½Ä°Ù ½Ù¡", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on a floppy disk.", + "ÌÞ°ÄÛ°ÀÞ¦ ÌÛ¯Ëß° ÃÞ¨½¸Æ ²Ý½Ä°Ù ½Ù¡", TEXT_STYLE_NORMAL }, { 8, 14, - "Skip install bootloader.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue F3 = Quit", + "ÌÞ°ÄÛ°ÀÞÉ ²Ý½Ä°Ù¦ ½·¯Ìß ½Ù¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1022,43 +1021,43 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You want to change the type of keyboard to be installed.", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard type.", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "²Ý½Ä°Ù »ÚÙ ·°ÎÞ°ÄÞÉ ¼Ù²¦ ÍÝº³½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À¡", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ã·½Ù ·°ÎÞ°ÄÞÉ ¼Ù²¦ ¾ÝÀ¸¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 11, - " Then press ENTER.", + " Â·ÞÆ ENTER·°¦ µ¼Ã¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 ·°ÎÞ°ÄÞÉ ¼Ù²¦ ÍÝº³ ¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙÆÊ ESC·°¦", TEXT_STYLE_NORMAL }, { 8, 14, - " the keyboard type.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue ESC = Cancel F3 = Quit", + " µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ ESC = ·¬Ý¾Ù F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1074,43 +1073,43 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Please select a layout to be installed by default.", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "²Ý½Ä°Ù»ÚÙ ·ÄÃ²É Ú²±³Ä¦ ¾ÝÀ¸¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ã·½Ù ·°ÎÞ°ÄÞ Ú²±³Ä¦ ¾ÝÀ¸¼Ã¤", TEXT_STYLE_NORMAL }, { 8, 11, - " layout. Then press ENTER.", + " Â·ÞÆ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 ·°ÎÞ°ÄÞ Ú²±³Ä¦ ÍÝº³ ¾½ÞÆ Ï´É Íß°¼ÞÆ ÓÄÞÙÆÊ ESC·°¦", TEXT_STYLE_NORMAL }, { 8, 14, - " the keyboard layout.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER = Continue ESC = Cancel F3 = Quit", + " µ¼Ã ¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ ESC = ·¬Ý¾Ù F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1127,19 +1126,19 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Setup prepares your computer for copying the ReactOS files. ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "Building the file copy list...", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¾¯Ä±¯ÌßÊ ReactOSÉÌ§²Ù¦ ºÝËß°ÀÆ ºËß°½Ù ¼ÞÝËÞ¦ ¼Ã ²Ï½¡ ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "ºËß°½Ù Ì§²Ù Ø½Ä¦ »¸¾² Á³...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1156,37 +1155,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", TEXT_STYLE_UNDERLINE }, { 6, 17, - "Select a file system from the list below.", + "¼ÀÉ Ø½Ä¶× Ì§²Ù ¼½ÃÑ¦ ¾ÝÀ¸ ¼Ã ¸ÀÞ»²¡", 0 }, { 8, 19, - "\x07 Press UP or DOWN to select a file system.", + "\x07 UP Ó¼¸Ê DOWN·°¦ µ¼Ã Ì§²Ù ¼½ÃÑ¦ ¾ÝÀ¸¼Ã ¸ÀÞ»²¡", 0 }, { 8, 21, - "\x07 Press ENTER to format the partition.", + "\x07 Êß°Ã¨¼®Ý¦ Ì«°Ï¯Ä½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", 0 }, { 8, 23, - "\x07 Press ESC to select another partition.", - 0 - }, - { - 0, - 0, - "ENTER = Continue ESC = Cancel F3 = Quit", + "\x07 ÍÞÂÉ Êß°Ã¨¼®Ý¦ ¾ÝÀ¸½Ù ÊÞ±²¤ ESC·°¦ µ¼Ã ¸ÀÞ»²¡", + 0 + }, + { + 0, + 0, + "ENTER = ¿Þ¯º³ ESC = ·¬Ý¾Ù F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, @@ -1203,37 +1202,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You have chosen to delete the partition", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ºÉ Êß°Ã¨¼®Ý¦ »¸¼Þ®½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À", TEXT_STYLE_NORMAL }, { 8, 18, - "\x07 Press D to delete the partition.", + "\x07 ºÉ Êß°Ã¨¼®Ý¦ »¸¼Þ® ½ÙÆÊ D·°¦ µ¼Ã ¸ÀÞ»²¡", TEXT_STYLE_NORMAL }, { 11, 19, - "WARNING: All data on this partition will be lost!", + "¹²º¸(WARNING): ºÉ Êß°Ã¨¼®Ý ¼Þ®³É ½ÍÞÃÉ ÃÞ°ÀÊ ³¼ÅÜÚ Ï½!", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press ESC to cancel.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "D = Delete Partition ESC = Cancel F3 = Quit", + "\x07 ·¬Ý¾Ù½Ù ÆÊ ESC·° ¦ µ¼Ã¸ÀÞ»²¡", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D = Êß°Ã¼®Ý »¸¼Þ® ESC = ·¬Ý¾Ù F3 = Á³¼", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1249,19 +1248,19 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Setup is updating the system configuration. ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "Creating registry hives...", + " ReactOS " KERNEL_VERSION_STR " ¾¯Ä±¯Ìß ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "¾¯Ä±¯ÌßÊ ¼½ÃÑÉ º³¾²¦ º³¼Ý ¼Ã²Ï½¡ ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Ú¼Þ½ÄØ Ê²ÌÞ¦ »¸¾² Á³...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1277,207 +1276,207 @@ { { //ERROR_NOT_INSTALLED - "ReactOS is not completely installed on your\n" - "computer. If you quit Setup now, you will need to\n" - "run Setup again to install ReactOS.\n" + "ReactOSÊ ºÝËß°ÀÆ Ï¯À¸ ²Ý½Ä°Ù\n" + "»ÚÏ¾Ý¡ ¾¯Ä±¯Ìß¦ Á³¼ ½Ù ÊÞ±²¤ ReactOS¦ ²Ý½Ä°Ù½Ù ÆÊ ¾¯Ä±¯Ìß¦\n" + "Ó³²ÁÄÞ ¼Þ¯º³ ½Ù ËÂÖ³¶Þ ±ØÏ½¡\n" "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3 = Quit ENTER = Continue" + " \x07 ¾¯Ä±¯Ìß¦ ¿Þ¯º³½ÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡\n" + " \x07 ¾¯Ä±¯Ìß¦ Á³¼½ÙÆÊ F3·°¦ µ¼Ã ¸ÀÞ»²¡", + "F3 = Á³¼ ENTER = ¿Þ¯º³" }, { //ERROR_NO_HDD - "Setup could not find a harddisk.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ Ê°ÄÞÃÞ¨½¸¦ ¹Ý¼Â ÃÞ·Ï¾Ý ÃÞ¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_NO_SOURCE_DRIVE - "Setup could not find its source drive.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ¿°½ ÄÞ×²ÌÞ ¦ ¹Ý¼Â ÃÞ·Ï¾Ý ÃÞ¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_LOAD_TXTSETUPSIF - "Setup failed to load the file TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ Ì§²Ù TXTSETUP.SIF É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CORRUPT_TXTSETUPSIF - "Setup found a corrupt TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ TXTSETUP.SIF ¶Þ Ê¿Ý ¼Ã²Ù ºÄ¦ ¹Ý¼Â ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_SIGNATURE_TXTSETUPSIF, - "Setup found an invalid signature in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ TXTSETUP.SIF É Ñº³Å ¼®Ò²¦ ¹Ý¼Â ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_DRIVE_INFORMATION - "Setup could not retrieve system drive information.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ¼½ÃÑ ÄÞ×²ÌÞÉ ¼Þ®³Î³¦ ¼ÐÄØ ÃÞ·Ï¾Ý ÃÞ¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_WRITE_BOOT, - "Setup failed to install FAT bootcode on the system partition.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ¼½ÃÑ Êß°Ã¨¼®Ý ¼Þ®³ÍÉ FAT ÌÞ°Äº°ÄÞÉ ²Ý½Ä°ÙÆ ¼¯Êß² ¼Ï¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_LOAD_COMPUTER, - "Setup failed to load the computer type list.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ºÝËß°ÀÉ ¼Ù² Ø½Ä É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_LOAD_DISPLAY, - "Setup failed to load the display settings list.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ÃÞ¨½ÌßÚ²É ¾¯Ã² Ø½Ä É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_LOAD_KEYBOARD, - "Setup failed to load the keyboard type list.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞÉ ¼Ù² Ø½Ä É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_LOAD_KBLAYOUT, - "Setup failed to load the keyboard layout list.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞ Ú²±³Ä Ø½Ä É ÖÐºÐÆ ¼¯Êß² ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_WARN_PARTITION, - "Setup found that at least one harddisk contains an incompatible\n" - "partition table that can not be handled properly!\n" + "¾¯Ä±¯ÌßÊ ½¸Å¸ÄÓ 1ÂÉ Ê°ÄÞÃÞ¨½¸¶Þ Ã·¾ÂÆ ±Â¶´Å² ºÞ¶Ý¾²É Å²\n" + "Êß°Ã¨¼®Ý Ã°ÌÞÙ¦ Ì¸Ñ ºÄ¦ Ê¯¹Ý ¼Ï¼À!\n" "\n" - "Creating or deleting partitions can destroy the partition table.\n" + "Êß°Ã¨¼®Ý¦ »¸¾² ÏÀÊ »¸¼Þ®¼Ã¤ ºÉ Êß°Ã¨¼®Ý Ã°ÌÞÙ¦ Ê¶² ÃÞ·Ï½\n" "\n" - " \x07 Press F3 to quit Setup." - " \x07 Press ENTER to continue.", - "F3= Quit ENTER = Continue" + " \x07 ¾¯Ä±¯Ìß¦ Á³¼ ½ÙÆÊ F3·°¦ µ¼Ã ¸ÀÞ»²¡" + " \x07 ¿Þ¯º³ ½ÙÆÊ ENTER·°¦ µ¼Ã ¸ÀÞ»²¡", + "F3= Á³¼ ENTER = ¿Þ¯º³" }, { //ERROR_NEW_PARTITION, - "You can not create a new Partition inside\n" - "of an already existing Partition!\n" + "±À×¼² Êß°Ã¨¼®Ý ¦ ½ÃÞÆ ¿Ý»Þ²½Ù\n" + "Êß°Ã¨¼®ÝÉ Å²ÌÞÆ »¸¾² ½ÙºÄÊ ÃÞ·Ï¾Ý!\n" "\n" - " * Press any key to continue.", + " * ¿Þ¯º³ ½ÙÆÊ ÅÆ¶ ·°¦ µ¼Ã ¸ÀÞ»²¡", NULL }, { //ERROR_DELETE_SPACE, - "You can not delete unpartitioned disk space!\n" + "ÐÌÞÝ¶Â É ÃÞ¨½¸ ½Íß°½ ¦ »¸¼Þ® ½ÙºÄÊ ÃÞ·Ï¾Ý!\n" "\n" - " * Press any key to continue.", + " * ¿Þ¯º³ ½ÙÆÊ ÅÆ¶ ·°¦ µ¼Ã ¸ÀÞ»²¡", NULL }, { //ERROR_INSTALL_BOOTCODE, - "Setup failed to install the FAT bootcode on the system partition.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ¼½ÃÑ Êß°Ã¨¼®Ý ¼Þ®³ÍÉ FAT ÌÞ°Ä Úº°ÄÞ É ²Ý½Ä°ÙÆ ¼¯Êß² ¼Ï¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_NO_FLOPPY, - "No disk in drive A:.", - "ENTER = Continue" + "ÄÞ×²ÌÞ A: Æ ÃÞ¨½¸¶Þ ±ØÏ¾Ý¡", + "ENTER = ¿Þ¯º³" }, { //ERROR_UPDATE_KBSETTINGS, - "Setup failed to update keyboard layout settings.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ·°ÎÞ°ÄÞ Ú²±³Ä É ¾¯Ã²É º³ÆÝÆ ¼¯Êß² ¼Ï¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_UPDATE_DISPLAY_SETTINGS, - "Setup failed to update display registry settings.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ÃÞ¨½ÌßÚ²É Ú¼Þ½ÄØ ¾¯Ã² É º³¼ÝÆ ¼¯Êß² ¼Ï¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_IMPORT_HIVE, - "Setup failed to import a hive file.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ Ê²ÌÞ Ì§²Ù É ²ÝÎß°ÄÆ ¼¯Êß² ¼Ï¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_FIND_REGISTRY - "Setup failed to find the registry data files.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ ÃÞ°À Ì§²Ù É ¹Ý¼ÂÆ ¼¯Êß² ¼Ï¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CREATE_HIVE, - "Setup failed to create the registry hives.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ Ê²ÌÞ É »¸¾²Æ ¼¯Êß² ¼Ï¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_INITIALIZE_REGISTRY, - "Setup failed to initialize the registry.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØ É ¼®·¶Æ ¼¯Êß² ¼Ï¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_INVALID_CABINET_INF, - "Cabinet has no valid inf file.\n", - "ENTER = Reboot computer" + "·¬ËÞÈ¯ÄÆ Ñº³Å inf Ì§²Ù¶Þ Ì¸ÏÚÃ ²Ï½¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CABINET_MISSING, - "Cabinet not found.\n", - "ENTER = Reboot computer" + "·¬ËÞÈ¯Ä ¶Þ ÐÂ¶ØÏ¾Ý¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CABINET_SCRIPT, - "Cabinet has no setup script.\n", - "ENTER = Reboot computer" + "·¬ËÞÈ¯ÄÅ²Æ ¾¯Ä±¯Ìß ½¸ØÌßÄ ¶Þ ÐÂ¶ØÏ¾Ý¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_COPY_QUEUE, - "Setup failed to open the copy file queue.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ºËß° Ì§²Ù ·° É µ°ÌßÝÆ ¼¯Êß² ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CREATE_DIR, - "Setup could not create install directories.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ²Ý½Ä°Ù ÃÞ¨Ú¸ÄØ ¦ »¸¾² ÃÞ·Ï¾Ý ÃÞ¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'Directories' ¾¸¼®Ý É¹Ý»¸Æ\n" + "¼¯Êß² ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ·¬ËÞÈ¯Ä Å²É 'Directories' ¾¸¼®Ý É¹Ý»¸Æ\n" + "¼¯Êß² ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_CREATE_INSTALL_DIR - "Setup could not create the install directory.", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ²Ý½Ä°Ù ÃÞ¨Ú¸ÄØ ¦ »¸¾² ÃÞ·Ï¾Ý ÃÞ¼À¡", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ TXTSETUP.SIF Å²É 'SetupData' ¾¸¼®Ý É¹Ý»¸Æ\n" + "¼¯Êß² ¼Ï¼À¡\n", + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_WRITE_PTABLE, - "Setup failed to write partition tables.\n" - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ Êß°Ã¨¼®Ý Ã°ÌÞÙ É ¶·ºÐ Æ ¼¯Êß² ¼Ï¼À¡\n" + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_ADDING_CODEPAGE, - "Setup failed to add codepage to registry.\n" - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØÍÉ º°ÄÞÍß°¼ÞÉ Â²¶Æ ¼¯Êß² ¼Ï¼À¡\n" + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_UPDATE_LOCALESETTINGS, - "Setup could not set the system locale.\n" - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ ¼½ÃÑ Û¹°Ù ¦ ¾¯Ã² ÃÞ·Ï¾Ý ÃÞ¼À¡\n" + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ Ú¼Þ½ÄØÍÉ ·°ÎÞ°ÄÞ Ú²±³ÄÉ Â²¶Æ ¼¯Êß² ¼Ï¼À¡\n" + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" + "¾¯Ä±¯ÌßÊ geo id ¦ ¾¯Ã² ÃÞ·Ï¾Ý ÃÞ¼À¡\n" + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³" }, { NULL, @@ -1589,103 +1588,103 @@ MUI_STRING jaJPStrings[] = { {STRING_PLEASEWAIT, - " Please wait..."}, + " µÏÁ ¸ÀÞ»²..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install C = Create Partition F3 = Quit"}, + " ENTER = ²Ý½Ä°Ù C = Êß°Ã¨¼®Ý »¸¾² F3 = Á³¼"}, {STRING_INSTALLDELETEPARTITION, - " ENTER = Install D = Delete Partition F3 = Quit"}, + " ENTER = ²Ý½Ä°Ù D = Êß°Ã¨¼®Ý »¸¼Þ® F3 = Á³¼"}, {STRING_PARTITIONSIZE, - "Size of new partition:"}, + "±À×¼² Êß°Ã¨¼®ÝÉ »²½Þ:"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a new partition on"}, + "±À×¼² Êß°Ã¨¼®Ý ¦ Â·ÞÆ »¸¾²½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À:"}, {STRING_HDDSIZE, - "Please enter the size of the new partition in megabytes."}, + "±À×¼² Êß°Ã¨¼®ÝÉ »²½Þ¦ Ò¶ÞÊÞ²Ä ÀÝ²ÃÞ Æ³Ø®¸ ¼Ã¸ÀÞ»²¡"}, {STRING_CREATEPARTITION, - " ENTER = Create Partition ESC = Cancel F3 = Quit"}, + " ENTER = Êß°Ã¨¼®Ý »¸¾² ESC = ·¬Ý¾Ù F3 = Á³¼"}, {STRING_PARTFORMAT, - "This Partition will be formatted next."}, + "ºÉ Êß°Ã¨¼®ÝÊ Â·ÞÆ Ì«°Ï¯Ä »ÚÏ½¡"}, {STRING_NONFORMATTEDPART, - "You chose to install ReactOS on a new or unformatted Partition."}, + "ReactOS¦ ¼Ý· ÏÀÊ ÐÌ«°Ï¯ÄÉ Êß°Ã¨¼®ÝÆ ²Ý½Ä°Ù½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À¡"}, {STRING_INSTALLONPART, - "Setup installs ReactOS onto Partition"}, + "¾¯Ä±¯ÌßÊ ReactOS¦ Êß°Ã¨¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"}, {STRING_CHECKINGPART, - "Setup is now checking the selected partition."}, + "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Êß°Ã¨¼®Ý¦ ¹Ý» ¼Ã²Ï½¡"}, {STRING_QUITCONTINUE, - "F3= Quit ENTER = Continue"}, + "F3= Á³¼ ENTER = ¿Þ¯º³"}, {STRING_REBOOTCOMPUTER, - "ENTER = Reboot computer"}, + "ENTER = ºÝËß°ÀÉ »²·ÄÞ³"}, {STRING_TXTSETUPFAILED, - "Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"}, + "¾¯Ä±¯ÌßÊ TXTSETUP.SIF É '%S' ¾¸¼®ÝÉ ¹Ý¼ÂÆ\n¼¯Êß² ¼Ï¼À¡\n"}, {STRING_COPYING, - "\xB3 Copying file: %S"}, + "\xB3 ºËß° Á³É Ì§²Ù: %S"}, {STRING_SETUPCOPYINGFILES, - "Setup is copying files..."}, + "¾¯Ä±¯ÌßÊ Ì§²Ù¦ ºËß° ¼Ã ²Ï½..."}, {STRING_REGHIVEUPDATE, - " Updating registry hives..."}, + " Ú¼Þ½ÄØ Ê²ÌÞ É º³¼Ý Á³..."}, {STRING_IMPORTFILE, - " Importing %S..."}, + " %S ¦ ²ÝÎß°Ä Á³..."}, {STRING_DISPLAYETTINGSUPDATE, - " Updating display registry settings..."}, + " ÃÞ¨½ÌßÚ² Ú¼Þ½ÄØ ¾¯Ã²¦ º³¼Ý Á³..."}, {STRING_LOCALESETTINGSUPDATE, - " Updating locale settings..."}, + " Á²· ¾¯Ã²É º³¼Ý Á³..."}, {STRING_KEYBOARDSETTINGSUPDATE, - " Updating keyboard layout settings..."}, + " ·°ÎÞ°ÄÞ Ú²±³ÄÉ ¾¯Ã² º³¼Ý Á³..."}, {STRING_CODEPAGEINFOUPDATE, - " Adding codepage information to registry..."}, + " º°ÄÞ Íß°¼Þ É ¼Þ®³Î³¦ Ú¼Þ½ÄØÆ Â²¶ Á³..."}, {STRING_DONE, - " Done..."}, + " ¶ÝØ®³..."}, {STRING_REBOOTCOMPUTER2, - " ENTER = Reboot computer"}, + " ENTER = ºÝËß°ÀÉ »²·ÄÞ³"}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "ºÝ¿°Ù¦ µ°ÌßÝ ÃÞ·Ï¾Ý\n\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "²¯ÊßÝÃ·Å ¹ÞÝ²Ý Ä¼Ã USB ·°ÎÞ°ÄÞ ¦ Â¶¯Ã ²ÙºÄ¶Þ ¶Ý¶Þ´×Ú Ï½\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "USB ·°ÎÞ°ÄÞ Ê ÏÀÞ ¶Ý¾ÞÝÆ »Îß°Ä »ÚÃ ²Ï¾Ý\n"}, {STRING_FORMATTINGDISK, - "Setup is formatting your disk"}, + "¾¯Ä±¯ÌßÊ ÃÞ¨½¸¦ Ì«°Ï¯Ä ¼Ã²Ï½"}, {STRING_CHECKINGDISK, - "Setup is checking your disk"}, + "¾¯Ä±¯ÌßÊ ÃÞ¨½¸¦ ¹Ý» ¼Ã²Ï½¡"}, {STRING_FORMATDISK1, - " Format partition as %S file system (quick format) "}, + " Êß°Ã¨¼®Ý¦ %S Ì§²Ù ¼½ÃÑ ÃÞÌ«°Ï¯Ä (¸²¯¸ Ì«°Ï¯Ä) "}, {STRING_FORMATDISK2, - " Format partition as %S file system "}, + " Êß°Ã¨¼®Ý¦ %S Ì§²Ù ¼½ÃÑ ÃÞÌ«°Ï¯Ä "}, {STRING_KEEPFORMAT, - " Keep current file system (no changes) "}, + " ¹ÞÝ»Þ²É Ì§²Ù ¼½ÃÑÉ ÏÏ (ÍÝº³ ¼Å²) "}, {STRING_HDINFOPARTCREATE, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "%I64u %s Ê°ÄÞÃÞ¨½¸ %lu (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %wZ."}, {STRING_HDDINFOUNK1, - "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "%I64u %s Ê°ÄÞÃÞ¨½¸ %lu (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu)."}, {STRING_HDDINFOUNK2, - " %c%c Type %lu %I64u %s"}, + " %c%c ¼Ù² %lu %I64u %s"}, {STRING_HDINFOPARTDELETE, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ."}, + "on %I64u %s Ê°ÄÞÃÞ¨½¸ %lu (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %wZ."}, {STRING_HDDINFOUNK3, - "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."}, + "on %I64u %s Ê°ÄÞÃÞ¨½¸ %lu (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu)."}, {STRING_HDINFOPARTZEROED, - "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "Ê°ÄÞÃÞ¨½¸ %lu (%I64u %s), Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK4, - "%c%c Type %lu %I64u %s"}, + "%c%c ¼Ù² %lu %I64u %s"}, {STRING_HDINFOPARTEXISTS, - "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)."}, + "on Ê°ÄÞÃÞ¨½¸ %lu (%I64u %s), Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu (%wZ)."}, {STRING_HDDINFOUNK5, - "%c%c Type %-3u %6lu %s"}, + "%c%c ¼Ù² %-3u %6lu %s"}, {STRING_HDINFOPARTSELECT, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S"}, + "%6lu %s Ê°ÄÞÃÞ¨½¸ %lu (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu) on %S"}, {STRING_HDDINFOUNK6, - "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)"}, + "%6lu %s Ê°ÄÞÃÞ¨½¸ %lu (Îß°Ä=%hu, ÊÞ½=%hu, Id=%hu)"}, {STRING_NEWPARTITION, - "Setup created a new partition on"}, + "¾¯Ä±¯ÌßÊ ±À×¼² Êß°Ã¨¼®Ý¦ Â·ÞÆ »¸¾²¼Ï¼À:"}, {STRING_UNPSPACE, - " Unpartitioned space %6lu %s"}, + " ÐÌÞÝ¶ÂÉ ½Íß°½ %6lu %s"}, {STRING_MAXSIZE, - "MB (max. %lu MB)"}, + "MB (»²ÀÞ². %lu MB)"}, {STRING_UNFORMATTED, - "New (Unformatted)"}, + "¼Ý· (Ð Ì«°Ï¯Ä)"}, {STRING_FORMATUNUSED, - "Unused"}, + "Ð ¼Ö³"}, {STRING_FORMATUNKNOWN, - "Unknown"}, + "ÌÒ²"}, {STRING_KB, "KB"}, {STRING_MB, @@ -1693,7 +1692,7 @@ {STRING_GB, "GB"}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "·°ÎÞ°ÄÞ Ú²±³Ä É Â²¶ Á³"}, {0, 0} };

1 0

[bfreisen] 40968: Added Dutch translation
by bfreisen＠svn.reactos.org 18 May '09

18 May '09

Author: bfreisen Date: Mon May 18 20:47:53 2009 New Revision: 40968 URL: http://svn.reactos.org/svn/reactos?rev=40968&view=rev Log: Added Dutch translation Added: trunk/reactos/base/applications/paint/lang/nl-NL.rc (with props) Modified: trunk/reactos/base/applications/paint/rsrc.rc Added: trunk/reactos/base/applications/paint/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/paint/lang/nl-NL.rc [iso-8859-1] Mon May 18 20:47:53 2009 @@ -1,0 +1,193 @@ +/* + * Dutch Language resource file + * Translated by: Wouter De Vlieger + */ + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +ID_MENU MENU +BEGIN + POPUP "&Bestand" + BEGIN + MENUITEM "Nieuw\tCtrl+N", IDM_FILENEW + MENUITEM "Openen...\tCtrl+O", IDM_FILEOPEN + MENUITEM "Opslaan\tCtrl+S", IDM_FILESAVE + MENUITEM "Opslaan als...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Als achtergrond instellen (naast elkaar)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Als achtergrond instellen (gecentreerd)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Als achtergrond instellen (uitgerekt)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM SEPARATOR + MENUITEM "Afsluiten\tAlt+F4", IDM_FILEEXIT + END + + POPUP "Be&werken" + BEGIN + MENUITEM "Ongedaan maken\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Opnieuw\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "Knippen\tCtrl+X", IDM_EDITCUT + MENUITEM "Kopiëren\tCtrl+C", IDM_EDITCOPY + MENUITEM "Plakken\tCtrl+V", IDM_EDITPASTE + MENUITEM "Selectie wissen\tDel", IDM_EDITDELETESELECTION + MENUITEM "Selectie omkeren", IDM_EDITINVERTSELECTION + MENUITEM "Alles selecteren\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "Kopiëren naar...", IDM_EDITCOPYTO + MENUITEM "Plakken uit...", IDM_EDITPASTEFROM + END + + POPUP "Beel&d" + BEGIN + MENUITEM "Werkset\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "Kleurenpalet\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "Statusbalk", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "Werkbalk tekst", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "In-/uitzoomen" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM "Volledig scherm\tCtrl+F", IDM_VIEWFULLSCREEN + END + + POPUP "&Afbeelding" + BEGIN + MENUITEM "Spiegelen/draaien...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Formaat wijzigen...\tCtrl+W", IDM_IMAGECHANGESIZE + MENUITEM "Bijsnijden", IDM_IMAGECROP + MENUITEM "Negatief\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Kenmerken...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "Afbeelding wissen", IDM_IMAGEDELETEIMAGE + MENUITEM "Ondoorzichtig tekenen", IDM_IMAGEDRAWOPAQUE + END + + POPUP "&Kleuren" + BEGIN + MENUITEM "Kleurenpalet bewerken...", IDM_COLORSEDITPALETTE + END + + POPUP "&?" + BEGIN + MENUITEM "Help-onderwerpen", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "Informatie", IDM_HELPINFO + END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^N", IDM_FILENEW + "^O", IDM_FILEOPEN + "^S", IDM_FILESAVE + "^Z", IDM_EDITUNDO + "^Y", IDM_EDITREDO + "^X", IDM_EDITCUT + "^C", IDM_EDITCOPY + "^V", IDM_EDITPASTE + VK_DELETE, IDM_EDITDELETESELECTION, VIRTKEY + "^A", IDM_EDITSELECTALL + "^T", IDM_VIEWTOOLBOX + "^L", IDM_VIEWCOLORPALETTE + "^F", IDM_VIEWFULLSCREEN + "^R", IDM_IMAGEROTATEMIRROR + "^W", IDM_IMAGECHANGESIZE + "^I", IDM_IMAGEINVERTCOLORS + "^E", IDM_IMAGEATTRIBUTES + "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY +END + +IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Spiegelen en draaien" +BEGIN + GROUPBOX "Spiegelen of draaien", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 + AUTORADIOBUTTON "Horizontaal spiegelen", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "Verticaal spiegelen", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "Draaihoek", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 125, 24, 48, 14 +END + +IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Kenmerken" +BEGIN + EDITTEXT IDD_ATTRIBUTESEDIT1, 40, 40, 35, 12 + EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12 + LTEXT "Breedte:", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10 + LTEXT "Hoogte:", IDD_ATTRIBUTESTEXT2, 80, 40, 30, 10 + LTEXT "Datum laatst gewijzigd:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "Bestandsgrootte:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Resolutie:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "Niet beschikbaar", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 + LTEXT "Niet beschikbaar", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 + LTEXT "Niet beschikbaar", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10 + GROUPBOX "Eenheden", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27 + AUTORADIOBUTTON "Inch", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP + AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 52, 69, 35, 10 + AUTORADIOBUTTON "Pixels", IDD_ATTRIBUTESRB3, 92, 69, 35, 10 + GROUPBOX "Kleuren", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27 + AUTORADIOBUTTON "Zwart-wit", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "Kleuren", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 155, 24, 48, 14 + PUSHBUTTON "Standaard", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 +END + +IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Formaat wijzigen" +BEGIN + GROUPBOX "Formaat wijzigen", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + LTEXT "Horizontaal:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + LTEXT "Verticaal:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 + DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 155, 24, 48, 14 +END + +STRINGTABLE +BEGIN + IDS_PROGRAMNAME, "Paint" + IDS_WINDOWTITLE, "%s - Paint" + IDS_INFOTITLE, "Paint for ReactOS" + IDS_INFOTEXT, "Paint for ReactOS is available under the GNU Lesser General Public License (LGPL) version 3 (see www.gnu.org)" + IDS_SAVEPROMPTTEXT, "Wilt u de wijzigingen die zijn aangebracht in %s opslaan?" + IDS_DEFAULTFILENAME, "Naamloos.bmp" + IDS_TOOLTIP1, "Vrij selecteren" + IDS_TOOLTIP2, "Selecteren" + IDS_TOOLTIP3, "Gum" + IDS_TOOLTIP4, "Opvullen" + IDS_TOOLTIP5, "Kleur selecteren" + IDS_TOOLTIP6, "Vergroten" + IDS_TOOLTIP7, "Potlood" + IDS_TOOLTIP8, "Kwast" + IDS_TOOLTIP9, "Spuitbus" + IDS_TOOLTIP10, "Tekst" + IDS_TOOLTIP11, "Lijn" + IDS_TOOLTIP12, "Gebogen lijn" + IDS_TOOLTIP13, "Rechthoek" + IDS_TOOLTIP14, "Veelhoek" + IDS_TOOLTIP15, "Ovaal" + IDS_TOOLTIP16, "Afgeronde rechthoek" + IDS_OPENFILTER, "Bitmapbestanden (*.bmp;*.dib)\1*.bmp;*.dib\1Alle bestanden (*.*)\1*.*\1" + IDS_SAVEFILTER, "24 bit bitmap (*.bmp;*.dib)\1*.bmp;*.dib\1" +END Propchange: trunk/reactos/base/applications/paint/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/paint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/rs… ============================================================================== --- trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] Mon May 18 20:47:53 2009 @@ -24,6 +24,7 @@ #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/pt-PT.rc" +#include "lang/nl-NL.rc" // cp 1250 languages #include "lang/sk-SK.rc" #include "lang/cs-CZ.rc"

1 0

[janderwald] 40967: - Play default logon sound when logging on - Due to unknown issues, this only works at the 2nd login ATM
by janderwald＠svn.reactos.org 18 May '09

18 May '09

Author: janderwald Date: Mon May 18 19:41:00 2009 New Revision: 40967 URL: http://svn.reactos.org/svn/reactos?rev=40967&view=rev Log: - Play default logon sound when logging on - Due to unknown issues, this only works at the 2nd login ATM Modified: trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Mon May 18 19:41:00 2009 @@ -591,6 +591,51 @@ WARN("RegOpenKeyEx() failed with error %lu\n", rc); } +static VOID +PlayLogonSound() +{ + HKEY hKey; + WCHAR szBuffer[MAX_PATH] = {0}; + WCHAR szDest[MAX_PATH]; + DWORD dwSize = sizeof(szBuffer); + HMODULE hLibrary; + typedef BOOL WINAPI (*PLAYSOUNDW)(LPCWSTR,HMODULE,DWORD); + PLAYSOUNDW Play; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"AppEvents\\Schemes\\Apps\\.Default\\WindowsLogon\\.Current", 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + return; + } + + if (RegQueryValueExW(hKey, NULL, NULL, NULL, (LPBYTE)szBuffer, &dwSize) != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return; + } + + + RegCloseKey(hKey); + + if (!szBuffer[0]) + return; + + + szBuffer[MAX_PATH-1] = L'\0'; + if (ExpandEnvironmentStringsW(szBuffer, szDest, MAX_PATH)) + { + hLibrary = LoadLibraryW(L"winmm.dll"); + if (hLibrary) + { + Play = (PLAYSOUNDW)GetProcAddress(hLibrary, "PlaySoundW"); + if (Play) + { + Play(szDest, NULL, SND_FILENAME); + } + FreeLibrary(hLibrary); + } + } +} + static VOID SetUserSettings(VOID) { @@ -640,6 +685,7 @@ SetUserSettings(); StartShell(); NotifyLogon(); + PlayLogonSound(); return 0; }

1 0

[janderwald] 40966: - add ReactOS_LogOn.wav to bootcd - Created by Davy Bartoloni
by janderwald＠svn.reactos.org 18 May '09

18 May '09

Author: janderwald Date: Mon May 18 19:00:41 2009 New Revision: 40966 URL: http://svn.reactos.org/svn/reactos?rev=40966&view=rev Log: - add ReactOS_LogOn.wav to bootcd - Created by Davy Bartoloni Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon May 18 19:00:41 2009 @@ -20,6 +20,7 @@ 5 = system32\drivers\etc 6 = inf 7 = bin +8 = media .InfEnd @@ -633,6 +634,10 @@ media\inf\usbstor.inf 6 media\inf\xboxdisp.inf 6 + +; Media Files +media\sounds\ReactOS_LogOn.wav 8 + ; Ini Files boot\bootdata\system.ini 4

1 0

[dgoette] 418: reapply unload message
by dgoette＠svn.reactos.org 18 May '09

18 May '09

Author: dgoette Date: Mon May 18 18:23:26 2009 New Revision: 418 URL: http://svn.reactos.org/svn/reactos?rev=418&view=rev Log: reapply unload message Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms.js branches/danny-web/www/www.reactos.org/roscms/js/cms_website-init.js branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms.js [iso-8859-1] Mon May 18 18:23:26 2009 @@ -39,7 +39,7 @@ */ function loadBranch( ) { - exitmsg = ''; + window.onbeforeunload = null; } // end of function loadBranch Modified: branches/danny-web/www/www.reactos.org/roscms/js/cms_website-init.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/js/cms_website-init.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/js/cms_website-init.js [iso-8859-1] Mon May 18 18:23:26 2009 @@ -49,12 +49,7 @@ roscms_page_load_finished = true; // window unload blocker -if (exitmsg !== '') { - window.onbeforeunload = exitmsg; -} -else { - window.onbeforeunload = false; -} +window.onbeforeunload = function() { return "Click Cancel to continue with RosCMS, click OK to leave RosCMS.\n\nThanks for using RosCMS!" }; // initialise tinyMCE tinyMCE.init({ Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_CMS_Website.cla… [iso-8859-1] Mon May 18 18:23:26 2009 @@ -109,8 +109,6 @@ // favorite user language var userlang = ".$thisuser->language()."; - - var exitmsg = ".'"Click Cancel to continue with RosCMS, click OK to leave RosCMS.\n\nThanks for using RosCMS!"'." --> </script>";echo_strip(' <div id="alertbox">

1 0

[dgoette] 417: fix more problems with case sensitive names
by dgoette＠svn.reactos.org 18 May '09

18 May '09

Author: dgoette Date: Mon May 18 17:12:53 2009 New Revision: 417 URL: http://svn.reactos.org/svn/reactos?rev=417&view=rev Log: fix more problems with case sensitive names Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEntry… branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewUserT… Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEntry… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEntry… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewEntry… [iso-8859-1] Mon May 18 17:12:53 2009 @@ -568,7 +568,7 @@ // user case 'u': // get user_id - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_USERS." WHERE name = :user_name LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_USERS." WHERE LOWER(name) = LOWER(:user_name) LIMIT 1"); $stmt->bindParam('user_name',$type_c,PDO::PARAM_STR); $stmt->execute(); $user_id = $stmt->fetchColumn(); Modified: branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewUserT… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewUserT… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/backend/Backend_ViewUserT… [iso-8859-1] Mon May 18 17:12:53 2009 @@ -287,7 +287,7 @@ // set order field switch ($type_c) { case 'name': // accóunt name - $this->sql_order .= " u.name "; + $this->sql_order .= " LOWER(u.name) "; break; case 'real-name': // real name $this->sql_order .= " u.fullname "; @@ -406,7 +406,8 @@ break; case 'name': // account name default: - $this->sql_where .= " u.name"; + $this->sql_where .= " LOWER(u.name)"; + $searchtext = strtolower($searchtext); break; } // end switch $this->sql_where .= " LIKE ".DBConnection::getInstance()->quote('%'.$searchtext.'%',PDO::PARAM_STR)." ";

1 0

[dgoette] 416: * fix problem with unicode nicknames * fix login with case sensitive names * fix registration(new database structure wasn't applied)
by dgoette＠svn.reactos.org 18 May '09

18 May '09

Author: dgoette Date: Mon May 18 16:44:52 2009 New Revision: 416 URL: http://svn.reactos.org/svn/reactos?rev=416&view=rev Log: * fix problem with unicode nicknames * fix login with case sensitive names * fix registration(new database structure wasn't applied) Modified: branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Register.c… Modified: branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/convert3to4.sql [iso-8859-1] Mon May 18 16:44:52 2009 @@ -571,7 +571,7 @@ -- -------------------------------------------------------- CREATE TABLE roscms_accounts ( id bigint(20) unsigned NOT NULL auto_increment, - name varchar(20) collate utf8_unicode_ci NOT NULL, + name varchar(20) collate utf8_bin NOT NULL, password varchar(32) collate utf8_unicode_ci NOT NULL COMMENT 'md5 encoded', email varchar(150) collate utf8_unicode_ci NOT NULL, lang_id bigint(20) unsigned COMMENT '->languages(id)', Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Login.clas… [iso-8859-1] Mon May 18 16:44:52 2009 @@ -112,7 +112,7 @@ } // get user data - $stmt=&DBConnection::getInstance()->prepare("SELECT id, password, logins, disabled, match_session FROM ".ROSCMST_USERS." WHERE name = :user_name LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id, password, logins, disabled, match_session FROM ".ROSCMST_USERS." WHERE LOWER(name) = LOWER(:user_name) LIMIT 1"); $stmt->bindParam('user_name',$user_name,PDO::PARAM_STR); $stmt->execute() or die('DB error (user login #1)!'); $user = $stmt->fetchOnce(); Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… [iso-8859-1] Mon May 18 16:44:52 2009 @@ -56,14 +56,14 @@ if ($this->search && empty($_GET['user_id'])) { if (isset($_GET['search'])) { - $stmt=&DBConnection::getInstance()->prepare("SELECT COUNT(*) FROM ".ROSCMST_USERS." WHERE name LIKE :nickname OR fullname LIKE :fullname"); + $stmt=&DBConnection::getInstance()->prepare("SELECT COUNT(*) FROM ".ROSCMST_USERS." WHERE LOWER(name) LIKE LOWER(:nickname) OR fullname LIKE :fullname"); $stmt->bindValue('nickname','%'.$_GET['search'].'%',PDO::PARAM_STR); $stmt->bindValue('fullname','%'.$_GET['search'].'%',PDO::PARAM_STR); $stmt->execute(); $users_found = $stmt->fetchColumn(); if ($users_found == 1) { - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_USERS." WHERE name LIKE :nickname OR fullname LIKE :fullname LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_USERS." WHERE LOWER(name) LIKE LOWER(:nickname) OR fullname LIKE :fullname LIMIT 1"); $stmt->bindValue('nickname','%'.$_GET['search'].'%',PDO::PARAM_STR); $stmt->bindValue('fullname','%'.$_GET['search'].'%',PDO::PARAM_STR); $stmt->execute(); @@ -102,7 +102,7 @@ if (isset($_GET['search']) && $_GET['search'] != '') { echo '<ul>'; - $stmt=&DBConnection::getInstance()->prepare("SELECT name, fullname, id FROM ".ROSCMST_USERS." WHERE name LIKE :nickname OR fullname LIKE :fullname ORDER BY name ASC LIMIT 100"); + $stmt=&DBConnection::getInstance()->prepare("SELECT name, fullname, id FROM ".ROSCMST_USERS." WHERE LOWER(name) LIKE LOWER(:nickname) OR fullname LIKE :fullname ORDER BY name ASC LIMIT 100"); $stmt->bindValue('nickname','%'.$_GET['search'].'%',PDO::PARAM_STR); $stmt->bindValue('fullname','%'.$_GET['search'].'%',PDO::PARAM_STR); $stmt->execute(); @@ -120,7 +120,7 @@ } else { if (empty($user_id) || $user_id === false) { - $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_USERS." WHERE name = :user_name LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_USERS." WHERE LOWER(name) = LOWER(:user_name) LIMIT 1"); $stmt->bindParam('user_name',rawurldecode(@$_GET['user_name'])); $stmt->execute(); $user_id = $stmt->fetchColumn(); Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Register.c… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Register.c… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Register.c… [iso-8859-1] Mon May 18 16:44:52 2009 @@ -69,10 +69,10 @@ <div class="corner_TR"></div> </div>'); - if (isset($_POST['registerpost']) && $_POST['username'] != "" && strlen($_POST['username']) >= $config->limitUserNameMin()) { + if (isset($_POST['registerpost']) && isset($_POST['username']) && preg_match('/^[a-z0-9_\-[:space:]\.]{'.$config->limitUserNameMin().','.$config->limitUsernameMax().'}$/i')) { // check if another account with the same username already exists - $stmt=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_USERS." WHERE REPLACE(name, '_', ' ') = REPLACE(:username, '_', ' ') LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT name FROM ".ROSCMST_USERS." WHERE LOWER(REPLACE(name, '_', ' ')) = LOWER(REPLACE(:username, '_', ' ')) LIMIT 1"); $stmt->bindParam('username',$_POST['username'],PDO::PARAM_STR); $stmt->execute(); $name_exists = ($stmt->fetchColumn() !== false); @@ -84,17 +84,11 @@ // name is not forbidden -> go on if ($stmt->fetchColumn() === false) { - if (isset($_POST['registerpost']) && isset($_POST['userpwd1']) && $_POST['userpwd1'] != '' && isset($_POST['userpwd2']) && $_POST['userpwd2'] != '' && $_POST['userpwd1'] == $_POST['userpwd2']) { - $stmt=&DBConnection::getInstance()->prepare("SELECT pwd_name FROM user_unsafepwds WHERE pwd_name = :pwd_name LIMIT 1"); - $stmt->bindParam('pwd_name',$_POST['userpwd1'],PDO::PARAM_STR); - $stmt->execute(); - $safepwd = ($stmt->fetchColumn() !== false); - } if (isset($_POST['registerpost']) && isset($_POST['useremail']) && $_POST['useremail'] != '') { // check if another account with the same email address already exists - $stmt=&DBConnection::getInstance()->prepare("SELECT user_email FROM users WHERE user_email = :email LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT email FROM ".ROSCMST_USERS." WHERE email = :email LIMIT 1"); $stmt->bindParam('email',$_POST['useremail'],PDO::PARAM_STR); $stmt->execute(); @@ -116,7 +110,7 @@ $activation_code = substr($activation_code, 0, rand(10, 15)); // add new account - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO users ( user_name, user_roscms_password, user_register, user_register_activation, user_email, user_language ) VALUES ( :user_name, MD5( :password ), NOW(), :activation_code, :email, :lang )"); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_USERS." ( name, password, created, activation, email, language, modified ) VALUES ( :user_name, MD5( :password ), NOW(), :activation_code, :email, :lang, NOW() )"); $stmt->bindParam('user_name',$_POST['username'],PDO::PARAM_STR); $stmt->bindParam('password',$_POST['userpwd1'],PDO::PARAM_STR); $stmt->bindParam('activation_code',$activation_code,PDO::PARAM_STR); @@ -124,13 +118,13 @@ $stmt->bindParam('lang',$userlang,PDO::PARAM_STR); $stmt->execute(); - $stmt=&DBConnection::getInstance()->prepare("SELECT user_id FROM users WHERE user_name = :user_name ORDER BY user_id DESC LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_USERS." WHERE LOWER(name) = LOWER(:user_name)"); $stmt->bindParam('user_name',$_POST['username'],PDO::PARAM_INT); $stmt->execute(); $user_id = $stmt->fetchColumn(); // give a 'user' group membership - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO usergroup_members (usergroupmember_userid, usergroupmember_usergroupid) VALUES (:user_id, 'user')"); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_MEMBERSHIPS." (user_id, group_id) SELECT :user_id, id FROM ".ROSCMST_GROUPS." WHERE name_short = 'user' LIMIT 1"); $stmt->bindParam('user_id',$user_id,PDO::PARAM_INT); $stmt->execute();

1 0

[hpoussin] 40965: Try to load the correct font when booting with /CONSOLE switch
by hpoussin＠svn.reactos.org 18 May '09

18 May '09

Author: hpoussin Date: Mon May 18 16:43:12 2009 New Revision: 40965 URL: http://svn.reactos.org/svn/reactos?rev=40965&view=rev Log: Try to load the correct font when booting with /CONSOLE switch Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] Mon May 18 16:43:12 2009 @@ -32,7 +32,7 @@ } static BOOL FASTCALL -TuiInit(VOID) +TuiInit(DWORD OemCP) { CONSOLE_SCREEN_BUFFER_INFO ScrInfo; DWORD BytesReturned; @@ -44,6 +44,14 @@ { DPRINT1("Failed to open BlueScreen.\n"); return FALSE; + } + + if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_LOADFONT, + &OemCP, sizeof(OemCP), NULL, 0, + &BytesReturned, NULL)) + { + DPRINT("Failed to load the font for codepage %d\n", OemCP); + /* Let's suppose the font is good enough to continue */ } ActiveConsole = NULL; @@ -304,7 +312,7 @@ if (! ConsInitialized) { ConsInitialized = TRUE; - if (! TuiInit()) + if (! TuiInit(Console->CodePage)) { ConsInitialized = FALSE; return STATUS_UNSUCCESSFUL;

1 0

[tkreuzer] 40963: MmGrowKernelStack: Don't assert, but fail, when the kernel stack can't grow any more. Fixes a crash with recursive user calls. See issue #4060 for more details.
by tkreuzer＠svn.reactos.org 18 May '09

18 May '09

Author: tkreuzer Date: Mon May 18 01:51:31 2009 New Revision: 40963 URL: http://svn.reactos.org/svn/reactos?rev=40963&view=rev Log: MmGrowKernelStack: Don't assert, but fail, when the kernel stack can't grow any more. Fixes a crash with recursive user calls. See issue #4060 for more details. Modified: trunk/reactos/ntoskrnl/mm/procsup.c Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Mon May 18 01:51:31 2009 @@ -259,8 +259,11 @@ PETHREAD Thread = PsGetCurrentThread(); /* Make sure we have reserved space for our grow */ - ASSERT(((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) <= - (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)); + if (((PCHAR)Thread->Tcb.StackBase - (PCHAR)Thread->Tcb.StackLimit) > + (KERNEL_LARGE_STACK_SIZE + PAGE_SIZE)) + { + return STATUS_NO_MEMORY; + } /* * We'll give you three more pages.

2 1

← Newer
1
...
25
26
27
28
29
30
31
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009