diff -Nuar ubiquity.orig/d-i/source/localechooser/languagelist ubiquity/d-i/source/localechooser/languagelist --- ubiquity.orig/d-i/source/localechooser/languagelist 2009-04-15 18:35:17.000000000 +0200 +++ ubiquity/d-i/source/localechooser/languagelist 2009-04-15 18:37:10.000000000 +0200 @@ -90,6 +90,7 @@ uk;Ukrainian;Українська;2;UA;UTF-8;uk_UA.UTF-8;;console-setup #X ur;Urdu;اردو;3;PK;UTF-8;ur_PK;;console-setup #X ca@valencia;Valencian-Catalan;Valencià-Català;1;ES;UTF-8;ca_ES.UTF-8@valencia;;console-setup +qcv;Valencian;Valencià;1;ES;UTF-8;qcv_ES.UTF-8;;kbd=lat0-sun16(utf8) vi;Vietnamese;Tiếng Việt;3;VN;UTF-8;vi_VN;;console-setup cy;Welsh;Cymraeg;2;GB;UTF-8;cy_GB.UTF-8;;console-setup wo;Wolof;Wolof;2;SN;UTF-8;wo_SN;wo:fr:en; diff -Nuar ubiquity.orig/d-i/source/localechooser/mklanguagelist.data ubiquity/d-i/source/localechooser/mklanguagelist.data --- ubiquity.orig/d-i/source/localechooser/mklanguagelist.data 2009-04-15 18:41:18.000000000 +0200 +++ ubiquity/d-i/source/localechooser/mklanguagelist.data 2009-04-16 21:25:43.000000000 +0200 @@ -21,6 +21,10 @@ sub get_language_names { my $list = shift; my @names; + my @valid_names=("Arabic","Basque","Catalan","German","English","French","Galician","Spanish","Romanian","Russian","Valencian"); + my %valid_hash; + @valid_hash{@valid_names}=(); + print "Loading $list\n" if ($debug); open(L, "< $list") || die "Unable to read $list"; while () { @@ -28,7 +32,8 @@ chomp; next if m/^\#/; my ($code, $name, $translation, $level, ) = split(/;/); - push(@names, $name); + + push(@names, $name) if (exists $valid_hash{$name}); $codes{$name} = $code; $levels{$name} = $level;