Enabled Arabic keyboard,

added full list of countries listed in iso 3166,
changed japanese charset->font for KDE,
removed charset names no longer used

2 files changed, 355 insertions, 171 deletions

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 53acc6a3a..a807a9b7b 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -23,26 +23,26 @@ my $KMAP_MAGIC = 0x8B39C07F;
 my %lang2keyboard =
 (
   'af'  => 'us_intl',
-#-'ar'  => 'ar:80 ar_d:70 ar_azerty:60 ar_azerty_d:50',
-  'az'  => 'az:80 tr_q:10 us_intl:5',
-  'be'  => 'by:80 ru:50 ru_yawerty:40',
+  'ar'  => 'ar:90',
+  'az'  => 'az:90 tr_q:10 us_intl:5',
+  'be'  => 'by:90 ru:50 ru_yawerty:40',
   'bg'  => 'bg_phonetic:60 bg:50',
-  'bn'  => 'ben:80 dev:20 us_intl:5',
+  'bn'  => 'ben:90 dev:20 us_intl:5',
   'br'  => 'fr:90',
   'bs'  => 'bs:90',
-  'ca'  => 'es:89 fr:15',
+  'ca'  => 'es:90 fr:15',
   'cs'  => 'cz_qwerty:70 cz:50',
   'cy'  => 'uk:90',
   'da'  => 'dk:90',
   'de'  => 'de_nodeadkeys:70 de:50 be:50 ch_de:50',
   'el'  => 'gr:90',
-  'en'  => 'us:90 us_intl:50',
-'en_US' => 'us:89 us_intl:50 qc:50 uk:50',
-'en_GB' => 'uk:89 us:60 us_intl:50 us:50',
+  'en'  => 'us:89 us_intl:50 qc:50 uk:50',
+'en_US' => 'us:90 us_intl:50',
+'en_GB' => 'uk:89 us:60 us_intl:50',
   'eo'  => 'us_intl:89 dvorak:20',
   'es'  => 'es:85 la:80 us_intl:50',
   'et'  => 'ee:90',
-  'eu'  => 'es:89 fr:15',
+  'eu'  => 'es:90 fr:15',
   'fa'  => 'ir:90',
   'fi'  => 'fi:90',
   'fr'  => 'fr:89 qc:85 be:85 ch_fr:70',
@@ -51,59 +51,62 @@ my %lang2keyboard =
   'gl'  => 'es:90',
   'gu'  => 'guj:90',
   'gv'  => 'uk:90',
-  'he'  => 'il:89 il_phonetic:10',
+  'he'  => 'il:90 il_phonetic:10',
   'hi'  => 'dev:90',
-  'hr'  => 'hr:80 si:50',
+  'hr'  => 'hr:90 si:50',
   'hu'  => 'hu:90',
-  'hy'  => 'am:80 am_old:10 am_phonetic:5',
+  'hy'  => 'am:90 am_old:10 am_phonetic:5',
   'id'  => 'us:90 us_intl:20',
   'is'  => 'is:90',
   'iu'  => 'iu:90',
-  'it'  => 'it:89 ch_fr:50 ch_de:50',
-  'ja'  => 'jp:80 us:50 us_intl:20',
-  'ka'  => 'ge_la:80 ge_ru:50',
+  'it'  => 'it:90 ch_fr:50 ch_de:50',
+  'ja'  => 'jp:90 us:50 us_intl:20',
+  'ka'  => 'ge_la:90 ge_ru:50',
   'kl'  => 'dk:80 us_intl:30',
-  'ko'  => 'kr:80 us:60',
+#-'kn'  => 'kan:90',
+  'ko'  => 'kr:90 us:60',
   'kw'  => 'uk:90',
   'lo'  => 'lao:90',
   'lt'  => 'lt:80 lt_new:70 lt_b:60 lt_p:50',
-  'lv'  => 'lv:80 lt:40 lt_new:30 lt_b:20 lt_p:10 ee:5',
-  'mi'  => 'us_intl:60 uk:20 us:10',
-  'mk'  => 'mk:80',
-  'ml'  => 'mal:80',
-  'mn'  => 'mng:75 ru:20 ru_yawerty:5',
+  'lv'  => 'lv:90 lt:40 lt_new:30 lt_b:20 lt_p:10 ee:5',
+  'mi'  => 'us_intl:90 uk:20 us:10',
+  'mk'  => 'mk:90',
+  'ml'  => 'mal:90',
+  'mn'  => 'mng:90 ru:20 ru_yawerty:5',
   'mr'  => 'dev:90',
   'ms'  => 'us:90 us_intl:20',
-  'mt'  => 'mt:55 mt_us:35 us_intl:10',
+  'mt'  => 'mt:90 mt_us:35 us_intl:10',
   'my'  => 'mm:90',
-  'nb'  => 'no:85 dvorak_no:10',
+  'nb'  => 'no:90 dvorak_no:10',
   'nl'  => 'us_intl:80: be:70 nl:10 us:5',
-  'nn'  => 'no:85 dvorak_no:10',
-  'no'  => 'no:85 dvorak_no:10',
+  'nn'  => 'no:90 dvorak_no:10',
+  'no'  => 'no:90 dvorak_no:10',
   'oc'  => 'fr:90',
+#-'or'  => 'ori:90',
   'pa'  => 'gur:90',
   'ph'  => 'us:90 us_intl:20',
-  'pl'  => 'pl:80 pl2:60',
+  'pl'  => 'pl:90 pl2:60',
   'pp'  => 'br:80 la:20 pt:10 us_intl:30',
-'pt_BR' => 'br:80 la:20 pt:10 us_intl:30',
-  'pt'  => 'pt:80',
+'pt_BR' => 'br:90 la:20 pt:10 us_intl:30',
+  'pt'  => 'pt:90',
   'ro'  => 'ro2:80 ro:40 us_intl:10',
   'ru'  => 'ru:85 ru_yawerty:80 ua:50',
   'sk'  => 'sk_qwerty:80 sk:70',
-  'sl'  => 'si:80 hr:50',
+  'sl'  => 'si:90 hr:50',
   'sp'  => 'sr:80',
-  'sq'  => 'al:80',
+  'sq'  => 'al:90',
   'sr'  => 'yu:80',
-  'sv'  => 'se:85 fi:30 dvorak_se:10 sv:10',
+  'sv'  => 'se:90 fi:30 dvorak_se:10 sv:10',
   'ta'  => 'tscii:80 tml:20',
-  'tg'  => 'tj:80 ru_yawerty:40',
+#-'te'  => 'tel:90',
+  'tg'  => 'tj:90 ru_yawerty:40',
   'th'  => 'th:90',
-  'tr'  => 'tr_q:85 tr_q:30',
+  'tr'  => 'tr_q:90 tr_q:30',
   'tt'  => 'ru:50 ru_yawerty:40',
-  'uk'  => 'ua:85 ru:50 ru_yawerty:40',
+  'uk'  => 'ua:90 ru:50 ru_yawerty:40',
   'uz'  => 'us:80',
   'vi'  => 'vn:80 us:60 us_intl:50',
-  'wa'  => 'be:85 fr:5',
+  'wa'  => 'be:90 fr:5',
 'zh_CN' => 'us:60',
 'zh_TW' => 'us:60',
 );
