Re: [ros-dev] [ros-diffs] [hbelusca] 70857: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.
No?! This is totally broken and is to be reverted.
If you detect errors, there are only 3 issues: - Offer the user to attempt to repair errors - Offer the user to format - Exit (as it was done previously)
(If repairing fails, you fall into the two next cases). You cannot ignore errors and let the use write on a borked file system.
Le 02/03/2016 01:51, hbelusca@svn.reactos.org a écrit :
Author: hbelusca Date: Wed Mar 2 00:51:48 2016 New Revision: 70857
URL: http://svn.reactos.org/svn/reactos?rev=70857&view=rev Log: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/da-DK.h 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/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/ms-MY.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -3154,13 +3154,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status);
sprintf(Buffer, "Setup failed to verify the selected partition.\n"
// sprintf(Buffer, "Setup failed to verify the selected partition.\n"sprintf(Buffer, "ChkDsk detected some disk errors.\n" "(Status 0x%08lx).\n", Status); PopupError(Buffer,
MUIGetString(STRING_REBOOTCOMPUTER),
// MUIGetString(STRING_REBOOTCOMPUTER),MUIGetString(STRING_CONTINUE), Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
// return QUIT_PAGE; } PartEntry->NeedsCheck = FALSE;Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-B... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1758,6 +1758,8 @@ "« £ ¥ ¥ ªâ ¢êàåã ¤ï«"}, {STRING_CHECKINGPART, "¥ç¥ ¯à®¢¥àª ¨§¡à ¨ï ¤ï«."},
- {STRING_CONTINUE,
- "ENTER = தꫦ ¢ ¥"}, {STRING_QUITCONTINUE, "F3 = §å®¤ ENTER = தꫦ ¢ ¥"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-B... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-C... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1751,6 +1751,8 @@ "Instalace nakop¡ruje ReactOS na odd¡l"}, {STRING_CHECKINGPART, "Instalace nyn¡ kontroluje zvolenì odd¡l."},
- {STRING_CONTINUE,
- "ENTER = Pokraovat"}, {STRING_QUITCONTINUE, "F3 = Ukonit ENTER = Pokraovat"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/da-D... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1763,6 +1763,8 @@ "Installationen installere ReactOS p partitionen"}, {STRING_CHECKINGPART, "Installationen tjekker den valgte partition."},
- {STRING_CONTINUE,
- "ENTER = Fortst"}, {STRING_QUITCONTINUE, "F3 = Afslut ENTER = Fortst"}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "ReactOS wird auf dieser Partition installiert."}, {STRING_CHECKINGPART, "Die ausgewhlte Partition wird berprft."},
- {STRING_CONTINUE,
- "EINGABETASTE = Fortsetzen"}, {STRING_QUITCONTINUE, "F3 = Beenden EINGABETASTE = Fortsetzen"}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1762,6 +1762,8 @@ "Setup install ReactOS onto Partition"}, {STRING_CHECKINGPART, " ¡«á©«© ¢â® «é¨ «¦ § ¢£â¤¦ partition."},
- {STRING_CONTINUE,
- "ENTER = ¬¤â® "}, {STRING_QUITCONTINUE, "F3 = §¦®é¨© ENTER = ¬¤â® "}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "El instalador est instalando ReactOS en la partici¢n"}, {STRING_CHECKINGPART, "El instalador est comprobando la partici¢n seleccionada."},
- {STRING_CONTINUE,
- "INTRO = Continuar"}, {STRING_QUITCONTINUE, "F3 = Salir INTRO = Continuar"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-E... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "ReactOS paigaldatakse partitsioonile"}, {STRING_CHECKINGPART, "Valitud partitsiooni kontrollitakse."},
- {STRING_CONTINUE,
- "ENTER = Jtka"}, {STRING_QUITCONTINUE, "F3 = Vlju ENTER = Jtka"}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1768,6 +1768,8 @@ "Setup installe ReactOS sur la partition"}, {STRING_CHECKINGPART, "Setup vrifie la partition slectionne."},
- {STRING_CONTINUE,
- "ENTRE = Continuer"}, {STRING_QUITCONTINUE, "F3 = Quitter ENTRE = Continuer"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-I... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1745,6 +1745,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = "}, {STRING_QUITCONTINUE, "F3 = ENTER = "}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installer ReactOS sulla partitione"}, {STRING_CHECKINGPART, "Setup sta controllando la partizione selezionata."},
- {STRING_CONTINUE,
- "INVIO = Continua"}, {STRING_QUITCONTINUE, "F3 = Esci INVIO = Continua"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-J... ============================================================================== --- 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] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "¾¯Ä±¯ÌßÊ ReactOS¦ Ê߰è¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"}, {STRING_CHECKINGPART, "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Ê߰輮ݦ ¹Ý» ¼Ã²Ï½¡"},
- {STRING_CONTINUE,
- "ENTER = ¿Þ¯º³"}, {STRING_QUITCONTINUE, "F3 = Á³¼ ENTER = ¿Þ¯º³"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-L... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ms-M... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1632,6 +1632,8 @@ "Persediaan memasang ReactOS ke Partition"}, {STRING_CHECKINGPART, "Persediaan kini sedang menyemak sekatan yang dipilih."},
- {STRING_CONTINUE,
- "ENTER = Teruskan"}, {STRING_QUITCONTINUE, "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-N... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1785,6 +1785,8 @@ "Setup installeert ReactOS op Partitie"}, {STRING_CHECKINGPART, "Setup controleert nu de geselecteerde partitie."},
- {STRING_CONTINUE,
- "ENTER = Doorgaan"}, {STRING_QUITCONTINUE, "F3 = Afsluiten ENTER = Doorgaan"}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1754,6 +1754,8 @@ "Instalator kopiuje pliki systemu na wybran¥ partycj©."}, {STRING_CHECKINGPART, "Instalator sprawdza wybran¥ partycj©."},
- {STRING_CONTINUE,
- "ENTER = Kontynuacja"}, {STRING_QUITCONTINUE, "F3 = Wyjcie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-B... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1783,6 +1783,8 @@ "O instalador instala o ReactOS na partiÆo"}, {STRING_CHECKINGPART, "O instalador est verificando a partiÆo selecionada."},
- {STRING_CONTINUE,
- "ENTER=Continuar"}, {STRING_QUITCONTINUE, "F3=Sair ENTER=Continuar"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-R... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1814,6 +1814,8 @@ "ReactOS va fi instalat pe partiþia"}, {STRING_CHECKINGPART, "Programul de instalare verificã acum partiþia aleasã."},
- {STRING_CONTINUE,
- "ENTER = Continuare"}, {STRING_QUITCONTINUE, "F3 = Ieºire ENTER = Continuare"}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1744,6 +1744,8 @@ "ReactOS ãáâ ¢«¨¢ ¥âáï à §¤¥«:"}, {STRING_CHECKINGPART, "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."},
- {STRING_CONTINUE,
- "ENTER = த®«¦¨âì"}, {STRING_QUITCONTINUE, "F3 = ë室 ENTER = த®«¦¨âì"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-S... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1757,6 +1757,8 @@ "Inçtal tor nainçtaluje systm ReactOS na oblas"}, {STRING_CHECKINGPART, "Inçtal tor teraz skontroluje vybran£ oblas."},
- {STRING_CONTINUE,
- "ENTER = Pokraova"}, {STRING_QUITCONTINUE, "F3 = Skoni ENTER = Pokraova"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-A... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1750,6 +1750,8 @@ "Instalimi i ReactOS ne Particion"}, {STRING_CHECKINGPART, "Instalimi tani sht duke kontrolluar particionin e przgjedhur."},
- {STRING_CONTINUE,
- "ENTER = Vazhdo"}, {STRING_QUITCONTINUE, "F3 = Dil ENTER = Vazhdo"}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installerar ReactOS till Partitionen"}, {STRING_CHECKINGPART, "Setup undersker nu den valda partitionen."},
- {STRING_CONTINUE,
- "ENTER = Fortstt"}, {STRING_QUITCONTINUE, "F3 = Avsluta ENTER = Fortstt"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-T... ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1724,6 +1724,8 @@ "Kur, ReactOS'u blm zerine kurar."}, {STRING_CHECKINGPART, "Kur, imdi seili blm gzden geiriyor."},
- {STRING_CONTINUE,
- "Giri = Srdr"}, {STRING_QUITCONTINUE, "3 = k Giri = Srdr"}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "ReactOS ¢áâ ®¢«îóâìáï ஧¤i«"}, {STRING_CHECKINGPART, "áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© ஧¤i«."},
- {STRING_CONTINUE,
- "ENTER = த®¢¦¨â¨"}, {STRING_QUITCONTINUE, "F3 = ¨©â¨ ENTER = த®¢¦¨â¨"}, {STRING_REBOOTCOMPUTER,
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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -115,11 +115,12 @@ #define STRING_NONFORMATTEDOTHERPART 63 #define STRING_INSTALLONPART 10 #define STRING_CHECKINGPART 11 -#define STRING_QUITCONTINUE 12 -#define STRING_REBOOTCOMPUTER 13 -#define STRING_TXTSETUPFAILED 14 -#define STRING_COPYING 15 -#define STRING_SETUPCOPYINGFILES 16 +#define STRING_CONTINUE 12 +#define STRING_QUITCONTINUE 13 +#define STRING_REBOOTCOMPUTER 14 +#define STRING_TXTSETUPFAILED 15 +#define STRING_COPYING 16 +#define STRING_SETUPCOPYINGFILES 17 #define STRING_REGHIVEUPDATE 20 #define STRING_IMPORTFILE 21 #define STRING_DISPLAYETTINGSUPDATE 22
Thanks Pierre for your ideas. I will modify the message box to try to integrate those options. At the moment we are (in usetup) limited, so repairing the errors will be done later. The rest can be implemented easily. The fact is that the only error that happens as soon as you write files using ReactOS' fastfat driver is that fastfat doesn't update the "free cluster number" field in the FSInfo sector of FAT32 disk. Because of that, each time you try to reinstall ReactOS without formatting on such a partition, you get the checkdisk complaining that this number is wrong & needs to be corrected, but then the VfatChkdsk returns a non-success error that is interpreted by Usetup as a failure (and the error message appears, forbidding the user to continue nevertheless to install ROS).
Cheers, Hermès
-----Message d'origine----- De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Pierre Schweitzer Envoyé : mercredi 2 mars 2016 08:47 À : ros-dev@reactos.org Objet : Re: [ros-dev] [ros-diffs] [hbelusca] 70857: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.
No?! This is totally broken and is to be reverted.
If you detect errors, there are only 3 issues: - Offer the user to attempt to repair errors - Offer the user to format - Exit (as it was done previously)
(If repairing fails, you fall into the two next cases). You cannot ignore errors and let the use write on a borked file system.
Le 02/03/2016 01:51, hbelusca@svn.reactos.org a écrit :
Author: hbelusca Date: Wed Mar 2 00:51:48 2016 New Revision: 70857
URL: http://svn.reactos.org/svn/reactos?rev=70857&view=rev Log: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/da-DK.h 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/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/ms-MY.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int erface/usetup.c?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -3154,13 +3154,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status);
sprintf(Buffer, "Setup failed to verify the selected partition.\n"
// sprintf(Buffer, "Setup failed to verify the selected partition.\n"sprintf(Buffer, "ChkDsk detected some disk errors.\n" "(Status 0x%08lx).\n", Status); PopupError(Buffer,
MUIGetString(STRING_REBOOTCOMPUTER),
// MUIGetString(STRING_REBOOTCOMPUTER),MUIGetString(STRING_CONTINUE), Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
// return QUIT_PAGE; } PartEntry->NeedsCheck = FALSE;Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/bg-BG.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1758,6 +1758,8 @@ "‘« £ ¥ ¥ ªâŽ‘ ¢êàåã ¤ï«"}, {STRING_CHECKINGPART, "’¥ç¥ ¯à®¢¥àª ¨§¡à ¨ï ¤ï«."},
- {STRING_CONTINUE,
- "ENTER = தꫦ ¢ ¥"}, {STRING_QUITCONTINUE, "F3 = ˆ§å®¤ ENTER = தꫦ ¢ ¥"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/bn-BD.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/cs-CZ.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1751,6 +1751,8 @@ "Instalace nakop¡ruje ReactOS na odd¡l"}, {STRING_CHECKINGPART, "Instalace nyn¡ kontroluje zvolenì odd¡l."},
- {STRING_CONTINUE,
- "ENTER = PokraŸovat"}, {STRING_QUITCONTINUE, "F3 = UkonŸit ENTER = PokraŸovat"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/da-DK.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1763,6 +1763,8 @@ "Installationen installere ReactOS p† partitionen"}, {STRING_CHECKINGPART, "Installationen tjekker den valgte partition."},
- {STRING_CONTINUE,
- "ENTER = Forts‘t"}, {STRING_QUITCONTINUE, "F3 = Afslut ENTER = Forts‘t"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/de-DE.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "ReactOS wird auf dieser Partition installiert."}, {STRING_CHECKINGPART, "Die ausgew„hlte Partition wird berprft."},
- {STRING_CONTINUE,
- "EINGABETASTE = Fortsetzen"}, {STRING_QUITCONTINUE, "F3 = Beenden EINGABETASTE = Fortsetzen"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/el-GR.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1762,6 +1762,8 @@ "Setup install ReactOS onto Partition"}, {STRING_CHECKINGPART, "† œš¡˜«á©«˜©ž œ¢âš®œ «é¨˜ «¦ œ§ ¢œš£â¤¦ partition."},
- {STRING_CONTINUE,
- "ENTER = ‘¬¤â®œ ˜"}, {STRING_QUITCONTINUE, "F3 = €§¦®é¨ž©ž ENTER = ‘¬¤â®œ ˜"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/en-US.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/es-ES.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "El instalador est instalando ReactOS en la partici¢n"}, {STRING_CHECKINGPART, "El instalador est comprobando la partici¢n seleccionada."},
- {STRING_CONTINUE,
- "INTRO = Continuar"}, {STRING_QUITCONTINUE, "F3 = Salir INTRO = Continuar"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/et-EE.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "ReactOS paigaldatakse partitsioonile"}, {STRING_CHECKINGPART, "Valitud partitsiooni kontrollitakse."},
- {STRING_CONTINUE,
- "ENTER = J„tka"}, {STRING_QUITCONTINUE, "F3 = V„lju ENTER = J„tka"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/fr-FR.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1768,6 +1768,8 @@ "Setup installe ReactOS sur la partition"}, {STRING_CHECKINGPART, "Setup v‚rifie la partition s‚lectionn‚e."},
- {STRING_CONTINUE,
- "ENTRE = Continuer"}, {STRING_QUITCONTINUE, "F3 = Quitter ENTRE = Continuer"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/he-IL.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1745,6 +1745,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = „Ž™Š"}, {STRING_QUITCONTINUE, "F3 = ˆŒ „š—„ ENTER = „Ž™Š"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/it-IT.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installer… ReactOS sulla partitione"}, {STRING_CHECKINGPART, "Setup sta controllando la partizione selezionata."},
- {STRING_CONTINUE,
- "INVIO = Continua"}, {STRING_QUITCONTINUE, "F3 = Esci INVIO = Continua"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/ja-JP.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- 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] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "¾¯Ä±¯ÌßÊ ReactOS¦ Ê߰è¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"}, {STRING_CHECKINGPART, "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Ê߰輮ݦ ¹Ý» ¼Ã²Ï½¡"},
- {STRING_CONTINUE,
- "ENTER = ¿Þ¯º³"}, {STRING_QUITCONTINUE, "F3 = Á³¼ ENTER = ¿Þ¯º³"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/lt-LT.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/ms-MY.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1632,6 +1632,8 @@ "Persediaan memasang ReactOS ke Partition"}, {STRING_CHECKINGPART, "Persediaan kini sedang menyemak sekatan yang dipilih."},
- {STRING_CONTINUE,
- "ENTER = Teruskan"}, {STRING_QUITCONTINUE, "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/nl-NL.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1785,6 +1785,8 @@ "Setup installeert ReactOS op Partitie"}, {STRING_CHECKINGPART, "Setup controleert nu de geselecteerde partitie."},
- {STRING_CONTINUE,
- "ENTER = Doorgaan"}, {STRING_QUITCONTINUE, "F3 = Afsluiten ENTER = Doorgaan"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/pl-PL.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1754,6 +1754,8 @@ "Instalator kopiuje pliki systemu na wybran¥ partycj©."}, {STRING_CHECKINGPART, "Instalator sprawdza wybran¥ partycj©."},
- {STRING_CONTINUE,
- "ENTER = Kontynuacja"}, {STRING_QUITCONTINUE, "F3 = Wyj˜cie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/pt-BR.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1783,6 +1783,8 @@ "O instalador instala o ReactOS na parti‡Æo"}, {STRING_CHECKINGPART, "O instalador est verificando a parti‡Æo selecionada."},
- {STRING_CONTINUE,
- "ENTER=Continuar"}, {STRING_QUITCONTINUE, "F3=Sair ENTER=Continuar"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/ro-RO.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1814,6 +1814,8 @@ "ReactOS va fi instalat pe partiþia"}, {STRING_CHECKINGPART, "Programul de instalare verificã acum partiþia aleasã."},
- {STRING_CONTINUE,
- "ENTER = Continuare"}, {STRING_QUITCONTINUE, "F3 = Ieºire ENTER = Continuare"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/ru-RU.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1744,6 +1744,8 @@ "ReactOS ãáâ ¢«¨¢ ¥âáï à §¤¥«:"}, {STRING_CHECKINGPART, "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."},
- {STRING_CONTINUE,
- "ENTER = த®«¦¨âì"}, {STRING_QUITCONTINUE, "F3 = ‚ë室 ENTER = த®«¦¨âì"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/sk-SK.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1757,6 +1757,8 @@ "Inçtal tor nainçtaluje syst‚m ReactOS na oblasœ"}, {STRING_CHECKINGPART, "Inçtal tor teraz skontroluje vybran£ oblasœ."},
- {STRING_CONTINUE,
- "ENTER = PokraŸovaœ"}, {STRING_QUITCONTINUE, "F3 = SkonŸiœ ENTER = PokraŸovaœ"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/sq-AL.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1750,6 +1750,8 @@ "Instalimi i ReactOS ne Particion"}, {STRING_CHECKINGPART, "Instalimi tani ‰sht‰ duke kontrolluar particionin e p‰rzgjedhur."},
- {STRING_CONTINUE,
- "ENTER = Vazhdo"}, {STRING_QUITCONTINUE, "F3 = Dil ENTER = Vazhdo"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/sv-SE.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installerar ReactOS till Partitionen"}, {STRING_CHECKINGPART, "Setup unders”ker nu den valda partitionen."},
- {STRING_CONTINUE,
- "ENTER = Forts„tt"}, {STRING_QUITCONTINUE, "F3 = Avsluta ENTER = Forts„tt"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/tr-TR.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1724,6 +1724,8 @@ "Kur, ReactOS'u b”lm zerine kurar."}, {STRING_CHECKINGPART, "Kur, Ÿimdi se‡ili b”lm g”zden ge‡iriyor."},
- {STRING_CONTINUE,
- "GiriŸ = Srdr"}, {STRING_QUITCONTINUE, "˜3 = €k GiriŸ = Srdr"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/uk-UA.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "ReactOS ¢áâ ®¢«îóâìáï ஧¤i«"}, {STRING_CHECKINGPART, "‚áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© ஧¤i«."},
- {STRING_CONTINUE,
- "ENTER = த®¢¦¨â¨"}, {STRING_QUITCONTINUE, "F3 = ‚¨©â¨ ENTER = த®¢¦¨â¨"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui .h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -115,11 +115,12 @@ #define STRING_NONFORMATTEDOTHERPART 63 #define STRING_INSTALLONPART 10 #define STRING_CHECKINGPART 11 -#define STRING_QUITCONTINUE 12 -#define STRING_REBOOTCOMPUTER 13 -#define STRING_TXTSETUPFAILED 14 -#define STRING_COPYING 15 -#define STRING_SETUPCOPYINGFILES 16 +#define STRING_CONTINUE 12 +#define STRING_QUITCONTINUE 13 +#define STRING_REBOOTCOMPUTER 14 +#define STRING_TXTSETUPFAILED 15 +#define STRING_COPYING 16 +#define STRING_SETUPCOPYINGFILES 17 #define STRING_REGHIVEUPDATE 20 #define STRING_IMPORTFILE 21 #define STRING_DISPLAYETTINGSUPDATE 22
-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.
(Message resent because the other one was automatically rejected because it was too large).
-----Message d'origine----- De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Hermès BÉLUSCA - MAÏTO Envoyé : mercredi 2 mars 2016 10:14 À : 'ReactOS Development List' Objet : Re: [ros-dev] [ros-diffs] [hbelusca] 70857: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.
Thanks Pierre for your ideas. I will modify the message box to try to integrate those options. At the moment we are (in usetup) limited, so repairing the errors will be done later. The rest can be implemented easily. The fact is that the only error that happens as soon as you write files using ReactOS' fastfat driver is that fastfat doesn't update the "free cluster number" field in the FSInfo sector of FAT32 disk. Because of that, each time you try to reinstall ReactOS without formatting on such a partition, you get the checkdisk complaining that this number is wrong & needs to be corrected, but then the VfatChkdsk returns a non-success error that is interpreted by Usetup as a failure (and the error message appears, forbidding the user to continue nevertheless to install ROS).
Cheers, Hermès
-----Message d'origine----- De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Pierre Schweitzer Envoyé : mercredi 2 mars 2016 08:47 À : ros-dev@reactos.org Objet : Re: [ros-dev] [ros-diffs] [hbelusca] 70857: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.
No?! This is totally broken and is to be reverted.
If you detect errors, there are only 3 issues: - Offer the user to attempt to repair errors - Offer the user to format - Exit (as it was done previously)
(If repairing fails, you fall into the two next cases). You cannot ignore errors and let the use write on a borked file system.
Then fix FastFAT so that it updates statistics and don't put hazardous hacks into Usetup. Will be greatly appreciated :-).
As a side note, it seems that our vfatlib is already able to fix errors. I believe it can already fix a wrong free clusters count.
It's actually funny it's raised as an error, IIRC, free clusters count is not mandatory and cannot even be trusted by drivers.
Le 02/03/2016 10:14, Hermès BÉLUSCA - MAÏTO a écrit :
Thanks Pierre for your ideas. I will modify the message box to try to integrate those options. At the moment we are (in usetup) limited, so repairing the errors will be done later. The rest can be implemented easily. The fact is that the only error that happens as soon as you write files using ReactOS' fastfat driver is that fastfat doesn't update the "free cluster number" field in the FSInfo sector of FAT32 disk. Because of that, each time you try to reinstall ReactOS without formatting on such a partition, you get the checkdisk complaining that this number is wrong & needs to be corrected, but then the VfatChkdsk returns a non-success error that is interpreted by Usetup as a failure (and the error message appears, forbidding the user to continue nevertheless to install ROS).
Cheers, Hermès
-----Message d'origine----- De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Pierre Schweitzer Envoyé : mercredi 2 mars 2016 08:47 À : ros-dev@reactos.org Objet : Re: [ros-dev] [ros-diffs] [hbelusca] 70857: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.
No?! This is totally broken and is to be reverted.
If you detect errors, there are only 3 issues:
- Offer the user to attempt to repair errors
- Offer the user to format
- Exit (as it was done previously)
(If repairing fails, you fall into the two next cases). You cannot ignore errors and let the use write on a borked file system.
Le 02/03/2016 01:51, hbelusca@svn.reactos.org a écrit :
Author: hbelusca Date: Wed Mar 2 00:51:48 2016 New Revision: 70857
URL: http://svn.reactos.org/svn/reactos?rev=70857&view=rev Log: [USETUP]: In case chkdsk detects some disk errors, just display a warning message but allow the user to continue the installation.
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/da-DK.h 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/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/ms-MY.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/int erface/usetup.c?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -3154,13 +3154,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status);
sprintf(Buffer, "Setup failed to verify the selected partition.\n"
// sprintf(Buffer, "Setup failed to verify the selected partition.\n"sprintf(Buffer, "ChkDsk detected some disk errors.\n" "(Status 0x%08lx).\n", Status); PopupError(Buffer,
MUIGetString(STRING_REBOOTCOMPUTER),
// MUIGetString(STRING_REBOOTCOMPUTER),MUIGetString(STRING_CONTINUE), Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
// return QUIT_PAGE; } PartEntry->NeedsCheck = FALSE;Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/bg-BG.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1758,6 +1758,8 @@ "‘« £ ¥ ¥ ªâŽ‘ ¢êàåã ¤ï«"}, {STRING_CHECKINGPART, "’¥ç¥ ¯à®¢¥àª ¨§¡à ¨ï ¤ï«."},
- {STRING_CONTINUE,
- "ENTER = தꫦ ¢ ¥"}, {STRING_QUITCONTINUE, "F3 = ˆ§å®¤ ENTER = தꫦ ¢ ¥"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/bn-BD.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/cs-CZ.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1751,6 +1751,8 @@ "Instalace nakop¡ruje ReactOS na odd¡l"}, {STRING_CHECKINGPART, "Instalace nyn¡ kontroluje zvolenì odd¡l."},
- {STRING_CONTINUE,
- "ENTER = PokraŸovat"}, {STRING_QUITCONTINUE, "F3 = UkonŸit ENTER = PokraŸovat"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/da-DK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/da-DK.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/da-DK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1763,6 +1763,8 @@ "Installationen installere ReactOS p† partitionen"}, {STRING_CHECKINGPART, "Installationen tjekker den valgte partition."},
- {STRING_CONTINUE,
- "ENTER = Forts‘t"}, {STRING_QUITCONTINUE, "F3 = Afslut ENTER = Forts‘t"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/de-DE.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "ReactOS wird auf dieser Partition installiert."}, {STRING_CHECKINGPART, "Die ausgew„hlte Partition wird berprft."},
- {STRING_CONTINUE,
- "EINGABETASTE = Fortsetzen"}, {STRING_QUITCONTINUE, "F3 = Beenden EINGABETASTE = Fortsetzen"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/el-GR.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1762,6 +1762,8 @@ "Setup install ReactOS onto Partition"}, {STRING_CHECKINGPART, "† œš¡˜«á©«˜©ž œ¢âš®œ «é¨˜ «¦ œ§ ¢œš£â¤¦ partition."},
- {STRING_CONTINUE,
- "ENTER = ‘¬¤â®œ ˜"}, {STRING_QUITCONTINUE, "F3 = €§¦®é¨ž©ž ENTER = ‘¬¤â®œ ˜"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/en-US.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/es-ES.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "El instalador est instalando ReactOS en la partici¢n"}, {STRING_CHECKINGPART, "El instalador est comprobando la partici¢n seleccionada."},
- {STRING_CONTINUE,
- "INTRO = Continuar"}, {STRING_QUITCONTINUE, "F3 = Salir INTRO = Continuar"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/et-EE.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1743,6 +1743,8 @@ "ReactOS paigaldatakse partitsioonile"}, {STRING_CHECKINGPART, "Valitud partitsiooni kontrollitakse."},
- {STRING_CONTINUE,
- "ENTER = J„tka"}, {STRING_QUITCONTINUE, "F3 = V„lju ENTER = J„tka"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/fr-FR.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1768,6 +1768,8 @@ "Setup installe ReactOS sur la partition"}, {STRING_CHECKINGPART, "Setup v‚rifie la partition s‚lectionn‚e."},
- {STRING_CONTINUE,
- "ENTRE = Continuer"}, {STRING_QUITCONTINUE, "F3 = Quitter ENTRE = Continuer"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/he-IL.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1745,6 +1745,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = „Ž™Š"}, {STRING_QUITCONTINUE, "F3 = ˆŒ „š—„ ENTER = „Ž™Š"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/it-IT.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installer… ReactOS sulla partitione"}, {STRING_CHECKINGPART, "Setup sta controllando la partizione selezionata."},
- {STRING_CONTINUE,
- "INVIO = Continua"}, {STRING_QUITCONTINUE, "F3 = Esci INVIO = Continua"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/ja-JP.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- 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] Wed Mar 2 00:51:48 2016 @@ -1747,6 +1747,8 @@ "¾¯Ä±¯ÌßÊ ReactOS¦ Ê߰è¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"}, {STRING_CHECKINGPART, "¾¯Ä±¯ÌßÊ ¾ÝÀ¸ »ÚÀ Ê߰輮ݦ ¹Ý» ¼Ã²Ï½¡"},
- {STRING_CONTINUE,
- "ENTER = ¿Þ¯º³"}, {STRING_QUITCONTINUE, "F3 = Á³¼ ENTER = ¿Þ¯º³"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/lt-LT.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, "Setup is now checking the selected partition."},
- {STRING_CONTINUE,
- "ENTER = Continue"}, {STRING_QUITCONTINUE, "F3 = Quit ENTER = Continue"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ms-MY.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/ms-MY.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ms-MY.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1632,6 +1632,8 @@ "Persediaan memasang ReactOS ke Partition"}, {STRING_CHECKINGPART, "Persediaan kini sedang menyemak sekatan yang dipilih."},
- {STRING_CONTINUE,
- "ENTER = Teruskan"}, {STRING_QUITCONTINUE, "F3 = Keluar ENTER = Teruskan"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/nl-NL.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1785,6 +1785,8 @@ "Setup installeert ReactOS op Partitie"}, {STRING_CHECKINGPART, "Setup controleert nu de geselecteerde partitie."},
- {STRING_CONTINUE,
- "ENTER = Doorgaan"}, {STRING_QUITCONTINUE, "F3 = Afsluiten ENTER = Doorgaan"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/pl-PL.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1754,6 +1754,8 @@ "Instalator kopiuje pliki systemu na wybran¥ partycj©."}, {STRING_CHECKINGPART, "Instalator sprawdza wybran¥ partycj©."},
- {STRING_CONTINUE,
- "ENTER = Kontynuacja"}, {STRING_QUITCONTINUE, "F3 = Wyj˜cie ENTER = Kontynuacja"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/pt-BR.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1783,6 +1783,8 @@ "O instalador instala o ReactOS na parti‡Æo"}, {STRING_CHECKINGPART, "O instalador est verificando a parti‡Æo selecionada."},
- {STRING_CONTINUE,
- "ENTER=Continuar"}, {STRING_QUITCONTINUE, "F3=Sair ENTER=Continuar"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/ro-RO.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1814,6 +1814,8 @@ "ReactOS va fi instalat pe partiþia"}, {STRING_CHECKINGPART, "Programul de instalare verificã acum partiþia aleasã."},
- {STRING_CONTINUE,
- "ENTER = Continuare"}, {STRING_QUITCONTINUE, "F3 = Ieºire ENTER = Continuare"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/ru-RU.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1744,6 +1744,8 @@ "ReactOS ãáâ ¢«¨¢ ¥âáï à §¤¥«:"}, {STRING_CHECKINGPART, "à®£à ¬¬ ãáâ ®¢ª¨ ¯à®¢¥àï¥â ¢ë¡à ë© à §¤¥«."},
- {STRING_CONTINUE,
- "ENTER = த®«¦¨âì"}, {STRING_QUITCONTINUE, "F3 = ‚ë室 ENTER = த®«¦¨âì"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/sk-SK.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1757,6 +1757,8 @@ "Inçtal tor nainçtaluje syst‚m ReactOS na oblasœ"}, {STRING_CHECKINGPART, "Inçtal tor teraz skontroluje vybran£ oblasœ."},
- {STRING_CONTINUE,
- "ENTER = PokraŸovaœ"}, {STRING_QUITCONTINUE, "F3 = SkonŸiœ ENTER = PokraŸovaœ"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/sq-AL.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1750,6 +1750,8 @@ "Instalimi i ReactOS ne Particion"}, {STRING_CHECKINGPART, "Instalimi tani ‰sht‰ duke kontrolluar particionin e p‰rzgjedhur."},
- {STRING_CONTINUE,
- "ENTER = Vazhdo"}, {STRING_QUITCONTINUE, "F3 = Dil ENTER = Vazhdo"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/sv-SE.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "Setup installerar ReactOS till Partitionen"}, {STRING_CHECKINGPART, "Setup unders”ker nu den valda partitionen."},
- {STRING_CONTINUE,
- "ENTER = Forts„tt"}, {STRING_QUITCONTINUE, "F3 = Avsluta ENTER = Forts„tt"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/tr-TR.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1724,6 +1724,8 @@ "Kur, ReactOS'u b”lm zerine kurar."}, {STRING_CHECKINGPART, "Kur, Ÿimdi se‡ili b”lm g”zden ge‡iriyor."},
- {STRING_CONTINUE,
- "GiriŸ = Srdr"}, {STRING_QUITCONTINUE, "˜3 = €k GiriŸ = Srdr"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lan g/uk-UA.h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -1753,6 +1753,8 @@ "ReactOS ¢áâ ®¢«îóâìáï ஧¤i«"}, {STRING_CHECKINGPART, "‚áâ ®¢«î¢ ç ¯¥à¥¢iàïó ¢¨¡à ¨© ஧¤i«."},
- {STRING_CONTINUE,
- "ENTER = த®¢¦¨â¨"}, {STRING_QUITCONTINUE, "F3 = ‚¨©â¨ ENTER = த®¢¦¨â¨"}, {STRING_REBOOTCOMPUTER,
Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui .h?rev=70857&r1=70856&r2=70857&view=diff ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Wed Mar 2 00:51:48 2016 @@ -115,11 +115,12 @@ #define STRING_NONFORMATTEDOTHERPART 63 #define STRING_INSTALLONPART 10 #define STRING_CHECKINGPART 11 -#define STRING_QUITCONTINUE 12 -#define STRING_REBOOTCOMPUTER 13 -#define STRING_TXTSETUPFAILED 14 -#define STRING_COPYING 15 -#define STRING_SETUPCOPYINGFILES 16 +#define STRING_CONTINUE 12 +#define STRING_QUITCONTINUE 13 +#define STRING_REBOOTCOMPUTER 14 +#define STRING_TXTSETUPFAILED 15 +#define STRING_COPYING 16 +#define STRING_SETUPCOPYINGFILES 17 #define STRING_REGHIVEUPDATE 20 #define STRING_IMPORTFILE 21 #define STRING_DISPLAYETTINGSUPDATE 22
-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.
Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
-
Hermès BÉLUSCA - MAÏTO -
Pierre Schweitzer