Author: dchapyshev Date: Mon Jan 7 17:51:42 2008 New Revision: 31642
URL: http://svn.reactos.org/svn/reactos?rev=31642&view=rev Log: - Added ACP, OEMCP and MACCP keys to registry - Added ERROR_ADDING_CODEPAGE to all languages - Update Russian translation
Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/settings.c
Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcode... ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h (original) +++ trunk/reactos/base/setup/usetup/errorcode.h Mon Jan 7 17:51:42 2008 @@ -62,6 +62,7 @@ ERROR_CREATE_INSTALL_DIR, ERROR_FIND_SETUPDATA, ERROR_WRITE_PTABLE, + ERROR_ADDING_CODEPAGE,
ERROR_LAST_ERROR_CODE }ERROR_NUMBER;
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface... ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Mon Jan 7 17:51:42 2008 @@ -3093,6 +3093,14 @@ return QUIT_PAGE; }
+ /* Add codepage information to registry */ + CONSOLE_SetStatusText(" Adding codepage information to registry..."); + if (!AddCodePage()) + { + MUIDisplayError(ERROR_ADDING_CODEPAGE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + /* Update the mounted devices list */ SetMountedDeviceValues(PartitionList);
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-D... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h Mon Jan 7 17:51:42 2008 @@ -1458,6 +1458,11 @@ "ENTER = Computer neustarten" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL }
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-G... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Åðáíåêêßíçóç õðïëïãéóôÞ" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL }
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-U... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h Mon Jan 7 17:51:42 2008 @@ -1275,7 +1275,7 @@ "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "F3 = Quit ENTER = Continue" }, { //ERROR_NO_HDD @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL }
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-E... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL }
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-F... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Mon Jan 7 17:51:42 2008 @@ -1464,6 +1464,11 @@ "ENTER = Redemarrer l'ordinateur" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL }
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-I... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h Mon Jan 7 17:51:42 2008 @@ -1458,6 +1458,11 @@ "INVIO = Riavviare il computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL }
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-P... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h Mon Jan 7 17:51:42 2008 @@ -1460,6 +1460,11 @@ "ENTER = Restart komputera" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL }
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-R... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h Mon Jan 7 17:51:42 2008 @@ -6,37 +6,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Language Selection.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Please choose the language used for the installation process.", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âûáîð ÿçûêà", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Ïîæàëóéñòà âûáåðèòå ÿçûê èñïîëüçóåìûé ïðè óñòàíîâêå.", TEXT_NORMAL }, { 8, 11, - " Then press ENTER.", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 This Language will be the default language for the final system.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "\x07 Ýòîò ÿçûê áóäåò óñòàíîâëåí ïî óìîë÷àíèþ â óñòàíîâëåííîé ñèñòåìå.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü F3 = Âûõîä", TEXT_STATUS }, { @@ -52,55 +52,55 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "®¡à® ¯®¦ «®¢ âì ¢ ãáâ ®¢ªã ReactOS", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Äîáðî ïîæàëîâàòü â óñòàíîâêó ReactOS", TEXT_HIGHLIGHT }, { 6, 11, - " í⮩ áâ ¤¨¨ ãáâ ®¢ª¨ ¡ã¤ãâ ᪮¯¨à®¢ ë ä ©«ë ®¯¥à 樮®© á¨á⥬ë ReactOS", + "Íà ýòîé ñòàäèè óñòàíîâêè áóäóò ñêîïèðîâàíû ôàéëû îïåðàöèîííîé ñèñòåìû ReactOS", TEXT_NORMAL }, { 6, 12, - " ¢ è ª®¬¯ìîâ¥à ¨ ¯®¤£®â®¢«¥ ¢â®à ï áâ ¤¨ï ãáâ ®¢ª¨.", + "íà âàø êîìïüþòåð è ïîäãîòîâëåíà âòîðàÿ ñòàäèÿ óñòàíîâêè.", TEXT_NORMAL }, { 8, 15, - "\x07 ¦¬¨â¥ ¤«ï ãáâ ®¢ª¨ ReactOS.", + "\x07 Íàæìèòå ENTER äëÿ óñòàíîâêè ReactOS.", TEXT_NORMAL }, { 8, 17, - "\x07 ¦¬¨â¥ R ¤«ï ¢®áâ ®¢«¥¨ï ReactOS.", + "\x07 Íàæìèòå R äëÿ âîñòàíîâëåíèÿ ReactOS.", TEXT_NORMAL }, { 8, 19, - "\x07 ¦¬¨â¥ L ¤«ï ¯à®á¬®âà «¨æ¥§¨®®£® ᮣ« 襨ï ReactOS", + "\x07 Íàæìèòå L äëÿ ïðîñìîòðà ëèöåíçèîííîãî ñîãëàøåíèÿ ReactOS", TEXT_NORMAL }, { 8, 21, - "\x07 ¦¬¨â¥ F3 ¤«ï ¢ë室 ¨§ ãáâ ®¢ª¨ ReactOS.", + "\x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè ReactOS.", TEXT_NORMAL }, { 6, 23, - "«ï ¤®¯®«¨â¥«ì®© ¨ä®à¬ 樨 ® ReactOS ¯®á¥â¨â¥:", + "Äëÿ äîïîëíèòåëüíîé èíôîðìàöèè î ReactOS ïîñåòèòå:", TEXT_NORMAL }, { @@ -112,7 +112,7 @@ { 0, 0, - " = த®«¦¥¨¥ R = ®áâ ®¢«¥¨¥ F3 = ë室", + " ENTER = Ïðîäîëæåíèå R = Âîñòàíîâëåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -128,85 +128,85 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ReactOS 室¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS íàõîäèòñÿ â ðàííåé ñòàäèè ðàçðàáîòêè è íå ïîääåðæèâàåò âñå", TEXT_NORMAL }, { 6, 9, - "äãªæ¨¨ ¤«ï ¯®«®© ᮢ¬¥á⨬®á⨠á ãâ ¢«¨¢ ¥¬ë¬¨ ¯à¨«®¦¥¨ï¬¨.", + "ôóíêöèè äëÿ ïîëíîé ñîâìåñòèìîñòè ñ óòàíàâëèâàåìûìè ïðèëîæåíèÿìè.", TEXT_NORMAL }, { 6, 12, - "¬¥îâáï á«¥¤ãî騥 ®£à ¨ç¥¨ï:", + "Èìåþòñÿ ñëåäóþùèå îãðàíè÷åíèÿ:", TEXT_NORMAL }, { 8, 13, - "- áâ ®¢ª ¢®§¬®¦ ⮫쪮 ¯¥à¢¨çë© à §¤¥« ¤¨áª ", + "- Óñòàíîâêà âîçìîæíà òîëüêî íà ïåðâè÷íûé ðàçäåë äèñêà", TEXT_NORMAL }, { 8, 14, - "- ਠãáâ ®¢ª¥ ¥«ì§ï 㤠«¨âì ¯¥à¢¨çë© à §¤¥« ¤¨áª ", + "- Ïðè óñòàíîâêå íåëüçÿ óäàëèòü ïåðâè÷íûé ðàçäåë äèñêà", TEXT_NORMAL }, { 8, 15, - " ¯®ª ¨¬¥¥âáï à áè¨à¥ë© à §¤¥«.", + " ïîêà èìååòñÿ ðàñøèðåííûé ðàçäåë.", TEXT_NORMAL }, { 8, 16, - "- ਠãáâ ®¢ª¥ ¥«ì§ï 㤠«¨âì ¯¥à¢ë© à áè¨à¥ë© à §¤¥« á ¤¨áª ", + "- Ïðè óñòàíîâêå íåëüçÿ óäàëèòü ïåðâûé ðàñøèðåííûé ðàçäåë ñ äèñêà", TEXT_NORMAL }, { 8, 17, - " ¯®ª áãé¥áâ¢ãîâ ¤à㣨¥ à áè¨à¥ë¥ à §¤¥«ë.", + " ïîêà ñóùåñòâóþò äðóãèå ðàñøèðåííûå ðàçäåëû.", TEXT_NORMAL }, { 8, 18, - "- ਠãáâ ®¢ª¥ ¯®¤¤¥à¦¨¢ ¥âáï ⮫쪮 ä ©«®¢ ï á¨á⥬ FAT.", + "- Ïðè óñòàíîâêå ïîääåðæèâàåòñÿ òîëüêî ôàéëîâàÿ ñèñòåìà FAT.", TEXT_NORMAL }, { 8, 19, - "- ஢¥àª ä ©«®¢®© á¨áâ¥¬ë ¥ ®áãé¥á⢫ï¥âáï.", + "- Ïðîâåðêà ôàéëîâîé ñèñòåìû íå îñóùåñòâëÿåòñÿ.", TEXT_NORMAL }, { 8, 23, - "\x07 ¦¬¨â¥ ¢¢®¤ ¤«ï ãáâ ®¢ª¨ ReactOS.", + "\x07 Íàæìèòå ENTER äëÿ óñòàíîâêè ReactOS.", TEXT_NORMAL }, { 8, 25, - "\x07 ¦¬¨â¥ F3 ¤«ï ¢ë室 ¨§ ãáâ ®¢ª¨ ReactOS.", - TEXT_NORMAL - }, - { - 0, - 0, - " = த®«¦¥¨¥ F3 = ë室", + "\x07 Íàæìèòå F3 äëÿ âûõîäà èç óñòàíîâêè ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -222,79 +222,79 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 6, - "¨æ¥§¨ï:", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 6, + "Ëèöåíçèÿ:", TEXT_HIGHLIGHT }, { 8, 8, - "ReactOS «¨æ¥§¨à®¢ ¢ ᮮ⢥âá⢨¨ á âªàëâë¬ «¨æ¥§¨®ë¬", + "ReactOS ëèöåíçèðîâàíà â ñîîòâåòñòâèè ñ Îòêðûòûì ëèöåíçèîííûì", TEXT_NORMAL }, { 8, 9, - "ᮣ« 襨¥¬ GNU GPL ¨ ᮤ¥à¦¨â ª®¬¯®¥âë à á¯à®áâà 塞ë¥", - TEXT_NORMAL - }, - { - 8, - 10, - "á ᮢ¬¥á⨬묨 «¨æ¥§¨ï¬¨: X11, BSD ¨ GNU LGPL.", + "ñîãëàøåíèåì GNU GPL è ñîäåðæèò êîìïîíåíòû ðàñïðîñòðàíÿåìûå", + TEXT_NORMAL + }, + { + 8, + 10, + "ñ ñîâìåñòèìûìè ëèöåíçèÿìè: X11, BSD è GNU LGPL.", TEXT_NORMAL }, { 8, 11, - "ᥠ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥ ¢å®¤ï饥 ¢ á¨á⥬ã ReactOS ¢ë¯ã饮", + "Âñå ïðîãðàììíîå îáåñïå÷åíèå âõîäÿùåå â ñèñòåìó ReactOS âûïóùåíî", TEXT_NORMAL }, { 8, 12, - "¯®¤ âªàëâë¬ «¨æ¥§¨®ë¬ ᮣ« 襨¥¬ GNU GPL á á®åà ¥¨¥¬", + "ïîä Îòêðûòûì ëèöåíçèîííûì ñîãëàøåíèåì GNU GPL ñ ñîõðàíåíèåì", TEXT_NORMAL }, { 8, 13, - "¯¥à¢® ç «ì®© «¨æ¥§¨¨.", + "ïåðâîíà÷àëüíîé ëèöåíçèè.", TEXT_NORMAL }, { 8, 15, - " ®¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥ ¯®áâ ¢«ï¥âáï ¨ ¡¥§ ®£à ¨ç¥¨©", + "Äàííîå ïðîãðàììíîå îáåñïå÷åíèå ïîñòàâëÿåòñÿ ÁÅÇ ÃÀÐÀÍÒÈÈ è áåç îãðàíè÷åíèé", TEXT_NORMAL }, { 8, 16, - "¢ ¨á¯®«ì§®¢ ¨¨, ª ª ¢ ¬¥á⮬, â ª ¨ ¬¥¦¤ã த®¬ ¯à ¢¥.", + "â èñïîëüçîâàíèè, êàê â ìåñòíîì, òàê è ìåæäóíàðîäíîì ïðàâå.", TEXT_NORMAL }, { 8, 17, - "¨æ¥§¨ï ReactOS à §à¥è ¥â ¯¥à¥¤ ç㠯தãªâ âà¥â쨬 «¨æ ¬.", + "Ëèöåíçèÿ ReactOS ðàçðåøàåò ïåðåäà÷ó ïðîäóêòà òðåòüèì ëèöàì.", TEXT_NORMAL }, { 8, 18, - " ᫨ ¯® ª ª®¬-«¨¡® ¯à¨ç¨ ¬ ¢ë ¥ ¯®«ã稫¨ ª®¯¨î âªàë⮣®", + "Åñëè ïî êàêîì-ëèáî ïðè÷èíàì âû íå ïîëó÷èëè êîïèþ Îòêðûòîãî", TEXT_NORMAL }, { 8, 19, - "«¨æ¥§¨®®£® ᮣ« 襨ï GNU ¢¬¥á⥠á ReactOS, ¯®á¥â¨â¥", + "ëèöåíçèîííîãî ñîãëàøåíèÿ GNU âìåñòå ñ ReactOS, ïîñåòèòå", TEXT_NORMAL }, { @@ -306,31 +306,31 @@ { 8, 22, - " à ⨨:", + "Ãàðàíòèè:", TEXT_HIGHLIGHT }, { 8, 24, - "⮠᢮¡®¤®¥ ¯à®£à ¬¬®¥ ®¡¥á¯¥ç¥¨¥; á¬. ¨áâ®ç¨ª ¤«ï ¯à®á¬®âà ¯à ¢.", + "Ýòî ñâîáîäíîå ïðîãðàììíîå îáåñïå÷åíèå; ñì. èñòî÷íèê äëÿ ïðîñìîòðà ïðàâ.", TEXT_NORMAL }, { 8, 25, - " ; ¥â £ à ⨨ ¨«¨", + "ÍÅÒ ÍÈÊÀÊÈÕ ÃÀÐÀÍÒÈÉ; íåò ãàðàíòèè ÒÎÂÀÐÍÎÃÎ ÑÎÑÒÎßÍÈß èëè", TEXT_NORMAL }, { 8, 26, - " ", - TEXT_NORMAL - }, - { - 0, - 0, - " = ®§¢à â", + "ÏÐÈÃÎÄÍÎÑÒÈ ÄËß ÊÎÍÊÐÅÒÍÛÕ ÖÅËÅÉ", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Âîçâðàò", TEXT_STATUS }, { @@ -346,84 +346,84 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - " ᯨ᪥ ¨¦¥ ¯à¨¢¥¤¥ë ãáâனá⢠¨ ¨å ¯ à ¬¥âàë.", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + " ñïèñêå íèæå ïðèâåäåíû óñòðîéñòâà è èõ ïàðàìåòðû.", TEXT_NORMAL }, { 8, 11, - " ®¬¯ìîâ¥à:", + " Êîìïüþòåð:", TEXT_NORMAL }, { 8, 12, - " ªà :", + " Ýêðàí:", TEXT_NORMAL, }, { 8, 13, - " « ¢¨ âãà :", + " Êëàâèàòóðà:", TEXT_NORMAL }, { 8, 14, - " ᪫ ¤ª ª« ¢¨ âãàë:", + "Ðàñêëàäêà êëàâèàòóðû:", TEXT_NORMAL }, { 8, 16, - " ਬ¥¨âì:", + " Ïðèìåíèòü:", TEXT_NORMAL }, { 25, - 16, "ਬ¥¨âì ¤ ë¥ ¯ à ¬¥âàë ãáâனáâ¢", + 16, "Ïðèìåíèòü äàííûå ïàðàìåòðû óñòðîéñòâ", TEXT_NORMAL }, { 6, 19, - "ë ¬®¦¥â¥ ¨§¬¥¨âì ¯ à ¬¥âàë ãáâனá⢠¦¨¬ ï ª« ¢¨è¨ ¨ ", + "Âû ìîæåòå èçìåíèòü ïàðàìåòðû óñòðîéñòâ íàæèìàÿ êëàâèøè ÂÂÅÐÕ è ÂÍÈÇ", TEXT_NORMAL }, { 6, 20, - "¤«ï ¢ë¤¥«¥¨ï í«¥¬¥â ¨ ª« ¢¨èã ¤«ï ¢ë¡®à ¤àã£¨å ¢ ਠ⮢", + "äëÿ âûäåëåíèÿ ýëåìåíòà è êëàâèøó ENTER äëÿ âûáîðà äðóãèõ âàðèàíòîâ", TEXT_NORMAL }, { 6, 21, - "¯ à ¬¥â஢.", + "ïàðàìåòðîâ.", TEXT_NORMAL }, { 6, 23, - "®£¤ ¢á¥ ¯ à ¬¥âàë ®¯à¥¤¥«¥ë, ¢ë¡¥à¨â¥ "ਬ¥¨âì ¤ ë¥ ¯ à ¬¥âàë ãáâனáâ¢"", + "Êîãäà âñå ïàðàìåòðû îïðåäåëåíû, âûáåðèòå "Ïðèìåíèòü äàííûå ïàðàìåòðû óñòðîéñòâ"", TEXT_NORMAL }, { 6, 24, - "¨ ¦¬¨â¥ .", - TEXT_NORMAL - }, - { - 0, - 0, - " = த®«¦¥¨¥ F3 = ë室", + "è íàæìèòå ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -439,55 +439,55 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ReactOS 室¨âáï ¢ à ¥© áâ ¤¨¨ à §à ¡®âª¨ ¨ ¥ ¯®¤¤¥à¦¨¢ ¥â ¢á¥", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS íàõîäèòñÿ â ðàííåé ñòàäèè ðàçðàáîòêè è íå ïîääåðæèâàåò âñå", TEXT_NORMAL }, { 6, 9, - "äãªæ¨¨ ¤«ï ¯®«®© ᮢ¬¥á⨬®á⨠á ãâ ¢«¨¢ ¥¬ë¬¨ ¯à¨«®¦¥¨ï¬¨.", + "ôóíêöèè äëÿ ïîëíîé ñîâìåñòèìîñòè ñ óòàíàâëèâàåìûìè ïðèëîæåíèÿìè.", TEXT_NORMAL }, { 6, 12, - "ãªæ¨ï ¢®áâ ®¢«¥¨ï ¢ ¤ ë¬ ¬®¬¥â ®âáãâáâ¢ã¥â.", + "Ôóíêöèÿ âîñòàíîâëåíèÿ â äàííûì ìîìåíò îòñóòñòâóåò.", TEXT_NORMAL }, { 8, 15, - "\x07 ¦¬¨â¥ U ¤«ï ®¡®¢«¥¨ï .", + "\x07 Íàæìèòå U äëÿ îáíîâëåíèÿ ÎÑ.", TEXT_NORMAL }, { 8, 17, - "\x07 ¦¬¨â¥ R ¤«ï § ¯ã᪠ª®á®«¨ ¢®áâ ®¢«¥¨ï.", + "\x07 Íàæìèòå R äëÿ çàïóñêà êîíñîëè âîñòàíîâëåíèÿ.", TEXT_NORMAL }, { 8, 19, - "\x07 ¦¬¨â¥ ESC ¤«ï ¢®§¢à â £« ¢ãî áâà ¨æã.", + "\x07 Íàæìèòå ESC äëÿ âîçâðàòà íà ãëàâíóþ ñòðàíèöó.", TEXT_NORMAL }, { 8, 21, - "\x07 ¦¬¨â¥ ¤«ï ¯¥à¥§ £à㧪¨ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " ESC = « ¢ ï áâà ¨æ = ¥à¥§ £à㧪 ", + "\x07 Íàæìèòå ENTER äëÿ ïåðåçàãðóçêè êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Ãëàâíàÿ ñòðàíèöà ENTER = Ïåðåçàãðóçêà", TEXT_STATUS }, { @@ -502,43 +502,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ë å®â¨â¥ ¨§¬¥¨âì ãáâ ¢«¨¢ ¥¬ë© ⨯ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 ¦¬¨â¥ ª« ¢¨èã ¨«¨ ¤«ï ¢ë¡®à ¯à¥¤¯®çâ¨â¥«ì®£® ⨯ ª®¬¯ìîâ¥à .", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âû õîòèòå èçìåíèòü óñòàíàâëèâàåìûé òèï êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Íàæìèòå êëàâèøó ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà ïðåäïî÷òèòåëüíîãî òèïà êîìïüþòåðà.", TEXT_NORMAL }, { 8, 11, - " ⥬ ¦¬¨â¥ .", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 ¦¬¨â¥ ª« ¢¨èã ESC ¤«ï ¢®§¢à â ª ¯à¥¤ë¤ã饩 áâà ¨æ¥ ¡¥§ ¨§¬¥¥¨ï", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç èçìåíåíèÿ", TEXT_NORMAL }, { 8, 14, - " ⨯ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " = த®«¦¥¨¥ ESC = ⬥ F3 = ë室", + " òèïà êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -554,31 +554,31 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 10, - 6, - "¨á⥬ ¯à®¢¥àï¥â ¢á¥ «¨ ¤ ë¥ § ¯¨á ë ¤¨áª", - TEXT_NORMAL - }, - { - 10, - 8, - "â® ¬®¦¥â § ïâì ¬¨ãâã", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "Ñèñòåìà ïðîâåðÿåò âñå ëè äàííûå çàïèñàíû íà äèñê", + TEXT_NORMAL + }, + { + 10, + 8, + "Ýòî ìîæåò çàíÿòü ìèíóòó", TEXT_NORMAL }, { 10, 9, - "®á«¥ § ¢¥àè¥¨ï ª®¬¯ìîâ¥à ¡ã¤¥â ¢â®¬ â¨ç¥áª¨ ¯¥à¥§ £à㦥", - TEXT_NORMAL - }, - { - 0, - 0, - " ç¨á⪠ª¥è ", + "Ïîñëå çàâåðøåíèÿ êîìïüþòåð áóäåò àâòîìàòè÷åñêè ïåðåçàãðóæåí", + TEXT_NORMAL + }, + { + 0, + 0, + " Î÷èñòêà êåøà", TEXT_STATUS }, { @@ -594,37 +594,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 10, - 6, - "ReactOS ãáâ ®¢«¥ ¥ ¯®«®áâìî", - TEXT_NORMAL - }, - { - 10, - 8, - "§¢«¥ª¨â¥ £¨¡ª¨© ¤¨áª ¨§ ¤¨áª®¢®¤ A: ¨", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "ReactOS óñòàíîâëåí íå ïîëíîñòüþ", + TEXT_NORMAL + }, + { + 10, + 8, + "Èçâëåêèòå ãèáêèé äèñê èç äèñêîâîäà A: è", TEXT_NORMAL }, { 10, 9, - "¢á¥ CD-ROM ¨§ CD-¤¨áª®¢®¤®¢.", + "âñå CD-ROM èç CD-äèñêîâîäîâ.", TEXT_NORMAL }, { 10, 11, - " ¦¬¨â¥ ¤«ï ¯¥à¥§ £à㧪¨ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " ®¦ «ã©áâ ¯®¤®¦¤¨â¥ ...", + "Íàæìèòå ENTER äëÿ ïåðåçàãðóçêè êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " Ïîæàëóéñòà ïîäîæäèòå ...", TEXT_STATUS, }, { @@ -640,42 +640,42 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "ë å®â¨â¥ ¨§¬¥¨âì ãáâ ¢«¨¢ ¥¬ë© ⨯ íªà .", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âû õîòèòå èçìåíèòü óñòàíàâëèâàåìûé òèï ýêðàíà.", TEXT_NORMAL }, { 8, 10, - "\x07 ¦¬¨â¥ ª« ¢¨è¨ ¨«¨ ¤«ï ¢ë¡®à ⨯ íªà .", + "\x07 Íàæìèòå êëàâèøè ÂÂÎÐÕ èëè ÂÍÈÇ äëÿ âûáîðà òèïà ýêðàíà.", TEXT_NORMAL }, { 8, 11, - " ⥬ ¦¬¨â¥ .", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 ¦¬¨â¥ ª« ¢¨èã ESC ¤«ï ¢®§¢à â ª ¯à¥¤ë¤ã饩 áâà ¨æ¥ ¡¥§ ¨§¬¥¥¨ï", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç èçìåíåíèÿ", TEXT_NORMAL }, { 8, 14, - " ⨯ íªà .", - TEXT_NORMAL - }, - { - 0, - 0, - " = த®«¦¥¨¥ ESC = ⬥ F3 = ë室", + " òèïà ýêðàíà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -691,37 +691,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 10, - 6, - "á®¢ë¥ ª®¬¯®¥âë ReactOS ¡ë«¨ ãá¯¥è® ãáâ ®¢«¥ë.", - TEXT_NORMAL - }, - { - 10, - 8, - "§¢«¥ª¨â¥ £¨¡ª¨© ¤¨áª ¨§ ¤¨áª®¢®¤ A: ¨", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "Îñíîâíûå êîìïîíåíòû ReactOS áûëè óñïåøíî óñòàíîâëåíû.", + TEXT_NORMAL + }, + { + 10, + 8, + "Èçâëåêèòå ãèáêèé äèñê èç äèñêîâîäà A: è", TEXT_NORMAL }, { 10, 9, - "¢á¥ CD-ROM ¨§ CD-¤¨áª®¢®¤®¢.", + "âñå CD-ROM èç CD-äèñêîâîäîâ.", TEXT_NORMAL }, { 10, 11, - " ¦¬¨â¥ ¤«ï ¯¥à¥§ £à㧪¨ ª®¬¯ìîâ¥à .", - TEXT_NORMAL - }, - { - 0, - 0, - " = ¥à¥§ £à㧨âì ª®¬¯ìîâ¥à", + "Íàæìèòå ENTER äëÿ ïåðåçàãðóçêè êîìïüþòåðà.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïåðåçàãðóçèòü êîìïüþòåð", TEXT_STATUS }, { @@ -737,37 +737,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "à®£à ¬¬ ãáâ ®¢ª¨ ¥ ᬮ£« ãáâ ®¢¨âì § £àã§ç¨ª ", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ïðîãðàììà óñòàíîâêè íå ñìîãëà óñòàíîâèòü çàãðóç÷èê íà", TEXT_NORMAL }, { 6, 9, - "¦¥á⪨© ¤¨áª ¢ 襣® ª®¬¯ìîâ¥à .", + "æåñòêèé äèñê âàøåãî êîìïüþòåðà.", TEXT_NORMAL }, { 6, 13, - "®¦ «ã©áâ ¢á⠢⥠®âä®à¬ â¨à®¢ ë© £¨¡ª¨© ¤¨áª ¢ ¤¨áª®¢®¤ A: ¨", + "Ïîæàëóéñòà âñòàâòå îòôîðìàòèðîâàííûé ãèáêèé äèñê â äèñêîâîä A: è", TEXT_NORMAL }, { 6, 14, - " ¦¬¨â¥ .", + "íàæìèòå ENTER.", TEXT_NORMAL, }, { 0, 0, - " = த®«¦¥¨¥ F3 = ë室", + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -784,49 +784,49 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "The list below shows existing partitions and unused disk", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + " ñïèñêå íèæå ïîêàçàíû ñóùåñòâóþùèå ðàçäåëû è íåèñïîëüçóåìîå ïðîñòðàíñòâî", TEXT_NORMAL }, { 6, 9, - "space for new partitions.", + "äëÿ íîâîãî ðàçäåëà.", TEXT_NORMAL }, { 8, 11, - "\x07 Press UP or DOWN to select a list entry.", + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà ýëåìåíòà.", TEXT_NORMAL }, { 8, 13, - "\x07 Press ENTER to install ReactOS onto the selected partition.", + "\x07 Íàæìèòå ENTER äëÿ óñòàíîâêè ReactOS íà âûäåëåííûé ðàçäåë.", TEXT_NORMAL }, { 8, 15, - "\x07 Press C to create a new partition.", + "\x07 Íàæìèòå C äëÿ ñîçäàíèÿ íîâîãî ðàçäåëà.", TEXT_NORMAL }, { 8, 17, - "\x07 Press D to delete an existing partition.", - TEXT_NORMAL - }, - { - 0, - 0, - " Please wait...", + "\x07 Íàæìèòå D äëÿ óäàëåíèÿ ñóùåñòâóþùåãî ðàçäåëà.", + TEXT_NORMAL + }, + { + 0, + 0, + " Ïîæàëóéñòà ïîäîæäèòå...", TEXT_STATUS }, { @@ -842,25 +842,25 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Format partition", - TEXT_NORMAL - }, - { - 6, - 10, - "Setup will now format the partition. Press ENTER to continue.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ôîðìàòèðîâàíèå ðàçäåëà", + TEXT_NORMAL + }, + { + 6, + 10, + "Äëÿ óñòàíîâêè ðàçäåë áóäåò îòôîðìàòèðîâàí. Íàæìèòå ENTER äëÿ ïðîäîëæåíèÿ.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæåíèå F3 = Âûõîä", TEXT_STATUS }, { @@ -876,43 +876,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup installs ReactOS files onto the selected partition. Choose a", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Óñòàíîâêà ôàéëîâ ReactOS íà âûáðàííûé ðàçäåë. Âûáåðèòå äèðåêòîðèþ", TEXT_NORMAL }, { 6, 9, - "directory where you want ReactOS to be installed:", + "â êîòîðóþ áóäåò óñòàíîâëåíà ñèñòåìà:", TEXT_NORMAL }, { 6, 14, - "To change the suggested directory, press BACKSPACE to delete", + "×òîáû èçìåíèòü âûáðàííóþ äèðåêòîðèþ íàæìèòå BACKSPACE è óäàëèòå ñèìâîëû,", TEXT_NORMAL }, { 6, 15, - "characters and then type the directory where you want ReactOS to", + "à çà òåì íàáåðèòå íîâîå èìÿ äèðåêòîðèè äëÿ óñòàíîâêè ReactOS", TEXT_NORMAL }, { 6, 16, - "be installed.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + " ", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü F3 = Âûõîä", TEXT_STATUS }, { @@ -928,31 +928,31 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", TEXT_UNDERLINE }, { 11, 12, - "Please wait while ReactOS Setup copies files to your ReactOS", + "Ïîæàëóéñòà ïîäîæäèòå ïîêà ïðîãðàììà óñòàíîâêè ñêîïèðóåò ôàéëû ReactOS", TEXT_NORMAL }, { 30, 13, - "installation folder.", + "â óñòàíîâî÷íóþ äèðåêòîðèþ.", TEXT_NORMAL }, { 20, 14, - "This may take several minutes to complete.", - TEXT_NORMAL - }, - { - 0, - 0, - " \xB3 Please wait... ", + "Ýòî ìîæåò çàíÿòü íåñêîëüêî ìèíóò.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Ïîæàëóéñòà ïîäîæäèòå... ", TEXT_STATUS }, { @@ -968,37 +968,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup is installing the boot loader", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Óñòàíîâêà çàãðóç÷èêà ReactOS", TEXT_NORMAL }, { 8, 12, - "Install bootloader on the harddisk (MBR).", + "Óñòàíîâêà íà æåñòêèé äèñê (MBR).", TEXT_NORMAL }, { 8, 13, - "Install bootloader on a floppy disk.", + "Óñòàíîâêà íà ãèáêèé äèñê.", TEXT_NORMAL }, { 8, 14, - "Skip install bootloader.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "Íå óñòàíàâëèâàòü çàãðóç÷èê.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü F3 = Âûõîä", TEXT_STATUS }, { @@ -1014,43 +1014,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "You want to change the type of keyboard to be installed.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard type.", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Èçìåíåíèå òèïà êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà íóæíîãî òèïà êëàâèàòóðû.", TEXT_NORMAL }, { 8, 11, - " Then press ENTER.", + " Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç èçìåíåíèÿ", TEXT_NORMAL }, { 8, 14, - " the keyboard type.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + " òèïà êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -1066,43 +1066,43 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "You want to change the keyboard layout to be installed.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âûáîð óñòàíàâëèâàåìîé ðàñêëàäêè êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà íóæíîé ðàñêëàäêè", TEXT_NORMAL }, { 8, 11, - " layout. Then press ENTER.", + " êëàâèàòóðû. Çàòåì íàæìèòå ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Press the ESC key to return to the previous page without changing", + "\x07 Íàæìèòå êëàâèøó ESC äëÿ âîçâðàòà ê ïðåäûäóùåé ñòðàíèöå áåç", TEXT_NORMAL }, { 8, 14, - " the keyboard layout.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + " èçìåíåíèÿ ðàñêëàäêè êëàâèàòóðû.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Ïðîäîëæèòü ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -1119,19 +1119,19 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup prepares your computer for copying the ReactOS files. ", - TEXT_NORMAL - }, - { - 0, - 0, - " Building the file copy list...", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ïîäãîòîâêà âàøåãî êîìïüþòåðà ê êîïèðîâàíèþ ôàéëîâ ReactOS. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Ïîäãîòîâêà ñïèñêà êîïèðóåìûõ ôàéëîâ...", TEXT_STATUS }, { @@ -1148,37 +1148,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", TEXT_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 Íàæìèòå ÂÂÅÐÕ èëè ÂÍÈÇ äëÿ âûáîðà ôàéëîâîé ñèñòåìû.", 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_STATUS },
@@ -1195,37 +1195,37 @@ { 4, 3, - " áâ ®¢ª ReactOS " KERNEL_VERSION_STR " ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "You have chosen to delete the partition", + " Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Âû âûáðàëè óäàëåíèå ðàçäåëà.", TEXT_NORMAL }, { 8, 18, - "\x07 Press D to delete the partition.", + "\x07 Íàæìèòå D äëÿ óäàëåíèÿ ðàçäåëà.", TEXT_NORMAL }, { 11, 19, - "WARNING: All data on this partition will be lost!", + "ÂÍÈÌÀÍÈÅ: Âñå äàííûå ñ ýòîãî ðàçäåëà áóäóò ïîòåðÿíû!", TEXT_NORMAL }, { 8, 21, - "\x07 Press ESC to cancel.", - TEXT_NORMAL - }, - { - 0, - 0, - " D = Delete Partition ESC = Cancel F3 = Quit", + "\x07 Íàæìèòå ESC äëÿ îòìåíû.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Óäàëèòü ðàçäåë ESC = Îòìåíà F3 = Âûõîä", TEXT_STATUS }, { @@ -1241,19 +1241,19 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_UNDERLINE - }, - { - 6, - 8, - "Setup is updating the system configuration. ", - TEXT_NORMAL - }, - { - 0, - 0, - " Creating registry hives...", + "Óñòàíîâêà ReactOS " KERNEL_VERSION_STR " ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Ïðîãðàììà óñòàíîâêè îáíîâëÿåò êîíôèãóðàöèþ ñèñòåìû. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Ñîçäàíèå êóñòîâ ñèñòåìíîãî ðååñòðà...", TEXT_STATUS }, { @@ -1269,68 +1269,68 @@ { { //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" - "\n" - " \x07 Press ENTER to continue Setup.\n" - " \x07 Press F3 to quit Setup.", - "F3= Quit ENTER = Continue" + "ReactOS íå áûë ïîëíîñòüþ óñòàíîâëåí íà âàø\n" + "êîìïüþòåð. Åñëè âû âûéäèòå èç óñòàíîâêè ñåé÷àñ,\n" + "òî âàì íóæíî çàïóñòèòü ïðîãðàììó óñòàíîâêè ñíîâà,\n" + "åñëè âû õîòèòå óñòàíîâèòü ReactOS\n" + " \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" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_SIGNATURE_TXTSETUPSIF, "Setup found an invalid signature in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_DRIVE_INFORMATION "Setup could not retrieve system drive information.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_WRITE_BOOT, "Setup failed to install FAT bootcode on the system partition.", - "ENTER = Reboot computer" + "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, @@ -1339,123 +1339,129 @@ "\n" "Creating or deleting partitions can destroy the partiton table.\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" - " * Press any key to continue.", + " * Íàæìèòå ëþáóþ êëàâèøó äëÿ ïðîäîëæåíèÿ.", NULL }, { //ERROR_DELETE_SPACE, "You can not delete unpartitioned disk space!\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" + "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 set the initialize the registry.", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_INVALID_CABINET_INF, "Cabinet has no valid inf file.\n", - "ENTER = Reboot computer" + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CABINET_MISSING, - "Cabinet not found.\n", - "ENTER = Reboot computer" + "Cabinet íå íàéäåí.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_CABINET_SCRIPT, - "Cabinet has no setup script.\n", - "ENTER = Reboot computer" + "Cabinet íå ñìîã íàéòè óñòàíîâî÷íûé ñêðèïò.\n", + "ENTER = Ïåðåçàãðóçêà" }, { //ERROR_COPY_QUEUE, "Setup failed to open the copy file queue.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_CREATE_DIR, + "Íå óäàëîñü ñîçäàòü óñòàíîâî÷íûå äèðåêòîðèè.", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_TXTSETUP_SECTION, + "Íå óäàëîñü íàéòè ñåêöèþ 'Directories'\n" + "â ôàéëå TXTSETUP.SIF.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_CABINET_SECTION, + "Íå óäàëîñü íàéòè ñåêöèþ 'Directories'\n" + "â cabinet.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Íå óäàëîñü ñîçäàòü äèðåêòîðèþ äëÿ óñòàíîâêè.", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_FIND_SETUPDATA, + "Íå óäàëîñü íàéòè ñåêöèþ 'SetupData'\n" + "â ôàéëå TXTSETUP.SIF.\n", + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_WRITE_PTABLE, + "Íå óäàëîñü çàïèñàòü òàáëèöó ðàçäåëîâ.\n" + "ENTER = Ïåðåçàãðóçêà" + }, + { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" "ENTER = Reboot computer" }, { - //ERROR_CREATE_DIR, - "Setup could not create install directories.", - "ENTER = Reboot computer" - }, - { - //ERROR_TXTSETUP_SECTION, - "Setup failed to find the 'Directories' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_CABINET_SECTION, - "Setup failed to find the 'Directories' section\n" - "in the cabinet.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_CREATE_INSTALL_DIR - "Setup could not create the install directory.", - "ENTER = Reboot computer" - }, - { - //ERROR_FIND_SETUPDATA, - "Setup failed to find the 'SetupData' section\n" - "in TXTSETUP.SIF.\n", - "ENTER = Reboot computer" - }, - { - //ERROR_WRITE_PTABLE, - "Setup failed to write partition tables.\n" - "ENTER = Reboot computer" - }, - { NULL, NULL } }; +
MUI_PAGE ruRUPages[] = { @@ -1464,8 +1470,8 @@ ruRULanguagePageEntries }, { - START_PAGE, - ruRUWelcomePageEntries + START_PAGE, + ruRUWelcomePageEntries }, { INSTALL_INTRO_PAGE,
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-S... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL }
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-U... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h Mon Jan 7 17:51:42 2008 @@ -1452,6 +1452,11 @@ "ENTER = Reboot computer" }, { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { NULL, NULL }
Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?rev... ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Mon Jan 7 17:51:42 2008 @@ -28,6 +28,9 @@ #include "errorcode.h" #include "mui.h"
+#define NDEBUG +#include <debug.h> + #include "lang/en-US.h" #include "lang/de-DE.h" #include "lang/el-GR.h" @@ -308,4 +311,99 @@ WaitEvent); }
+static BOOLEAN +AddCodepageToRegistry(PWCHAR ACPage, PWCHAR OEMCPage, PWCHAR MACCPage) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + + // Open the nls codepage key + RtlInitUnicodeString(&KeyName, + L"\Registry\Machine\SYSTEM\CurrentControlSet\Control\NLS\CodePage"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); + return FALSE; + } + + // Set ANSI codepage + RtlInitUnicodeString(&ValueName, L"ACP"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)ACPage, + 4 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + // Set OEM codepage + RtlInitUnicodeString(&ValueName, L"OEMCP"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)OEMCPage, + 3 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + // Set MAC codepage + RtlInitUnicodeString(&ValueName, L"MACCP"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)MACCPage, + 5 * sizeof(PWCHAR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); + NtClose(KeyHandle); + return FALSE; + } + + NtClose(KeyHandle); + + return TRUE; +} + +BOOLEAN +AddCodePage(VOID) +{ + ULONG lngIndex = 0; + do + { + if (_wcsicmp(LanguageList[lngIndex].LanguageID , SelectedLanguageId) == 0) + { + return AddCodepageToRegistry(LanguageList[lngIndex].ACPage, + LanguageList[lngIndex].OEMCPage, + LanguageList[lngIndex].MACCPage); + } + + lngIndex++; + } + while (LanguageList[lngIndex].MuiPages != NULL); + return FALSE; +} + /* EOF */
Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?rev... ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h (original) +++ trunk/reactos/base/setup/usetup/mui.h Mon Jan 7 17:51:42 2008 @@ -53,5 +53,8 @@ VOID MUIDefaultKeyboardLayout(WCHAR * KeyboardLayout);
+BOOLEAN +AddCodePage(VOID); +
#endif
Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings.... ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c (original) +++ trunk/reactos/base/setup/usetup/settings.c Mon Jan 7 17:51:42 2008 @@ -821,7 +821,7 @@ 0, REG_SZ, (PVOID)(LanguageId + 4), - 8); + 8 * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); @@ -837,7 +837,7 @@ 0, REG_SZ, (PVOID)(LanguageId + 4), - 8); + 8 * sizeof(PWCHAR)); if (!NT_SUCCESS(Status)) { DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);