@@ -143,10 +146,7 @@ arch() =~ /^sparc/ ? (
  "am_old" => [ N_("Armenian (old)"), "am_old",	    "am(old)", 1 ],
  "am" => [ N_("Armenian (typewriter)"), "am-armscii8", "am",   1 ],
  "am_phonetic" => [ N_("Armenian (phonetic)"), "am_phonetic", "am(phonetic)",1 ],
-#-"ar_azerty" => [ N_("Arabic (AZERTY)"),"ar-8859_6","ar(azerty)",1 ],
-#-"ar_azerty_d" => [ N_("Arabic (AZERTY, arabic digits)"),"ar-8859_6","ar(azerty_digits)",1 ],
-#-"ar" => [ N_("Arabic (QWERTY)"),"ar-8859_6",      "ar",    1 ],
-#-"ar_d" => [ N_("Arabic (QWERTY, arabic digits)"),"ar-8859_6","ar(digits)",1 ],
+ "ar" => [ N_("Arabic"),          "ar-8859_6",       "ar(digits)",   1 ],
  "az" => [ N_("Azerbaidjani (latin)"), "az",         "az",    0 ],
 #"a3" => [ N_("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)",1 ],
  "be" => [ N_("Belgian"),        "be2-latin1",      "be",    0 ],
@@ -187,6 +187,7 @@ arch() =~ /^sparc/ ? (
  "it" => [ N_("Italian"),        "it-latin1",       "it",    0 ],
  "iu" => [ N_("Inuktitut"),      "us",              "iu",    1 ],
  "jp" => [ N_("Japanese 106 keys"), "jp106",        "jp",    1 ],
+#-"kan" => [ N_("Kannada"),        "us",              "kan",  1 ],
 #There is no XKB korean file yet; but using xmodmap one disables
 # some functioanlity; "us" used for XKB until this is fixed
  "kr" => [ N_("Korean keyboard"), "us",             "us",    1 ],
@@ -206,6 +207,7 @@ arch() =~ /^sparc/ ? (
  "mt_us" => [ N_("Maltese (US)"), "us",             "mt_us", 0 ],
  "nl" => [ N_("Dutch"),          "nl-latin1",       "nl",    0 ],
  "no" => [ N_("Norwegian"),      "no-latin1",       "no",    0 ],
+#-"ori" => [ N_("Oriya"),          "us",              "ori",  1 ],
  "pl" => [ N_("Polish (qwerty layout)"), "pl",      "pl",    0 ],
  "pl2" => [ N_("Polish (qwertz layout)"), "pl-latin2", "pl2", 0 ],
  "pt" => [ N_("Portuguese"),     "pt-latin1",       "pt",    0 ],
@@ -221,6 +223,8 @@ arch() =~ /^sparc/ ? (
  "sk_qwerty" => [ N_("Slovakian (QWERTY)"), "sk-qwerty", "sk_qwerty", 0 ],
 # TODO: console map
  "sr" => [ N_("Serbian (cyrillic)"), "sr",          "sr",    0 ],
+#-"syr" => [ N_("Syriak"),         "us",             "syr",  1 ],
+#-"tel" => [ N_("Telugu"),         "us",             "tel",  1 ],
 # no console kbd that I'm aware of
  "tml" => [ N_("Tamil (ISCII-layout)"), "us",       "tml",   1 ],
  "tscii" => [ N_("Tamil (Typewriter-layout)"), "us", "ta(UNI)", 1 ],
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 2b8348239..b724ae44d 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -24,53 +24,53 @@ my %langs = (
 'en_US' => [ 'English (American)',  'American English',  'en_US', '    5', 'C' ],
 'en_GB' => [ 'English',             'British English',   'en_GB', '12345', 'iso-8859-15' ],
 'af' =>    [ 'Afrikaans',           'Afrikaans',         'af_ZA', '  3  ', 'iso-8859-1' ],
-'am' =>    [ 'Amharic',             'ZZ Amharic',        'am_ET', '  3  ', 'utf_am' ],
-'ar' =>    [ 'Arabic',              'AA Arabic',         'ar_EG', ' 23  ', 'iso-8859-6' ],
-'az' =>    [ 'Azeri (Latin)',       'Azerbaijani',       'az_AZ', ' 2   ', 'iso-8859-9e' ],
-'be' =>    [ 'Belarussian',         'Belarussian',       'be_BY', '1    ', 'cp1251' ],
-'bg' =>    [ 'Bulgarian',           'Bulgarian',         'bg_BG', '1    ', 'cp1251' ],
+'am' =>    [ 'Amharic',             'ZZ emarNa',         'am_ET', '  3  ', 'utf_am' ],
+'ar' =>    [ 'Arabic',              'AA Arabic',         'ar_EG', ' 23  ', 'utf_ar' ],
+'az' =>    [ 'Azeri (Latin)',       'Azerbaycanca',      'az_AZ', ' 2   ', 'utf_az' ],
+'be' =>    [ 'Belarussian',         '_Belarussian',      'be_BY', '1    ', 'cp1251' ],
+'bg' =>    [ 'Bulgarian',           'Blgarski',          'bg_BG', '1    ', 'cp1251' ],
 'br' =>    [ 'Brezhoneg',           'Brezhoneg',         'br_FR', '1    ', 'iso-8859-15', 'br:fr_FR:fr' ],
 'bs' =>    [ 'Bosnian',             'Bosanski',          'bs_BA', '1    ', 'iso-8859-2' ],
 'ca' =>    [ 'Catalan',             'Catala',            'ca_ES', '1    ', 'iso-8859-15', 'ca:es_ES:es' ],
 'cs' =>    [ 'Czech',               'Cestina',           'cs_CZ', '1    ', 'iso-8859-2' ],
-'cy' =>    [ 'Cymraeg (Welsh)',     'Cymraeg',           'cy_GB', '1    ', 'iso-8859-14', 'cy:en_GB:en' ],
+'cy' =>    [ 'Cymraeg (Welsh)',     'Cymraeg',           'cy_GB', '1    ', 'utf_lat8', 'cy:en_GB:en' ],
 'da' =>    [ 'Danish',              'Dansk',             'da_DK', '1    ', 'iso-8859-15' ],
 'de' =>    [ 'German',              'Deutsch',           'de_DE', '1    ', 'iso-8859-15' ],
-'el' =>    [ 'Greek',               'Ellada',            'el_GR', '1    ', 'iso-8859-7' ],
-'eo' =>    [ 'Esperanto',           'Esperanto',         'eo_XX', '12345', 'iso-8859-3' ],
+'el' =>    [ 'Greek',               'Ellynika',          'el_GR', '1    ', 'iso-8859-7' ],
+'eo' =>    [ 'Esperanto',           'Esperanto',         'eo_XX', '12345', 'unicode' ],
 'es' =>    [ 'Spanish',             'Espanol',           'es_ES', '1 3 5', 'iso-8859-15' ],
 'et' =>    [ 'Estonian',            'Eesti',             'et_EE', '1    ', 'iso-8859-15' ],
-'eu' =>    [ 'Euskara (Basque)',    'Euskaka',           'eu_ES', '1    ', 'iso-8859-15' ],
-'fa' =>    [ 'Farsi (Iranian)',     'AA Farsi',          'fa_IR', ' 2   ', 'unicode' ],
+'eu' =>    [ 'Euskara (Basque)',    'Euskara',           'eu_ES', '1    ', 'iso-8859-15' ],
+'fa' =>    [ 'Farsi (Iranian)',     'AA Farsi',          'fa_IR', ' 2   ', 'utf_ar' ],
 'fi' =>    [ 'Finnish (Suomi)',     'Suomi',             'fi_FI', '1    ', 'iso-8859-15' ],
-#'fo' =>   [ 'Faroese',             'Foroysk',           'fo_FO', '1    ', 'iso-8859-1' ],
+#'fo' =>   [ 'Faroese',             'Foroyskt',          'fo_FO', '1    ', 'iso-8859-1' ],
 'fr' =>    [ 'French',              'Francais',          'fr_FR', '1 345', 'iso-8859-15' ],
 'ga' =>    [ 'Gaeilge (Irish)',     'Gaeilge',           'ga_IE', '1    ', 'iso-8859-15', 'ga:en_IE:en_GB:en' ],
-#'gd' =>   [ 'Scottish gaelic',     'Gaidhlig',          'gb_GB', '1    ', 'iso-8859-14', 'gd:en_GB:en' ],
+#'gd' =>   [ 'Scottish gaelic',     'Gaidhlig',          'gb_GB', '1    ', 'utf_lat8', 'gd:en_GB:en' ],
 'gl' =>    [ 'Galego (Galician)',   'Galego',            'gl_ES', '1    ', 'iso-8859-15', 'gl:es_ES:es:pt:pt_BR' ],
-#'gv' =>   [ 'Manx gaelic',         'Gaelg',             'gv_GB', '1    ', 'iso-8859-14', 'gv:en_GB:en' ],
-'he' =>    [ 'Hebrew',              'AA Hebrew',         'he_IL', ' 2   ', 'iso-8859-8' ],
-#waiting-for-image 'hi' => [ 'Hindi',  'hi_IN',         ' 2   ', 'unicode' ],
+#'gv' =>   [ 'Manx gaelic',         'Gaelg',             'gv_GB', '1    ', 'utf_lat8', 'gv:en_GB:en' ],
+'he' =>    [ 'Hebrew',              'AA Ivrit',          'he_IL', ' 2   ', 'utf_he' ],
+#waiting-for-image 'hi' =>    [ 'Hindi',               'ZZ Hindi',          'hi_IN', ' 2   ', 'unicode' ],
 'hr' =>    [ 'Croatian',            'Hrvatski',          'hr_HR', '1    ', 'iso-8859-2' ],
 'hu' =>    [ 'Hungarian',           'Magyar',            'hu_HU', '1    ', 'iso-8859-2' ],
-'hy' =>    [ 'Armenian',            'ZZ Armenian',       'hy_AM', ' 2   ', 'armscii-8' ],
-#'ia' =>   [ 'Interlingua',         'Interlingua',       'ia_XX', '1   5', 'unicode' ],
+'hy' =>    [ 'Armenian',            'ZZ Armenian',       'hy_AM', ' 2   ', 'utf_hy' ],
+#'ia' =>   [ 'Interlingua',         'Interlingua',       'ia_XX', '1   5', 'utf8' ],
 'id' =>    [ 'Indonesian',          'Bahasa Indonesia',  'id_ID', ' 2   ', 'iso-8859-1' ],
 'is' =>    [ 'Icelandic',           'Islenska',          'is_IS', '1    ', 'iso-8859-1' ],
 'it' =>    [ 'Italian',             'Italiano',          'it_IT', '1    ', 'iso-8859-15' ],
 #-'iu' =>  [ 'Inuktitut',           'ZZ Inuktitut',      'iu_CA', '    5', 'utf_iu' ],
 'ja' =>    [ 'Japanese',            'ZZ Nihongo',        'ja_JP', ' 2   ', 'jisx0208' ],
-'ka' =>    [ 'Georgian',            'ZZ Georgian',       'ka_GE', ' 2   ', 'georgian-ps' ],
+'ka' =>    [ 'Georgian',            'ZZ Georgian',       'ka_GE', ' 2   ', 'utf_ka' ],
 #-'kl' =>  [ 'Greenlandic (inuit)', 'ZZ Inuit',          'kl_GL', '    5', 'iso-8859-1' ],
 'ko' =>    [ 'Korean',              'ZZ Korea',          'ko_KR', ' 2   ', 'ksc5601' ],
-#-'kw' =>  [ 'Cornish gaelic',      'Kernewek',          'kw_GB', '1    ', 'iso-8859-14', 'kw:en_GB:en' ],
+#-'kw' =>  [ 'Cornish gaelic',      'Kernewek',          'kw_GB', '1    ', 'utf_lat8', 'kw:en_GB:en' ],
 #waiting-for-image 'lo' => [ 'Laotian',  'lo_LA', ' 2   ', 'utf_lo' ],
 'lt' =>    [ 'Lithuanian',          'Lietuviskai',       'lt_LT', '1    ', 'iso-8859-13' ],
 'lv' =>    [ 'Latvian',             'Latviesu',          'lv_LV', '1    ', 'iso-8859-13' ],
-'mi' =>    [ 'Maori',               'Maori',             'mi_NZ', '   4 ', 'iso-8859-13' ],
-'mk' =>    [ 'Macedonian',          'Macedonian',        'mk_MK', '1    ', 'cp1251' ],
+'mi' =>    [ 'Maori',               'Maori',             'mi_NZ', '   4 ', 'unicode' ],
+'mk' =>    [ 'Macedonian',          'Makedonski',        'mk_MK', '1    ', 'utf_cyr1' ],
 'ms' =>    [ 'Malay',               'Bahasa Melayu',     'ms_MY', ' 2   ', 'iso-8859-1' ],
-'mt' =>    [ 'Maltese',             'Maltin',            'mt_MT', '1 3  ', 'iso-8859-3' ],
+'mt' =>    [ 'Maltese',             'Maltin',            'mt_MT', '1 3  ', 'unicode' ],
 'nb' =>    [ 'Norwegian Bokmaal',   'Norsk, Bokmal',     'no_NO', '1    ', 'iso-8859-1',  'nb:no' ],
 'nl' =>    [ 'Dutch',               'Nederlands',        'nl_NL', '1    ', 'iso-8859-15' ],
 'nn' =>    [ 'Norwegian Nynorsk',   'Norsk, Nynorsk',    'nn_NO', '1    ', 'iso-8859-1',  'nn:no@nynorsk:no_NY:no:nb' ],
@@ -80,25 +80,26 @@ my %langs = (
 'pt' =>    [ 'Portuguese',          'Portugues',         'pt_PT', '1 3  ', 'iso-8859-15', 'pt_PT:pt:pt_BR' ],
 'pt_BR' => [ 'Portuguese Brazil', 'Portugues do Brasil', 'pt_BR', '    5', 'iso-8859-1',  'pt_BR:pt_PT:pt' ],
 'ro' =>    [ 'Romanian',            'Romana',            'ro_RO', '1    ', 'iso-8859-2' ],
-'ru' =>    [ 'Russian',             'Russann',           'ru_RU', '12   ', 'koi8-r' ],
+'ru' =>    [ 'Russian',             'Russkij',           'ru_RU', '12   ', 'koi8-r' ],
 'sk' =>    [ 'Slovak',              'Slovencina',        'sk_SK', '1    ', 'iso-8859-2' ],
 'sl' =>    [ 'Slovenian',           'Slovenscina',       'sl_SI', '1    ', 'iso-8859-2' ],
-'sp' =>    [ 'Serbian Cyrillic',    'Serbian',           'sp_YU', '1    ', 'cp1251',      'sp:sr' ],
-'sr' =>    [ 'Serbian Latin',       'Serbian',           'sr_YU', '1    ', 'iso-8859-2' ], 
+'sp' =>    [ 'Serbian Cyrillic',    'Srpska',            'sp_YU', '1    ', 'iso-8859-5',      'sp:sr' ],
+'sq' =>    [ 'Albanian',            'Shqip',             'sq_AL', '1    ', 'iso-8859-1' ], 
+'sr' =>    [ 'Serbian Latin',       'Srpska',            'sr_YU', '1    ', 'iso-8859-2' ], 
 'sv' =>    [ 'Swedish',             'Svenska',           'sv_SE', '1    ', 'iso-8859-1' ],
-'ta' =>    [ 'Tamil',               'ZZ Tamil',          'ta_IN', ' 2   ', 'tscii' ],
-'tg' =>    [ 'Tajik',               'ZZ Tajik',          'tg_TJ', ' 2   ', 'koi8-k' ],
+'ta' =>    [ 'Tamil',               'ZZ Tamil',          'ta_IN', ' 2   ', 'utf_ta' ],
+'tg' =>    [ 'Tajik',               'Tojiki',            'tg_TJ', ' 2   ', 'utf_cyr2' ],
 'th' =>    [ 'Thai',                'ZZ Thai',           'th_TH', ' 2   ', 'tis620' ],
 'tr' =>    [ 'Turkish',             'Turkce',            'tr_TR', ' 2   ', 'iso-8859-9' ],
-#-'tt' =>  [ 'Tatar',               'Tatar',             'tt_RU', ' 2   ', 'koi8-k' ],
-'uk' =>    [ 'Ukrainian',           'Ukrainian',         'uk_UA', '1    ', 'koi8-u' ],
-#-'ur' =>  [ 'Urdu',                'Urdu',              'ur_PK', ' 2   ', 'unicode' ],  
-'uz' =>    [ 'Uzbek',               'Ozbekcha',          'uz_UZ', ' 2   ', 'iso-8859-1' ],
-'vi' =>    [ 'Vietnamese',          'Tieng Viet',        'vi_VN', ' 2   ', 'tcvn' ],
+#-'tt' =>  [ 'Tatar',               'Tatar',             'tt_RU', ' 2   ', 'utf_cyr2' ],
+'uk' =>    [ 'Ukrainian',           'Ukrayinska',        'uk_UA', '1    ', 'koi8-u' ],
+#-'ur' =>  [ 'Urdu',                'AA Urdu',           'ur_PK', ' 2   ', 'utf_ar' ],  
+'uz' =>    [ 'Uzbek',               'Ozbekcha',          'uz_UZ', ' 2   ', 'unicode' ],
+'vi' =>    [ 'Vietnamese',          'Tieng Viet',        'vi_VN', ' 2   ', 'utf_vi' ],
 'wa' =>    [ 'Walon',               'Walon',             'wa_BE', '1    ', 'iso-8859-15', 'wa:fr_BE:fr' ],
-#-'yi' =>  [ 'Yiddish',             'AA Yiddish',        'yi_US', '1   5', 'cp1255' ],
-'zh_TW' => [ 'Chinese Traditional', 'ZZ Chinese',        'zh_TW', ' 2   ', 'Big5',        'zh_TW.Big5:zh_TW:zh_HK:zh' ],
-'zh_CN' => [ 'Chinese Simplified',  'ZZ Chinese',        'zh_CN', ' 2   ', 'gb2312',      'zh_CN.GB2312:zh_CN:zh' ],
+#-'yi' =>  [ 'Yiddish',             'AA Yidish',         'yi_US', '1   5', 'utf_he' ],
+'zh_TW' => [ 'Chinese Traditional', 'ZZ ZhongWen',       'zh_TW', ' 2   ', 'Big5',        'zh_TW.Big5:zh_TW:zh_HK:zh' ],
+'zh_CN' => [ 'Chinese Simplified',  'ZZ ZhongWen',       'zh_CN', ' 2   ', 'gb2312',      'zh_CN.GB2312:zh_CN:zh' ],
 );
 sub l2name           { exists $langs{$_[0]} && $langs{$_[0]}[0] }
 sub l2transliterated { exists $langs{$_[0]} && $langs{$_[0]}[1] }
@@ -118,68 +119,254 @@ sub list_langs {
 #- key: country name (that should be YY in xx_YY locale)
 #- [0]: country name in natural language
 #- [1]: default locale for that country 
+#- [2]: geographic groups that this country belongs to (for displaying
+#-      in the menu grouped in smaller lists), 1=Europe, 2=Asia, 3=Africa,
+#-      4=Oceania&Pacific, 5=America (if you wonder, it's the order
+#-      used in the olympic flag)
+#-
+#- Note: for countries for which a glibc locale don't exist (yet) I tried to
+#- put a locale that makes sense; and a '#' at the end of the line to show
+#- the locale is not the "correct" one. 'en_US' is used when no good choice
+#- is available.
 my %countries = (
-'AM' => [ N("Armenia"),        'hy_AM' ],
-'AR' => [ N("Argentina"),      'es_AR' ],
-'AT' => [ N("Austria"),        'de_AT' ],
-'AU' => [ N("Australia"),      'en_AU' ],
-'AZ' => [ N("Azerbaijan"),     'az_AZ' ],
-'BA' => [ N("Bosnia"),         'bs_BA' ],
-'BE' => [ N("Belgium"),        'fr_BE' ],
-'BG' => [ N("Bulgaria"),       'bg_BG' ],
-'BR' => [ N("Brazil"),         'pt_BR' ],
-'BY' => [ N("Belarussia"),     'be_BY' ],
-'CA' => [ N("Canada"),         'en_CA' ],
-'CH' => [ N("Switzerland"),    'fr_CH' ],
-'CN' => [ N("China"),          'zh_CN' ],
-'CZ' => [ N("Czech Republic"), 'cs_CZ' ],
-'DE' => [ N("Germany"),        'de_DE' ],
-'DK' => [ N("Danmark"),        'da_DK' ],
-'EE' => [ N("Estonia"),        'et_EE' ],
-'ES' => [ N("Spain"),          'es_ES' ],
-'FI' => [ N("Finland"),        'fi_FI' ],
-'FR' => [ N("France"),         'fr_FR' ],
-'GB' => [ N("United Kingdom"), 'en_GB' ],
-'GE' => [ N("Georgia"),        'ka_GE' ],
-'GL' => [ N("Greenland"),      'kl_GL' ],
-'GR' => [ N("Greece"),         'el_GR' ],
-'HR' => [ N("Croatia"),        'hr_HR' ],
-'HU' => [ N("Hungary"),        'hu_HU' ],
-'ID' => [ N("Indonesia"),      'id_ID' ],
-'IE' => [ N("Ireland"),        'en_IE' ],
-'IL' => [ N("Israel"),         'he_IL' ],
-'IN' => [ N("India"),          'hi_IN' ],
-'IR' => [ N("Iran"),           'fa_IR' ],
-'IS' => [ N("Iceland"),        'is_IS' ],
-'IT' => [ N("Italy"),          'it_IT' ],
-'JP' => [ N("Japan"),          'ja_JP' ],
-'KR' => [ N("Korea"),          'ko_KR' ],
-'LT' => [ N("Lithuania"),      'lt_LT' ],
-'LV' => [ N("Latvia"),         'lv_LV' ],
-'MK' => [ N("Macedonia"),      'mk_MK' ],
-'MT' => [ N("Malta"),          'mt_MT' ],
-'MX' => [ N("Mexico"),         'es_MX' ],
-'MY' => [ N("Malaysia"),       'ms_MY' ],
-'NL' => [ N("Netherlands"),    'nl_NL' ],
-'NO' => [ N("Norway"),         'no_NO' ],
-'NZ' => [ N("New Zealand"),    'en_NZ' ],
-'PL' => [ N("Poland"),         'pl_PL' ],
-'PT' => [ N("Portugal"),       'pt_PT' ],
-'RO' => [ N("Romania"),        'ro_RO' ],
-'RU' => [ N("Russia"),         'ru_RU' ],
-'SE' => [ N("Sweden"),         'sv_SE' ],
-'SI' => [ N("Slovenia"),       'sl_SI' ],
-'SK' => [ N("Slovakia"),       'sk_SK' ],
-'TH' => [ N("Thailand"),       'th_TH' ],
-'TJ' => [ N("Tajikistan"),     'tg_TJ' ],
-'TR' => [ N("Turkey"),         'tr_TR' ],
-'TW' => [ N("Taiwan"),         'zh_TW' ],
-'UA' => [ N("Ukraina"),        'uk_UA' ],
-'US' => [ N("United States"),  'en_US' ],
-'UZ' => [ N("Uzbekistan"),     'uz_UZ' ],
-'VN' => [ N("Vietnam"),        'vi_VN' ],
-'YU' => [ N("Serbia"),         'sp_YU' ],
-'ZA' => [ N("South Africa"),   'en_ZA' ],
+'AF' => [ N("Afghanistan"),    'en_US', '2' ], #
+'AD' => [ N("Andorra"),        'ca_ES', '1' ], #
+'AE' => [ N("United Arab Emirates"), 'ar_AE', '2' ],
+'AG' => [ N("Antigua and Barbuda"), 'en_US', '5' ], #
+'AI' => [ N("Anguilla"),       'en_US', '5' ], #
+'AL' => [ N("Albania"),        'sq_AL', '1' ],
+'AM' => [ N("Armenia"),        'hy_AM', '2' ],
+'AN' => [ N("Netherlands Antilles"), 'en_US', '5' ], #
+'AO' => [ N("Angola"),         'pt_PT', '3' ], #
+'AQ' => [ N("Antarctica"),     'en_US', '4' ], #
+'AR' => [ N("Argentina"),      'es_AR', '5' ],
+'AS' => [ N("American Samoa"), 'en_US', '4' ], #
+'AT' => [ N("Austria"),        'de_AT', '1' ],
+'AU' => [ N("Australia"),      'en_AU', '4' ],
+'AW' => [ N("Aruba"),          'en_US', '?' ], #
+'AZ' => [ N("Azerbaijan"),     'az_AZ', '1' ],
+'BA' => [ N("Bosnia and Herzegovina"), 'bs_BA', '1' ],
+'BB' => [ N("Barbados"),       'en_US', '5' ], #
+'BD' => [ N("Bangladesh"),     'bn_BD', '2' ],
+'BE' => [ N("Belgium"),        'fr_BE', '1' ],
+'BF' => [ N("Burkina Faso"),   'en_US', '3' ], #
+'BG' => [ N("Bulgaria"),       'bg_BG', '1' ],
+'BH' => [ N("Bahrain"),        'ar_BH', '2' ],
+'BI' => [ N("Burundi"),        'en_US', '3' ], #
+'BJ' => [ N("Benin"),          'fr_FR', '3' ], #
+'BM' => [ N("Bermuda"),        'en_US', '5' ], #
+'BN' => [ N("Brunei Darussalam"), 'ar_EG', '2' ], #
+'BO' => [ N("Bolivia"),        'es_BO', '5' ],
+'BR' => [ N("Brazil"),         'pt_BR', '5' ],
+'BS' => [ N("Bahamas"),        'en_US', '5' ], #
+'BT' => [ N("Bhutan"),         'en_IN', '2' ], #
+'BV' => [ N("Bouvet Island"),  'en_US', '?' ], #
+'BW' => [ N("Botswana"),       'en_BW', '3' ],
+'BY' => [ N("Belarus"),        'be_BY', '1' ],
+'BZ' => [ N("Belize"),         'en_US', '5' ], #
+'CA' => [ N("Canada"),         'en_CA', '5' ],
+'CC' => [ N("Cocos (Keeling) Islands"), 'en_US', '?' ], #
+'CD' => [ N("Congo (Kinshasa)"), 'fr_FR', '3' ], #
+'CF' => [ N("Central African Republic"), 'fr_FR', '3' ], #
+'CG' => [ N("Congo (Brazzaville)"), 'fr_FR', '3' ], #
+'CH' => [ N("Switzerland"),    'de_CH', '1' ],
+'CI' => [ N("Cote d'Ivoire"),  'fr_FR', '3' ], #
+'CK' => [ N("Cook Islands"),   'en_US', '?' ], #
+'CL' => [ N("Chile"),          'es_CL', '5' ],
+'CM' => [ N("Cameroon"),       'fr_FR', '3' ], #
+'CN' => [ N("China"),          'zh_CN', '2' ],
+'CO' => [ N("Colombia"),       'es_CO', '5' ],
+'CR' => [ N("Costa Rica"),     'es_CR', '5' ],
+'CU' => [ N("Cuba"),           'es_DO', '5' ], #
+'CV' => [ N("Cape Verde"),     'pt_PT', '3' ], #
+'CX' => [ N("Christmas Island"), 'en_US', '?' ], #
+'CY' => [ N("Cyprus"),         'en_US', '1' ], #
+'CZ' => [ N("Czech Republic"), 'cs_CZ', '2' ],
+'DE' => [ N("Germany"),        'de_DE', '1' ],
+'DJ' => [ N("Djibouti"),       'en_US', '3' ], #
+'DK' => [ N("Denmark"),        'da_DK', '1' ],
+'DM' => [ N("Dominica"),       'en_US', '5' ], #
+'DO' => [ N("Dominican Republic"), 'es_DO', '5' ],
+'DZ' => [ N("Algeria"),        'ar_DZ', '3' ],
+'EC' => [ N("Ecuador"),        'es_EC', '5' ],
+'EE' => [ N("Estonia"),        'et_EE', '1' ],
+'EG' => [ N("Egypt"),          'ar_EG', '3' ],
+'EH' => [ N("Western Sahara"), 'ar_MA', '3' ], #
+'ER' => [ N("Eritrea"),        'ti_ER', '3' ],
+'ES' => [ N("Spain"),          'es_ES', '1' ],
+'ET' => [ N("Ethiopia"),       'am_ET', '3' ],
+'FI' => [ N("Finland"),        'fi_FI', '1' ],
+'FJ' => [ N("Fiji"),           'en_US', '4' ], #
+'FK' => [ N("Falkland Islands (Malvinas)"), 'en_GB', '5' ], #
+'FM' => [ N("Micronesia"),     'en_US', '4' ], #
+'FO' => [ N("Faroe Islands"),  'fo_FO', '1' ],
+'FR' => [ N("France"),         'fr_FR', '1' ],
+'GA' => [ N("Gabon"),          'fr_GA', '3' ], #
+'GB' => [ N("United Kingdom"), 'en_GB', '1' ],
+'GD' => [ N("Grenada"),        'en_US', '5' ], #
+'GE' => [ N("Georgia"),        'ka_GE', '2' ],
+'GF' => [ N("French Guiana"),  'fr_FR', '5' ], #
+'GH' => [ N("Ghana"),          'fr_FR', '3' ], #
+'GI' => [ N("Gibraltar"),      'en_GB', '1' ], #
+'GL' => [ N("Greenland"),      'kl_GL', '5' ],
+'GM' => [ N("Gambia"),         'en_US', '3' ], #
+'GN' => [ N("Guinea"),         'en_US', '3' ], #
+'GP' => [ N("Guadeloupe"),     'fr_FR', '5' ], #
+'GQ' => [ N("Equatorial Guinea"), 'en_US', '3' ], #
+'GR' => [ N("Greece"),         'el_GR', '1' ],
+'GS' => [ N("South Georgia and the South Sandwich Islands"), 'en_US', '?' ], #
+'GT' => [ N("Guatemala"),      'es_GT', '5' ],
+'GU' => [ N("Guam"),           'en_US', '4' ], #
+'GW' => [ N("Guinea-Bissau"),  'pt_PT', '3' ], #
+'GY' => [ N("Guyana"),         'en_US', '5' ], #
+'HK' => [ N("Hong Kong"),      'zh_HK', '2' ],
+'HM' => [ N("Heard and McDonald Islands"), 'en_US', '?' ], #
+'HN' => [ N("Honduras"),       'es_HN', '5' ],
+'HR' => [ N("Croatia"),        'hr_HR', '1' ],
+'HT' => [ N("Haiti"),          'fr_HT', '5' ],
+'HU' => [ N("Hungary"),        'hu_HU', '1' ],
+'ID' => [ N("Indonesia"),      'id_ID', '2' ],
+'IE' => [ N("Ireland"),        'en_IE', '1' ],
+'IL' => [ N("Israel"),         'he_IL', '2' ],
+'IN' => [ N("India"),          'hi_IN', '2' ],
+'IO' => [ N("British Indian Ocean Territory"), 'en_GB', '2' ], #
+'IQ' => [ N("Iraq"),           'ar_IQ', '2' ],
+'IR' => [ N("Iran"),           'fa_IR', '2' ],
+'IS' => [ N("Iceland"),        'is_IS', '1' ],
+'IT' => [ N("Italy"),          'it_IT', '1' ],
+'JM' => [ N("Jamaica"),        'en_US', '5' ], #
+'JO' => [ N("Jordan"),         'ar_JO', '2' ],
+'JP' => [ N("Japan"),          'ja_JP', '2' ],
+'KE' => [ N("Kenya"),          'en_ZW', '3' ], #
+'KG' => [ N("Kyrgyzstan"),     'en_US', '2' ], #
+'KH' => [ N("Cambodia"),       'kh_KH', '2' ],
+'KI' => [ N("Kiribati"),       'en_US', '3' ], #
+'KM' => [ N("Comoros"),        'en_US', '2' ], #
+'KN' => [ N("Saint Kitts and Nevis"), 'en_US', '?' ], #
+'KP' => [ N("Korea (North)"),  'ko_KR', '2' ], #
+'KR' => [ N("Korea"),          'ko_KR', '2' ],
+'KW' => [ N("Kuwait"),         'ar_KW', '2' ],
+'KY' => [ N("Cayman Islands"), 'en_US', '5' ], #
+'KZ' => [ N("Kazakhstan"),     'kk_KZ', '2' ],
+'LA' => [ N("Laos"),           'lo_LA', '2' ],
+'LB' => [ N("Lebanon"),        'ar_LB', '2' ],
+'LC' => [ N("Saint Lucia"),    'en_US', '5' ], #
+'LI' => [ N("Liechtenstein"),  'de_CH', '1' ], #
+'LK' => [ N("Sri Lanka"),      'en_IN', '2' ], #
+'LR' => [ N("Liberia"),        'en_US', '3' ], #
+'LS' => [ N("Lesotho"),        'en_BW', '3' ], #
+'LT' => [ N("Lithuania"),      'lt_LT', '1' ],
+'LU' => [ N("Luxembourg"),     'de_LU', '1' ],
+'LV' => [ N("Latvia"),         'lv_LV', '1' ],
+'LY' => [ N("Libya"),          'ar_LY', '3' ],
+'MA' => [ N("Morocco"),        'ar_MA', '3' ],
+'MC' => [ N("Monaco"),         'fr_FR', '1' ], #
+'MD' => [ N("Moldova"),        'ro_RO', '1' ], #
+'MG' => [ N("Madagascar"),     'fr_FR', '3' ], #
+'MH' => [ N("Marshall Islands"), 'en_US', '4' ], #
+'MK' => [ N("Macedonia"),      'mk_MK', '1' ],
+'ML' => [ N("Mali"),           'en_US', '3' ], #
+'MM' => [ N("Myanmar"),        'en_US', '2' ], #
+'MN' => [ N("Mongolia"),       'mn_MN', '2' ],
+'MP' => [ N("Northern Mariana Islands"), 'en_US', '?' ], #
+'MQ' => [ N("Martinique"),     'fr_FR', '5' ], #
+'MR' => [ N("Mauritania"),     'en_US', '3' ], #
+'MS' => [ N("Montserrat"),     'en_US', '?' ], #
+'MT' => [ N("Malta"),          'mt_MT', '1' ],
+'MU' => [ N("Mauritius"),      'en_US', '?' ], #
+'MV' => [ N("Maldives"),       'en_US', '4' ], #
+'MW' => [ N("Malawi"),         'en_US', '3' ], #
+'MX' => [ N("Mexico"),         'es_MX', '5' ],
+'MY' => [ N("Malaysia"),       'ms_MY', '2' ],
+'MZ' => [ N("Mozambique"),     'pt_PT', '3' ], #
+'NA' => [ N("Namibia"),        'en_US', '3' ], #
+'NC' => [ N("New Caledonia"),  'fr_FR', '4' ], #
+'NE' => [ N("Niger"),          'en_US', '3' ], #
+'NF' => [ N("Norfolk Island"), 'en_GB', '?' ], #
+'NG' => [ N("Nigeria"),        'en_US', '3' ], #
+'NI' => [ N("Nicaragua"),      'es_NI', '5' ],
+'NL' => [ N("Netherlands"),    'nl_NL', '1' ],
+'NO' => [ N("Norway"),         'no_NO', '1' ],
+'NP' => [ N("Nepal"),          'en_IN', '2' ], #
+'NR' => [ N("Nauru"),          'en_US', '?' ], #
+'NU' => [ N("Niue"),           'en_US', '?' ], #
+'NZ' => [ N("New Zealand"),    'en_NZ', '4' ],
+'OM' => [ N("Oman"),           'ar_OM', '2' ],
+'PA' => [ N("Panama"),         'es_PA', '5' ],
+'PE' => [ N("Peru"),           'es_PE', '5' ],
+'PF' => [ N("French Polynesia"), 'fr_FR', '4' ], #
+'PG' => [ N("Papua New Guinea"), 'en_NZ', '4' ], #
+'PH' => [ N("Philippines"),    'ph_PH', '2' ],
+'PK' => [ N("Pakistan"),       'ur_PK', '2' ],
+'PL' => [ N("Poland"),         'pl_PL', '1' ],
+'PM' => [ N("Saint Pierre and Miquelon"), 'fr_CA', '5' ], #
+'PN' => [ N("Pitcairn"),      'en_US', '4' ], #
+'PR' => [ N("Puerto Rico"),    'es_PR', '5' ],
+'PS' => [ N("Palestine"),      'ar_JO', '2' ], #
+'PT' => [ N("Portugal"),       'pt_PT', '1' ],
+'PY' => [ N("Paraguay"),       'es_PY', '5' ],
+'PW' => [ N("Palau"),          'en_US', '?' ], #
+'QA' => [ N("Qatar"),          'ar_QA', '2' ],
+'RE' => [ N("Reunion"),        'fr_FR', '?' ], #
+'RO' => [ N("Romania"),        'ro_RO', '1' ],
+'RU' => [ N("Russia"),         'ru_RU', '1' ],
+'RW' => [ N("Rwanda"),         'fr_FR', '3' ], #
+'SA' => [ N("Saudi Arabia"),   'ar_SA', '2' ],
+'SB' => [ N("Solomon Islands"), 'en_US', '4' ], #
+'SC' => [ N("Seychelles"),     'en_US', '4' ], #
+'SD' => [ N("Sudan"),          'ar_SD', '5' ],
+'SE' => [ N("Sweden"),         'sv_SE', '1' ],
+'SG' => [ N("Singapore"),      'en_SG', '2' ],
+'SH' => [ N("Saint Helena"),   'en_GB', '5' ], #
+'SI' => [ N("Slovenia"),       'sl_SI', '1' ],
+'SJ' => [ N("Svalbard and Jan Mayen Islands"), 'en_US', '?' ], #
+'SK' => [ N("Slovakia"),       'sk_SK', '1' ],
+'SL' => [ N("Sierra Leone"),   'en_US', '3' ], #
+'SM' => [ N("San Marino"),     'it_IT', '1' ], #
+'SN' => [ N("Senegal"),        'fr_FR', '3' ], #
+'SO' => [ N("Somalia"),        'en_US', '3' ], #
+'SR' => [ N("Suriname"),       'nl_NL', '5' ], #
+'ST' => [ N("Sao Tome and Principe"), 'en_US', '5' ], #
+'SV' => [ N("El Salvador"),    'es_SV', '5' ],
+'SY' => [ N("Syria"),          'ar_SY', '2' ],
+'SZ' => [ N("Swaziland"),      'en_BW', '3' ], #
+'TC' => [ N("Turks and Caicos Islands"), 'en_US', '?' ], #
+'TD' => [ N("Chad"),           'en_US', '3' ], #
+'TF' => [ N("French Southern Territories"), 'fr_FR', '?' ], #
+'TG' => [ N("Togo"),           'fr_FR', '3' ], #
+'TH' => [ N("Thailand"),       'th_TH', '2' ],
+'TJ' => [ N("Tajikistan"),     'tg_TJ', '2' ],
+'TK' => [ N("Tokelau"),        'en_US', '?' ], #
+'TL' => [ N("East Timor"),     'pt_PT', '4' ], #
+'TM' => [ N("Turkmenistan"),   'en_US', '2' ], #
+'TN' => [ N("Tunisia"),        'ar_TN', '5' ],
+'TO' => [ N("Tonga"),          'en_US', '3' ], #
+'TR' => [ N("Turkey"),         'tr_TR', '2' ],
+'TT' => [ N("Trinidad and Tobago"), 'en_US', '5' ], #
+'TV' => [ N("Tuvalu"),         'en_US', '?' ], #
+'TW' => [ N("Taiwan"),         'zh_TW', '2' ],
+'TZ' => [ N("Tanzania"),       'en_US', '3' ], #
+'UA' => [ N("Ukraine"),        'uk_UA', '1' ],
+'UG' => [ N("Uganda"),         'en_US', '3' ], #
+'UM' => [ N("United States Minor Outlying Islands"), 'en_US', '?' ], #
+'US' => [ N("United States"),  'en_US', '5' ],
+'UY' => [ N("Uruguay"),        'es_UY', '5' ],
+'UZ' => [ N("Uzbekistan"),     'uz_UZ', '2' ],
+'VA' => [ N("Vatican"),       'it_IT', '1' ], #
+'VC' => [ N("Saint Vincent and the Grenadines"), 'en_US', '5' ], 
+'VE' => [ N("Venezuela"),      'es_VE', '5' ],
+'VG' => [ N("Virgin Islands (British)"), 'en_GB', '5' ], #
+'VI' => [ N("Virgin Islands (U.S.)"), 'en_US', '5' ], #
+'VN' => [ N("Vietnam"),        'vi_VN', '2' ],
+'VU' => [ N("Vanuatu"),        'en_US', '?' ], #
+'WF' => [ N("Wallis and Futuna"), 'fr_FR', '4' ], #
+'WS' => [ N("Samoa"),          'en_US', '4' ], #
+'YE' => [ N("Yemen"),          'ar_YE', '2' ],
+'YT' => [ N("Mayotte"),        'fr_FR', '?' ], #
+'YU' => [ N("Serbia"),         'sp_YU', '1' ],
+'ZA' => [ N("South Africa"),   'en_ZA', '5' ],
+'ZM' => [ N("Zambia"),         'en_US', '3' ], #
+'ZW' => [ N("Zimbabwe"),       'en_ZW', '5' ],
 );
 sub c2name   { exists $countries{$_[0]} && $countries{$_[0]}[0] }
 sub c2locale { exists $countries{$_[0]} && $countries{$_[0]}[1] }
@@ -295,46 +482,40 @@ my %xim = (
 #- [3]: iocharset param for mount (utf8 if utf8)
 #- [4]: codepage parameter for mount (none if utf8)
 my %charsets = (
-"armscii-8"   => [ "arm8",        undef,   "armscii-8",     undef,        undef ],
 #- chinese needs special console driver for text mode
 "Big5"        => [ undef,         undef,   undef,           "big5",       "950" ],
 "gb2312"      => [ undef,         undef,   undef,           "gb2312",     "936" ],
 "C"           => [ "lat0-16",     undef,   "iso15",         "iso8859-1",  "850" ],
 "iso-8859-1"  => [ "lat1-16",     undef,   "iso01",         "iso8859-1",  "850" ],
 "iso-8859-2"  => [ "lat2-sun16",  undef,   "iso02",         "iso8859-2",  "852" ],
-"iso-8859-3"  => [ "iso03.f16",   undef,   "iso03",         "iso8859-3",  undef ],
-#-"iso-8859-4"=> [ "lat4u-16",    undef,   "iso04",         "iso8859-4",  "775" ],
-#-"iso-8859-5"=> [ "UniCyr_8x16", undef,   "iso05",         "iso8859-5",  "855" ],
-#- arabic needs special console driver for text mode [acon] (and gtk support isn't done yet)
-"iso-8859-6"  => [ "iso06.f16",   undef,   "iso06",         "iso8859-6",  "864" ],
+"iso-8859-5"  => [ "UniCyr_8x16", undef,   "iso05",         "iso8859-5",  "866" ],
 "iso-8859-7"  => [ "iso07.f16",   undef,   "iso07",         "iso8859-7",  "869" ],
-#- hebrew needs special console driver for text mode [acon] (and gtk support isn't done yet)
-"iso-8859-8"  => [ "iso08.f16",   undef,   "iso08",         "iso8859-8",  "862" ],
 "iso-8859-9"  => [ "lat5u-16",    undef,   "iso09",         "iso8859-9",  "857" ],
 "iso-8859-13" => [ "tlat7",       undef,   "iso13",         "iso8859-13", "775" ],
-"iso-8859-14" => [ "iso14.f16",   undef,   "iso14",         "iso8859-14", "850" ],
 "iso-8859-15" => [ "lat0-16",     undef,   "iso15",         "iso8859-15", "850" ],
-"iso-8859-9e" => [ "tiso09e",     undef,   "iso09e",        undef,        undef ],
 #- japanese needs special console driver for text mode [kon2]
 "jisx0208"    => [ undef,         undef,   "trivial.trans", "euc-jp",     "932" ],
 "koi8-r"      => [ "UniCyr_8x16", undef,   "koi8-r",        "koi8-r",     "866" ],
 "koi8-u"      => [ "UniCyr_8x16", undef,   "koi8-u",        "koi8-u",     "866" ],
-"georgian-ps" => [ "t_geors",     undef,   undef,           "utf8",       undef ],
-"koi8-k"      => [ "koi8-k",      undef,   undef,           "utf8",       undef ],
 "cp1251"      => [ "UniCyr_8x16", undef,   "cp1251",        "cp1251",     "866" ],
-#- Yiddish needs special console driver for text mode [acon] (and gtk support isn't done yet)
-#-"cp1255"    => [ "iso08.f16",   "iso08", "trivial.trans", "cp1255",     "862" ],
-#- Urdu needs special console driver for text mode [acon] (and gtk support isn't done yet)
-#-"cp1256"    => [ undef,         undef,   "trivial.trans", undef,        "864" ],
 #- korean needs special console driver for text mode
 "ksc5601"     => [ undef,         undef,   undef,           "euc-kr",     "949" ],
 #- I have no console font for Thai...
 "tis620"      => [ undef,         undef,   "trivial.trans", "tis-620",    "874" ],
-"tcvn"        => [ "tcvn8x16",    undef,   "tcvn",          undef,        undef ],
-#- Tamil uses pseudo iso-8859-1 fonts
-"tscii"       => [ "tamil",       undef,   "tscii-0",       undef,        undef ],
-"utf_am"      => [ "Agafari-16",  undef,   undef,           "utf8",       undef ],
-"unicode"     => [ undef,         undef,   undef,           "utf8",       undef ],
+# UTF-8 encodings here; they differ in the console font mainly.
+"utf_am"      => [ "Agafari-16",     undef,   undef,      "utf8",    undef ],
+"utf_ar"      => [ "iso06.f16",      undef,   undef,      "utf8",    undef ],
+"utf_az"      => [ "tiso09e",        undef,   undef,      "utf8",    undef ],
+"utf_cyr1"    => [ "UniCyr_8x16",    undef,   undef,      "utf8",    undef ],
+"utf_cyr2"    => [ "koi8-k",         undef,   undef,      "utf8",    undef ],
+"utf_he"      => [ "iso08.f16",      undef,   undef,      "utf8",    undef ],
+"utf_hy"      => [ "arm8",           undef,   undef,      "utf8",    undef ],
+"utf_ka"      => [ "t_geors",        undef,   undef,      "utf8",    undef ],
+"utf_ta"      => [ "tamil",          undef,   undef,      "utf8",    undef ],
+"utf_vi"      => [ "tcvn8x16",       undef,   undef,      "utf8",    undef ],
+"utf_lat8"    => [ "iso14.f16",      undef,   undef,      "utf8",    undef ],
+# default for utf-8 encodings
+"unicode"     => [ "LatArCyrHeb-16", undef,   undef,      "utf8",    undef ],
 );
 
 #- for special cases not handled magically
@@ -346,8 +527,8 @@ my %charset2kde_charset = (
     cp1251 => 'microsoft-cp1251',
     utf8 => 'iso10646-1',
     tis620 => 'tis620-0',
-    #- TSCII works using a pseudo iso-8859-1 encoding
-    tscii => 'iso8859-1',
+    #- Tamil KDE translations still use TSCII, and KDE know it as iso-8859-1
+    utf_ta => 'iso8859-1',
 );
 
 my @during_install__lang_having_their_LC_CTYPE = qw(ja ko ta);
@@ -422,20 +603,18 @@ my %charset2kde_font = (
   'iso-8859-2'  => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
   'iso-8859-9'  => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
   'iso-8859-15' => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
-  'jisx0208' => [ "misc-fixed,14", "wadalab-gothic,13" ],
+  'jisx0208' => [ "misc-fixed,14", "Kochi-Gothic,13" ],
   'ksc5601' => [ "daewoo-gothic,16" ],
   'gb2312' => [ "default-ming,16" ],
   'Big5' => [ "taipei-fixed,16" ],
   'tis620' => [ "misc-norasi,17", ],
-  'tcvn' => [ "misc-fixed,13", "misc-fixed,13", "misc-fixed,10", ],
-  #- TSCII uses pseudo iso-8859-1 fonts, it is important to choose them
-  #- correctly
-  'tscii' => [ "tsc_avarangal,14", "tsc_avarangalfxd,10", "tsc_avarangal,12", ],
   #- the following should be changed to better defaults when better fonts
   #- get available
-  'armscii-8' => [ "clearlyu,17" ],
-  'georgian-ps' => [ "clearlyu,17" ],
   'utf_am' => [ "clearlyu,17" ],
+  'utf_hy' => [ "clearlyu,17" ],
+  'utf_ka' => [ "clearlyu,17" ],
+  'utf_ta' => [ "TSCu_Paranar,14", "TSC_Avarangalfxd,10", "TSCu_Paranar,12", ],
+  'utf_vi' => [ "misc-fixed,13", "misc-fixed,13", "misc-fixed,10", ],
   'default' => [ "misc-fixed,13", "misc-fixed,13", "misc-fixed,10", ],
 );
 
@@ -456,13 +635,14 @@ sub charset2kde_font {
 # an appropriate font for each language.
 my %charset2pango_font = (
   'tis620' =>      "Norasi",
-  'tscii' =>       "TSC_Avarangal",
-  'tcvn' =>        "ClearlyU",
-  'armscii-8' =>   "Artsounk",
-  'georgian-ps' => "ClearlyU",
-  'iso-8859-6' =>  "ClearlyU",
+  'utf_ar' =>      "KacstBook",
+  'utf_cyr2' =>    "URW Bookman L",
+  'utf_he' =>      "ClearlyU",
+  'utf_hy' =>      "Artsounk",
+  'utf_ka' =>      "ClearlyU",
+  'utf_ta' =>      "TSCu_Paranar",
+  'utf_vi' =>      "ClearlyU",
   'iso-8859-7' =>  "Kerkis",
-  'iso-8859-8' =>  "KacstBook",
   #- Nimbus Sans L is missing some chars used by some cyrillic languages,
   #- but tose haven't yet DrakX translations; it also misses vietnamese
   #- latin chars; all other latin and cyrillic are covered.