Imported french install lang from "IfXen" and add it to build.

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

diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c
index 0595468ac4a8e3b4d8194124c7451f653a529089..f0d36045d9a4dc97cef5a4a55dbcdc40baf7b59b 100644 (file)
--- a/src/install+setup/setup/main.c
+++ b/src/install+setup/setup/main.c
@@ -22,6 +22,8 @@ struct knic knics[20] = { { "" , "" , "" , "" } };
 
 extern char *en_tr[];
 extern char *de_tr[];
+extern char *fr_tr[];
+
 
 int main(int argc, char *argv[])
 {
@@ -29,8 +31,8 @@ int main(int argc, char *argv[])
        char *shortlangnames[] = { "en", NULL };
        char **langtrs[] = { en_tr, NULL };
 #else
-       char *shortlangnames[] = { "de", "en", NULL };
-       char **langtrs[] = { de_tr, en_tr, NULL };
+       char *shortlangnames[] = { "de", "en", "fr", NULL };
+       char **langtrs[] = { de_tr, en_tr, fr_tr, NULL };
 #endif
        int choice;
        char *sections[11]; /* need to fill this out AFTER knowning lang */
@@ -176,15 +178,15 @@ int main(int argc, char *argv[])
                        goto EXIT;
                if (!(handledomainname()))
                        goto EXIT;
-               if (!(handlenetworking()))
+               if (!(handlerootpassword()))
                        goto EXIT;
-               if (!(handleisdn()))
+               if (!(handleadminpassword()))
                        goto EXIT;
-               if (!(handledhcp()))
+               if (!(handleisdn()))
                        goto EXIT;
-               if (!(handlerootpassword()))
+               if (!(handlenetworking()))
                        goto EXIT;
-               if (!(handleadminpassword()))
+               if (!(handledhcp()))
                        goto EXIT;
 
                autook = 1;