Author: ilardig Date: Thu Jun 3 00:28:37 2010 New Revision: 47524
URL: http://svn.reactos.org/svn/reactos?rev=47524&view=rev Log: [usetup] - The last error messages were swapped in some languages, spotted by Paolo Devoti. - Added the minimum required disk space also in the debug print. See issue #5440 for more details.
Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.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/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.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/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.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] Thu Jun 3 00:28:37 2010 @@ -1418,7 +1418,7 @@ if( m < RequiredPartitionDiskSpace) { /* partition is too small so ask for another partion */ - DPRINT1("Partition too small"); + DPRINT1("Partition is too small, required disk space is %lu MB\n", RequiredPartitionDiskSpace); return FALSE; } else
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] Thu Jun 3 00:28:37 2010 @@ -1484,15 +1484,15 @@ "ENTER = १ ¯ã᪠¥ ª®¬¯îâêà " }, { + //ERROR_UPDATE_GEOID, + " áâனª â ¥ ¬®¦ ¤ ãáâ ®¢¨ ®§ ç¨â¥«ï £¥®£à ä᪮⮠¯®«®¦¥¨¥.\n" + "ENTER = १ ¯ã᪠¥ ª®¬¯îâêà " + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * â¨á¥â¥ ª« ¢¨è, § ¤ ¯à®¤ê«¦¨â¥.", NULL - }, - { - //ERROR_UPDATE_GEOID, - " áâனª â ¥ ¬®¦ ¤ ãáâ ®¢¨ ®§ ç¨â¥«ï £¥®£à ä᪮⮠¯®«®¦¥¨¥.\n" - "ENTER = १ ¯ã᪠¥ ª®¬¯îâêà " }, { 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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1479,17 +1479,17 @@ "ENTER = Reiniciar el equipo" }, { + //ERROR_UPDATE_GEOID, + "El instalador no ha podido configurar el ID geogr fico.\n" + "ENTER = Reiniciar el equipo" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "No hay suficiente espacio disponible en la partici¢n seleccionada.\n" " * Presione una tecla para continuar.", NULL }, { - //ERROR_UPDATE_GEOID, - "El instalador no ha podido configurar el ID geogr fico.\n" - "ENTER = Reiniciar el equipo" - }, -{ NULL, NULL }
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] Thu Jun 3 00:28:37 2010 @@ -1469,15 +1469,15 @@ "ENTER = Taaskivita arvuti" }, { + //ERROR_UPDATE_GEOID, + "Geograafilist asukohta ei ännestunud seadistada.\n" + "ENTER = Taaskivita arvuti" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Valitud partitsioonil pole piisavalt ruumi.\n" " * Vajuta suvalist klahvi, et jtkata.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Geograafilist asukohta ei ännestunud seadistada.\n" - "ENTER = Taaskivita arvuti" }, { 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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1485,15 +1485,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" }, { 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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1473,15 +1473,15 @@ "INVIO = Riavviare il computer" }, { + //ERROR_UPDATE_GEOID, + "Setup non ha potuto impostare l'id geografico.\n" + "INVIO = Riavviare il computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Lo spazio disponibile nella partizione selezionata insufficiente.\n" " * Premere un tasto qualsiasi per continuare.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup non ha potuto impostare l'id geografico.\n" - "INVIO = Riavviare il computer" }, { NULL,
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] Thu Jun 3 00:28:37 2010 @@ -1482,15 +1482,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" }, { NULL,
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] Thu Jun 3 00:28:37 2010 @@ -1500,15 +1500,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup kan de geografische positie niet instellen.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup kan de geografische positie niet instellen.\n" - "ENTER = Reboot computer" }, { 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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1481,15 +1481,15 @@ "ENTER = Restart komputera" }, { + //ERROR_UPDATE_GEOID, + "Instalator nie m¢g ustawi lokalizacji geograficznej.\n" + "ENTER = Restart komputera" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Brak wystarczaj¥cej wolnej przestrzeni w wybranej partycji.\n" " * Nacinij dowolny klawisz aby kontynuowa.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Instalator nie m¢g ustawi lokalizacji geograficznej.\n" - "ENTER = Restart komputera" }, { 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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1473,15 +1473,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" }, { NULL,
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] Thu Jun 3 00:28:37 2010 @@ -1483,15 +1483,15 @@ "ENTER = Reçtart po¡taa" }, { + //ERROR_UPDATE_GEOID, + "Inçtal tor nemohol nastavi geo id.\n" + "ENTER = Reçtart po¡taa" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Inçtal tor nemohol nastavi geo id.\n" - "ENTER = Reçtart po¡taa" }, { NULL,
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] Thu Jun 3 00:28:37 2010 @@ -1473,15 +1473,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" }, { 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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1479,15 +1479,15 @@ "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { + //ERROR_UPDATE_GEOID, + "¥ ¢¤ «®áì ¢áâ ®¢¨â¨ geo id.\n" + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "¥ ¢¤ «®áì ¢áâ ®¢¨â¨ geo id.\n" - "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { NULL,