webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-25 10:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-06-24 11:10:13 +02:00
parent ad6b3bd660 2269b89ba9
commit a806976e36
24 changed files with 3628 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/initscripts/init.d/console
View File

@@ -17,16 +17,18 @@
. ${rc_functions}
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
# English is default
FONT="lat0-16"
KEYMAP_CORRECTIONS="euro2"
if [ "$LANGUAGE" == "de" ]; then
#KEYMAP="de-latin1"
KEYMAP_CORRECTIONS="euro2"
LEGACY_CHARSET="iso-8859-15"
#FONT="LatArCyrHeb-16 -m 8859-15"
FONT="lat0-16 -m 8859-15"
else
# English
FONT="lat0-16"
KEYMAP_CORRECTIONS="euro2"
fi
if [ "$LANGUAGE" == "pl" ]; then
FONT="lat2-16"
fi
UNICODE="1"

7
src/install+setup/install/main.c
View File

@@ -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 */

1
src/install+setup/libsmooth/main.c
View File

@@ -344,6 +344,7 @@ int replace(char filename1[], char *from, char *to)
#include "lang_en.c"
#include "lang_es.c"
#include "lang_fr.c"
#include "lang_pl.c"
#endif
// returns a pointer to the actual running version number of IPFire.

5
src/install+setup/setup/main.c
View File

@@ -24,6 +24,7 @@ extern char *en_tr[];
extern char *de_tr[];
extern char *fr_tr[];
extern char *es_tr[];
extern char *pl_tr[];
int main(int argc, char *argv[])
{
@@ -31,8 +32,8 @@ int main(int argc, char *argv[])
char *shortlangnames[] = { "en", NULL };
char **langtrs[] = { en_tr, NULL };
#else
char *shortlangnames[] = { "de", "en", "fr", "es", NULL };
char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL };
char *shortlangnames[] = { "de", "en", "fr", "es", "pl", NULL };
char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, NULL };
#endif
int choice;
char *sections[11]; /* need to fill this out AFTER knowning lang */