Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / src / install+setup / install / main.c

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 9ea3f3193708f68cace5573adb6204776060d8a7..60b8cba502af58dd15bfcf5141ef126bdf61986c 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -11,7 +11,7 @@
 #include "install.h"
 #define _GNU_SOURCE
  
-#define INST_FILECOUNT 8400
+#define INST_FILECOUNT 10700
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 #define EXT2 0
@@ -33,15 +33,16 @@ extern char *en_tr[];
 extern char *es_tr[];
 extern char *de_tr[];
 extern char *fr_tr[];
+extern char *pl_tr[];
 
 int main(int argc, char *argv[])
 {
 
        char discl_msg[40000] = "Disclaimer\n";
 
-       char *langnames[] = { "Deutsch", "English", "Français", "Español", NULL };
-       char *shortlangnames[] = { "de", "en", "fr", "es", NULL };
-       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL };
+       char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", NULL };
+       char *shortlangnames[] = { "de", "en", "fr", "es", "pl", NULL };
+       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, NULL };
        char hdletter;
        char harddrive[30], sourcedrive[5];     /* Device holder. */
        struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
@@ -49,7 +50,7 @@ int main(int argc, char *argv[])
        char commandstring[STRING_SIZE];
        char mkfscommand[STRING_SIZE];
        char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL };
-       int fstype = EXT3;
+       int fstype = EXT4;
        int choice;
        int i;
        int found = 0;
@@ -135,7 +136,7 @@ int main(int argc, char *argv[])
        /* German is the default */
        for (choice = 0; langnames[choice]; choice++)
        {
-               if (strcmp(langnames[choice], "Deutsch") == 0)
+               if (strcmp(langnames[choice], "English") == 0)
                        break;
        }
        if (!langnames[choice])