- remove utf_xxx charsets, adding a flag UTF-8 instead

- add during_install__lang2charset
- when using ramdisk, no locale.cz2 anymore:
    there are 3 main charsets containing everything for all locales, except LC_CTYPE
    by default, there is UTF-8.
    when asked for GB2312 or BIG5, removing the other main charsets
- cleanup comments (use #- instead of #)
- various cleanup

1 files changed, 179 insertions, 210 deletions

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 5c70b235c..ea9a39f20 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -14,70 +14,69 @@ use log;
 #-######################################################################################
 #- key (to be used in $LC_ALL), [0] = english name, [1] = charset encoding,
 #- [2] = value for $LANG used by DrakX, [3] = value for LANGUAGE (a list of
-#- possible languages, carefully choosen)
+#- possible languages, carefully choosen), [4] = use utf8 or not (boolean)
 #-
 #- when adding a new language here, also add a line in keyboards list
 
-#
-# NOTE: we cheat for a lot of locales (in particular UTF-8, in DrakX they are
-# the 8bit ones); it's easier like that now. Of course, on the installed
-# system a real UTF-8 locale will be used
-#
+#-
+#- NOTE: we cheat for a lot of locales (in particular UTF-8, in DrakX they are
+#- the 8bit ones); it's easier like that now. Of course, on the installed
+#- system a real UTF-8 locale will be used
+#-
 
 my %languages = my @languages = (
 'en_US' => [ 'English|United States',	'C', 'en', 'en_US:en' ],
 'en_GB' => [ 'English|United Kingdom',	'iso-8859-15', 'en', 'en_GB:en' ],
 'en_IE' => [ 'English|Ireland',		'iso-8859-15','en', 'en_IE:en_GB:en' ],
-'en_US.UTF-8'=> [ 'English|UTF-8',	'utf_15',     'en', 'en_US:en' ],
+'en_US.UTF-8'=> [ 'English|UTF-8',	'iso-8859-15',     'en', 'en_US:en', 'UTF-8', ],
   'af'  => [ 'Afrikaans',		'iso-8859-1', 'af', 'af:en_ZA' ],
-'ar_EG.UTF-8'=> [ 'Arabic',		'utf_ar',     'ar', 'ar' ],
+'ar_EG.UTF-8'=> [ 'Arabic',		'iso-8859-6',     'ar', 'ar', 'UTF-8' ],
 #'az_AZ.ISO-8859-9E'=> [ 'Azeri (Latin)','iso-8859-9e','az', 'az:tr' ],
-'az_AZ.UTF-8'=> [ 'Azeri (Latin)',	'utf_az',     'az', 'az:tr' ],
+'az_AZ.UTF-8'=> [ 'Azeri (Latin)',	'iso-8859-9e',     'az', 'az:tr', 'UTF-8' ],
   'be'  => [ 'Belarussian (CP1251)',	'cp1251',     'be', 'be:be_BY.CP1251:ru_RU.CP1251' ],
-'be_BY.UTF-8'  => [ 'Belarussian (UTF-8)','utf_1251',   'be', 'be:be_BY.CP1251:ru_RU.CP1251' ],
+'be_BY.UTF-8'  => [ 'Belarussian (UTF-8)','cp1251',   'be', 'be:be_BY.CP1251:ru_RU.CP1251', 'UTF-8' ],
 #- provide aliases for some not very standard names used in po files...
   'bg'  => [ 'Bulgarian (CP1251)',	'cp1251',     'bg', 'bg:bg.CP1251:bg_BG.CP1251:bg_BG' ],
-'bg_BG.UTF-8'=> [ 'Bulgarian (UTF-8)',	'utf_1251',   'bg', 'bg:bg.CP1251:bg_BG.CP1251:bg_BG' ],
+'bg_BG.UTF-8'=> [ 'Bulgarian (UTF-8)',	'cp1251',   'bg', 'bg:bg.CP1251:bg_BG.CP1251:bg_BG', 'UTF-8' ],
   'br'  => [ 'Brezhoneg',		'iso-8859-15','br', 'br:fr_FR:fr' ],
   'bs'  => [ 'Bosnian',			'iso-8859-2', 'bs', 'bs:hr:sr' ],
 'ca_ES' => [ 'Catalan',			'iso-8859-15','ca', 'ca:es_ES:es' ],
   'cs'  => [ 'Czech',			'iso-8859-2', 'cs', 'cs' ],
-#  'cy'  => [ 'Cymraeg (Welsh)','iso-8859-14','cy', 'cy:en_GB:en' ],
-'cy_GB.UTF-8'=> [ 'Cymraeg (Welsh)',	'utf_14',   'cy', 'cy:en_GB:en' ],
+#-  'cy'  => [ 'Cymraeg (Welsh)','iso-8859-14','cy', 'cy:en_GB:en' ],
+'cy_GB.UTF-8'=> [ 'Cymraeg (Welsh)',	'iso-8859-14',   'cy', 'cy:en_GB:en', 'UTF-8' ],
   'da'  => [ 'Danish',			'iso-8859-15', 'da', 'da' ],		
 'de_AT' => [ 'German|Austria',		'iso-8859-15','de', 'de_AT:de' ],
 'de_BE' => [ 'German|Belgium',		'iso-8859-15','de', 'de_BE:de' ],
 'de_CH' => [ 'German|Switzerland',	'iso-8859-15', 'de', 'de_CH:de' ],
 'de_DE' => [ 'German|Germany',		'iso-8859-15','de', 'de_DE:de' ],
   'el'  => [ 'Greek',        'iso-8859-7', 'el', 'el' ],
-'el_GR.UTF-8'=> [ 'Greek (UTF-8)',        'utf_el',     'el', 'el' ],
-  'eo'  => [ 'Esperanto',		'utf_3',      'eo', 'eo' ],
+'el_GR.UTF-8'=> [ 'Greek (UTF-8)',        'iso-8859-7',     'el', 'el', 'UTF-8' ],
+  'eo'  => [ 'Esperanto',		'iso-8859-3',      'eo', 'eo', 'UTF-8' ],
 'es_AR' => [ 'Spanish|Argentina',	'iso-8859-1', 'es', 'es_AR:es_UY:es:es_ES' ],
 'es_ES' => [ 'Spanish|Spain (modern sorting)',	'iso-8859-15', 'es', 'es_ES:es' ],
 'es@tradicional' => [ 'Spanish|Spain (traditional sorting)', 'iso-8859-15', 'es', 'es' ],
-'es_ES.UTF-8'=> [ 'Spanish|Spain (UTF-8)','utf_15', 'es', 'es_ES:es' ],
+'es_ES.UTF-8'=> [ 'Spanish|Spain (UTF-8)','iso-8859-15', 'es', 'es_ES:es', 'UTF-8' ],
 'es_MX' => [ 'Spanish|Mexico',	'iso-8859-1', 'es', 'es_MX:es:es_ES' ],
   'et'  => [ 'Estonian',		'iso-8859-15','et', 'et' ],
 'eu_ES' => [ 'Euskara (Basque)','iso-8859-15', 'eu', 'eu' ],
-'fa_IR.UTF-8'=> [ 'Farsi (Iranian)',		'utf_fa', 'fa', 'fa' ],
+'fa_IR.UTF-8'=> [ 'Farsi (Iranian)',		'unicode', 'fa', 'fa', 'UTF-8' ],
 'fi_FI' => [ 'Finnish (Suomi)',	'iso-8859-15','fi', 'fi' ],
 #-'fo'  => [ 'Faroese',			'iso-8859-1', 'fo', 'fo' ],
 'fr_BE' => [ 'French|Belgium',	'iso-8859-15','fr', 'fr_BE:fr' ],
 'fr_CA' => [ 'French|Canada',		'iso-8859-15','fr', 'fr_CA:fr' ],
 'fr_CH' => [ 'French|Switzerland',	'iso-8859-15', 'fr', 'fr_CH:fr' ],
 'fr_FR' => [ 'French|France',	'iso-8859-15','fr', 'fr_FR:fr' ],
-'fr_FR.UTF-8'=> [ 'French|France (UTF-8)','utf_15','fr', 'fr_FR:fr' ],
+'fr_FR.UTF-8'=> [ 'French|France (UTF-8)','iso-8859-15','fr', 'fr_FR:fr', 'UTF-8' ],
 'ga_IE' => [ 'Gaeilge (Irish)',	'iso-8859-15','ga', 'ga:en_IE:en' ],
 #-'gd'  => [ 'Scottish gaelic',		'iso-8859-14','gd', 'gd:en_GB:en' ],
 'gl_ES' => [ 'Galego (Galician)','iso-8859-15','gl', 'gl:es_ES:pt_PT:pt_BR:es:pt' ],
 #-'gv'	=> [ 'Manx gaelic',		'iso-8859-14','gv', 'gv:en_GB:en' ],
 #- 'iw' was the old code for hebrew language
-#  'he'  => [ 'Hebrew',	'iso-8859-8', 'he', 'he:iw_IL' ],
-'he_IL.UTF-8'=> [ 'Hebrew',		'utf_he',     'he', 'he:iw_IL' ],
+'he_IL.UTF-8'=> [ 'Hebrew',		'iso-8859-8', 'he', 'he:iw_IL', 'UTF-8' ],
   'hr'  => [ 'Croatian',		'iso-8859-2', 'hr', 'hr' ],
   'hu'  => [ 'Hungarian', 		'iso-8859-2', 'hu', 'hu' ],
 #'hy_AM.ARMSCII-8'=> [ 'Armenian|ARMSCII-8','armscii-8','hy','hy' ],
-'hy_AM.UTF-8'=> [ 'Armenian',     'utf_hy',     'hy', 'hy' ],
+'hy_AM.UTF-8'=> [ 'Armenian',     'armscii-8',     'hy', 'hy', 'UTF-8' ],
 #- 'in' was the old code for indonesian language; by putting LANGUAGE=id:in_ID
 #- we catch the few catalog files still using the wrong code
   'id'  => [ 'Indonesian',		'iso-8859-1', 'id', 'id:in_ID' ],
@@ -86,26 +85,26 @@ my %languages = my @languages = (
 'it_IT' => [ 'Italian|Italy','iso-8859-15','it', 'it_IT:it' ],
 #-'iu'  => [ 'Inuktitut', 		'unicodeIU',  'iu', 'iu' ],
   'ja'  => [ 'Japanese',		'jisx0208',   'ja', 'ja_JP.ujis:ja' ],
-'ja_JP.UTF-8'=> [ 'Japanese (UTF-8)',	'utf_ja',     'ja', 'ja_JP.ujis:ja' ],
-'ka_GE.UTF-8'=> [ 'Georgian',  		'utf_ka',     'ka', 'ka' ],
+'ja_JP.UTF-8'=> [ 'Japanese (UTF-8)',	'jisx0208',     'ja', 'ja_JP.ujis:ja', 'UTF-8' ],
+'ka_GE.UTF-8'=> [ 'Georgian',  		'utf_ka',     'ka', 'ka', 'UTF-8' ],
 #-'kl'  => [ 'Greenlandic (inuit)',	'iso-8859-1', 'kl', 'kl' ],
   'ko'  => [ 'Korean',           'ksc5601',    'ko', 'ko' ],
-'ko_KR.UTF-8'=> [ 'Korean (UTF-8)',       'utf_ko',     'ko', 'ko' ],
+'ko_KR.UTF-8'=> [ 'Korean (UTF-8)',       'ksc5601',     'ko', 'ko', 'UTF-8' ],
 #-'kw'	=> [ 'Cornish gaelic',		'iso-8859-14','kw', 'kw:en_GB:en' ],
 #-'lo'  => [ 'Laotian',			'mulelao-1',  'lo', 'lo' ],
   'lt'  => [ 'Lithuanian',		'iso-8859-13','lt', 'lt' ],
   'lv'  => [ 'Latvian',			'iso-8859-13','lv', 'lv' ],   
   'mi'	=> [ 'Maori',			'iso-8859-13','mi', 'mi' ],
-# 'mk'  => [ 'Macedonian (Cyrillic)','iso-8859-5', 'mk', 'mk' ],
-'mk_MK.UTF-8'=> [ 'Macedonian (Cyrillic)','utf_1251',   'mk', 'mk' ],
+#- 'mk'  => [ 'Macedonian (Cyrillic)','iso-8859-5', 'mk', 'mk' ],
+'mk_MK.UTF-8'=> [ 'Macedonian (Cyrillic)','cp1251',   'mk', 'mk', 'UTF-8' ],
   'ms'  => [ 'Malay',			'iso-8859-1', 'ms', 'ms' ],
-# 'mt'  => [ 'Maltese|ISO-8859-3',	'iso-8859-3', 'mt', 'mt' ],
-'mt_MT.UTF-8'=> [ 'Maltese',	'utf_3',      'mt', 'mt' ],
+#- 'mt'  => [ 'Maltese|ISO-8859-3',	'iso-8859-3', 'mt', 'mt' ],
+'mt_MT.UTF-8'=> [ 'Maltese',	'iso-8859-3',      'mt', 'mt', 'UTF-8' ],
 'nl_BE' => [ 'Dutch|Belgium',	'iso-8859-15', 'nl', 'nl_BE:nl' ],
 'nl_NL' => [ 'Dutch|Netherlands','iso-8859-15', 'nl', 'nl_NL:nl' ],
-# 'nb' is the new locale name in glibc 2.2
+#- 'nb' is the new locale name in glibc 2.2
   'no'  => [ 'Norwegian|Bokmaal',	'iso-8859-1', 'no', 'no:nb:nn:no@nynorsk:no_NY' ],
-# no_NY is used by KDE (but not standard); 'nn' is the new locale in glibc 2.2
+#- no_NY is used by KDE (but not standard); 'nn' is the new locale in glibc 2.2
   'nn'	=> [ 'Norwegian|Nynorsk',	'iso-8859-1', 'no', 'nn:no@nynorsk:no_NY:no:nb' ],
 #-'oc'  => [ 'Occitan',			'iso-8859-1', 'oc', 'oc:fr_FR' ],
 #-'pd'	=> [ 'Plauttdietsch',		'iso-8859-1', 'pd', 'pd' ],
@@ -117,44 +116,44 @@ my %languages = my @languages = (
   'ro'  => [ 'Romanian',  		'iso-8859-2', 'ro', 'ro' ],
 'ru_RU.KOI8-R' => [ 'Russian|KOI8-R',	'koi8-r',     'ru', 'ru_RU:ru' ],
 'ru_RU.CP1251' => [ 'Russian|CP1251',	'cp1251',     'ru', 'ru_RU:ru' ],
-'ru_RU.UTF-8' => [ 'Russian|UTF-8',	'utf_1251',   'ru', 'ru_RU:ru' ],
+'ru_RU.UTF-8' => [ 'Russian|UTF-8',	'cp1251',   'ru', 'ru_RU:ru', 'UTF-8' ],
   'sk'  => [ 'Slovak',    		'iso-8859-2', 'sk', 'sk' ],
   'sl'  => [ 'Slovenian',		'iso-8859-2', 'sl', 'sl' ],
-#  'sp'  => [ 'Serbian|Cyrillic (ISO-8859-5)','iso-8859-5', 'sp', 'sp:sr' ],
+#-  'sp'  => [ 'Serbian|Cyrillic (ISO-8859-5)','iso-8859-5', 'sp', 'sp:sr' ],
 #'sp_YU.CP1251'=> [ 'Serbian|Cyrillic (CP1251)','cp1251',    'sp', 'sp:sr' ],
-'sp_YU.UTF-8'=> [ 'Serbian|Cyrillic','utf_1251',   'sp', 'sp:sr' ],
+'sp_YU.UTF-8'=> [ 'Serbian|Cyrillic','cp1251',   'sp', 'sp:sr', 'UTF-8' ],
   'sr'  => [ 'Serbian|Latin (ISO-8859-2)','iso-8859-2','sr', 'sr' ],
-'sr_YU.UTF-8'=> [ 'Serbian|Latin (UTF-8)',	'utf_2',      'sr', 'sr' ],
+'sr_YU.UTF-8'=> [ 'Serbian|Latin (UTF-8)',	'iso-8859-2',      'sr', 'sr', 'UTF-8' ],
   'sv'  => [ 'Swedish',			'iso-8859-1', 'sv', 'sv' ],
-# there is no tamil font curently; so set DrakX encoding to utf_1
-# note: most of the gnome translations for tamil are broken (using bad
-# encoding)
-'ta_IN.UTF-8'=> [ 'Tamil',		'utf_1',      'ta', 'ta' ],
-'tg_TJ.UTF-8'=> [ 'Tajik',		'utf_koi',    'tg', 'tg' ],
+#- there is no tamil font curently; so set DrakX encoding to utf_1
+#- note: most of the gnome translations for tamil are broken (using bad
+#- encoding)
+'ta_IN.UTF-8'=> [ 'Tamil',		'iso-8859-1',      'ta', 'ta', 'UTF-8' ],
+'tg_TJ.UTF-8'=> [ 'Tajik',		'utf_koi8-k',    'tg', 'tg', 'UTF-8' ],
   'th'  => [ 'Thai|TIS-620',            'tis620',     'th', 'th' ],
-'th_TH.UTF-8'=> [ 'Thai (UTF-8)',         'utf_th',     'th', 'th' ],
+'th_TH.UTF-8'=> [ 'Thai (UTF-8)',         'tis620',     'th', 'th', 'UTF-8' ],
   'tr'  => [ 'Turkish',	 		'iso-8859-9', 'tr', 'tr' ],
 #-'tt_RU.UTF-8'=> [ 'Tatar',		'koi8-k',  'tt', 'tt' ],
 #-'ur'	=> [ 'Urdu',			'cp1256',     'ur', 'ur' ],  
 'uk_UA' => [ 'Ukrainian|KOI8-U', 	'koi8-u',     'uk', 'uk_UA:uk' ],
 'uk_UA.CP1251'=> [ 'Ukrainian|CP1251',	'cp1251',     'uk', 'uk_UA:uk' ],
-'uk_UA.UTF-8'=> [ 'Ukrainian|UTF-8',	'utf_1251',   'uk', 'uk_UA:uk' ],
+'uk_UA.UTF-8'=> [ 'Ukrainian|UTF-8',	'cp1251',   'uk', 'uk_UA:uk', 'UTF-8' ],
   'uz'  => [ 'Uzbek',			'iso-8859-1', 'uz', 'uz' ],
 #'vi_VN.TCVN'  => [ 'Vietnamese|TCVN',   'tcvn',     'vi', 'vi' ],
 #'vi_VN.VISCII' => [ 'Vietnamese|VISCII','viscii',   'vi', 'vi' ],
-'vi_VN.UTF-8' => [ 'Vietnamese',  'utf_vi',   'vi', 'vi' ],
+'vi_VN.UTF-8' => [ 'Vietnamese',  'viscii',   'vi', 'vi', 'UTF-8' ],
   'wa'  => [ 'Walon',     		'iso-8859-15', 'wa', 'wa:fr_BE:fr' ],
 #-'yi'	=> [ 'Yiddish',			'cp1255',     'yi', 'yi' ],
-# NOTE: 'zh' must be in the LANGUAGE list, it is not used for translations
-# themselves but is needed for our selection of locales-xx packages
-# and the language dependent packages resolution
+#- NOTE: 'zh' must be in the LANGUAGE list, it is not used for translations
+#- themselves but is needed for our selection of locales-xx packages
+#- and the language dependent packages resolution
 #'zh_HK.Big5' => [ 'Chinese|Traditional|Hong Kong|Big5', 'Big5', 'zh_TW.Big5', 'zh_TW.Big5:zh_TW:zh_HK:zh' ],
-#'zh_HK.UTF-8' => [ 'Chinese|Traditional|Hong Kong|UTF-8','utf_tw','zh_HK', 'zh_HK:zh_TW.Big5:zh_TW:zh' ],
-'zh_TW.Big5' => [ 'Chinese|Traditional|Big5', 'Big5', 'zh_TW.Big5', 'zh_TW.Big5:zh_TW:zh_HK:zh' ],
-'zh_TW.UTF-8' => [ 'Chinese|Traditional|UTF-8','utf_tw','zh_TW','zh_TW.Big5:zh_TW.big5:zh_TW:zh_HK:zh' ],
+#'zh_HK.UTF-8' => [ 'Chinese|Traditional|Hong Kong|UTF-8','Big5','zh_HK', 'zh_HK:zh_TW.Big5:zh_TW:zh', 'UTF-8' ],
+'zh_TW.Big5'  => [ 'Chinese|Traditional|Big5',   'Big5',   'zh_TW.Big5', 'zh_TW.Big5:zh_TW:zh_HK:zh' ],
+'zh_TW.UTF-8' => [ 'Chinese|Traditional|UTF-8',  'Big5', 'zh_TW',      'zh_TW.Big5:zh_TW.big5:zh_TW:zh_HK:zh', 'UTF-8' ],
 'zh_CN.GB2312' => [ 'Chinese|Simplified|GB2312', 'gb2312', 'zh_CN.GB2312', 'zh_CN.GB2312:zh_CN:zh' ],
-'zh_CN.UTF-8' => [ 'Chinese|Simplified|UTF-8','utf_cn','zh_CN', 'zh_CN.GB2312:zh_CN:zh' ],
-# does this one works? 
+'zh_CN.UTF-8'  => [ 'Chinese|Simplified|UTF-8',  'gb2312', 'zh_CN',        'zh_CN.GB2312:zh_CN:zh', 'UTF-8' ],
+#- does this one works? 
 #'zh_CN.GB18030' => [ 'Chinese|Simplified|GB18030','gb2312','zh_CN', 'zh_CN.GB2312:zh_CN:zh' ],
 );
 @languages = map { $_->[0] } group_by2(@languages);
@@ -198,20 +197,20 @@ my %xim = (
   'ko' => {
 	ENC => 'kr',
 	XIM => 'Ami',
-	# NOTE: there are several possible versions of ami, for the different
-	# desktops (kde, gnome, etc). So XIM_PROGRAM isn't defined; it will
-	# be the xinitrc script, XIM section, that will choose the right one 
-	# XIM_PROGRAM => 'ami',
+	#- NOTE: there are several possible versions of ami, for the different
+	#- desktops (kde, gnome, etc). So XIM_PROGRAM isn't defined; it will
+	#- be the xinitrc script, XIM section, that will choose the right one 
+	#- XIM_PROGRAM => 'ami',
 	XMODIFIERS => '"@im=Ami"',
 	CONSOLE_NOT_LOCALIZED => 'yes',
   },
   'ko_KR.UTF-8' => {
 	ENC => 'utf8',
 	XIM => 'Ami',
-	# NOTE: there are several possible versions of ami, for the different
-	# desktops (kde, gnome, etc). So XIM_PROGRAM isn't defined; it will
-	# be the xinitrc script, XIM section, that will choose the right one 
-	# XIM_PROGRAM => 'ami',
+	#- NOTE: there are several possible versions of ami, for the different
+	#- desktops (kde, gnome, etc). So XIM_PROGRAM isn't defined; it will
+	#- be the xinitrc script, XIM section, that will choose the right one 
+	#- XIM_PROGRAM => 'ami',
 	XMODIFIERS => '"@im=Ami"',
 	CONSOLE_NOT_LOCALIZED => 'yes',
   },
@@ -227,149 +226,109 @@ my %xim = (
 	XIM_PROGRAM => 'kinput2',
 	XMODIFIERS => '"@im=kinput2"',
   },
-  # XFree86 has an internal XIM for Thai that enables syntax checking etc.
-  # 'Passthroug' is no check at all, 'BasicCheck' accepts bad sequences
-  # and convert them to right ones, 'Strict' refuses bad sequences
+  #- XFree86 has an internal XIM for Thai that enables syntax checking etc.
+  #- 'Passthroug' is no check at all, 'BasicCheck' accepts bad sequences
+  #- and convert them to right ones, 'Strict' refuses bad sequences
   'th' => {
-	XIM_PROGRAM => '/bin/true', # it's an internal module
+	XIM_PROGRAM => '/bin/true', #- it's an internal module
 	XMODIFIERS => '"@im=BasicCheck"',
   },
-  # xvnkb is not an XIM input method; but an input method of another
-  # kind, only XIM_PROGRAM needs to be defined
-  'vi' => {
-	XIM_PROGRAM => 'xvnkb',
-  },
-  'vi_VN.TCVN' => {
-	XIM_PROGRAM => 'xvnkb',
-  },
-  'vi_VN.VISCII' => {
-	XIM_PROGRAM => 'xvnkb',
-  },
+  #- xvnkb is not an XIM input method; but an input method of another
+  #- kind, only XIM_PROGRAM needs to be defined
+  #- ! xvnkb doesn't work in UTF-8 !
+#-  'vi_VN.VISCII' => {
+#-	XIM_PROGRAM => 'xvnkb',
+#-  },
 );
 
 sub std2 { "-*-*-medium-r-normal-*-$_[1]-*-*-*-*-*-$_[0]" }
 sub std_ { std2($_[0], 10), std2($_[0], 10) }
 sub std  { std2($_[0], $_[1] || 10), std2($_[0],  8) }
 
-#- [0]: console font name; [1]: sfm map for console font (if needed)
-#- [2]: acm file for console font;
-#- [3]: iocharset param for mount; [4]: codepage parameter for mount
+#- [0]: console font name
+#- [1]: sfm map for console font (if needed)
+#- [2]: acm file for console font (none if utf8)
+#- [3]: iocharset param for mount (utf8 if utf8)
+#- [4]: codepage parameter for mount (none if utf8)
 #- [5]: X11 fontset (for DrakX)
 my %charsets = (
   "armscii-8"  => [ "arm8",		"armscii8.uni",	"trivial.trans",
     undef,	undef, std_("armscii-8") ],
-  "utf_hy"     => [ "arm8",		"armscii8.uni",	"trivial.trans",
-    "utf8",	undef, std_("armscii-8") ],
 #- chinese needs special console driver for text mode
   "Big5"       => [ undef,		undef,		undef,
 	"big5", "950", "-*-*-*-*-*-*-*-*-*-*-*-*-big5-0" ],
-  "utf_tw"     => [ undef,		undef,		undef,
-	"utf8", undef, "-*-*-*-*-*-*-*-*-*-*-*-*-big5-0" ],
   "gb2312"     => [ undef,		undef,		undef,
 	"gb2312", "936", "-*-*-*-*-*-*-*-*-*-*-*-*-gb2312.1980-0" ],
-  "utf_cn"     => [ undef,		undef,		undef,
-	"utf8", undef, "-*-*-*-*-*-*-*-*-*-*-*-*-gb2312.1980-0" ],
-  "utf_ka"      => [ "t_geors",		"geors.uni",	"geors_to_geops.trans",
-	"utf8",  undef, "-*-*-*-*-*-*-*-*-*-*-*-*-georgian-academy" ],
   "C" => [ "lat1-16",	undef,		"iso15",
 	"iso8859-1", "850", sub { std("iso8859-1", @_) } ],
   "iso-8859-1" => [ "lat1-16",	undef,		"iso1",
 	"iso8859-1", "850", sub { std("iso8859-15", @_) } ],
-  "utf_1"      => [ "lat0-16",	undef,		"iso1",
-	"utf8", undef, sub { std("iso8859-15", @_) } ],
   "iso-8859-2" => [ "lat2-sun16",	undef,		"iso02",
 	"iso8859-2", "852", sub { std("iso8859-2", @_) } ],
-  "utf_2"      => [ "lat2-sun16",	undef,		"iso02",
-	"utf8", undef, sub { std("iso8859-2", @_) } ],
   "iso-8859-3" => [ "iso03.f16",	undef,		"iso03",
 	"iso8859-3", undef, std_("iso8859-3") ],
-  "utf_3" => [ "iso03.f16",	undef,		"iso03",
-	"utf8", undef, std_("iso8859-3") ],
-#  "iso-8859-4" => [ "lat4u-16",		undef,		"iso04",
-#	"iso8859-4", "775", std_("iso8859-4") ],
-  "iso-8859-5" => [ "UniCyr_8x16",	undef,	"iso05",
-  	"iso8859-5", "855", sub { std("microsoft-cp1251", @_) } ],
+#-  "iso-8859-4" => [ "lat4u-16",		undef,		"iso04",
+#-	"iso8859-4", "775", std_("iso8859-4") ],
+#-  "iso-8859-5" => [ "UniCyr_8x16",	undef,	"iso05",
+#-  	"iso8859-5", "855", sub { std("microsoft-cp1251", @_) } ],
 #-#- arabic needs special console driver for text mode [acon]
 #-#- (and gtk support isn't done yet)
   "iso-8859-6" => [ "iso06.f16",	"iso06",	"trivial.trans",
-    "iso8859-6", "864", std_("iso8859-6") ],
-  "utf_ar" => [ "iso06.f16",	"iso06",	"trivial.trans",
-    "utf8", "864", std_("iso8859-6") ],
+	"iso8859-6", "864", std_("iso8859-6") ],
   "iso-8859-7" => [ "iso07.f16",	undef,	"iso07",
 	"iso8859-7", "869", std_("iso8859-7") ],
-  "utf_el" => [ "iso07.f16",	undef,		"iso07",
-	"utf8", "869", std_("iso8859-7") ],
 #-#- hebrew needs special console driver for text mode [acon]
 #-#- (and gtk support isn't done yet)
    "iso-8859-8" => [ "iso08.f16",	"iso08",	"trivial.trans",
-#	std_("iso8859-8") ],
+#-	std_("iso8859-8") ],
 	"iso8859-8", "862", std_("microsoft-cp1255") ],
   "iso-8859-9" => [ "iso09.f16",	"iso09",	"trivial.trans",
 	"iso8859-9", "857", sub { std("iso8859-9", @_) } ],
   "iso-8859-13" => [ "tlat7",		"iso13",	"trivial.trans",
 	"iso8859-13", "775", std_("iso8859-13") ],
-  "utf_13" => [ "tlat7",		"iso13",	"trivial.trans",
-	"utf8", "775", std_("iso8859-13") ],
   "iso-8859-14" => [ "iso14",		undef,		"iso14",
 	"iso8859-14", "850", std_("iso8859-14") ],
-  "utf_14" => [ "iso14",		undef,		"iso14",
-	"utf8", undef, std_("iso8859-14") ],
   "iso-8859-15" => [ "lat0-16",	undef,		"iso15",
 	"iso8859-15", "850", sub { std("iso8859-15", @_) } ],
-  "utf_15" => [ "lat0-16",	undef,		"iso15",
-	"utf8", undef, sub { std("iso8859-15", @_) } ],
-  "utf_az"      => [ "tiso09e",		"iso09",	"trivial.trans",
-	"utf8", undef, std2("iso8859-9e",10) ],
+  "iso-8859-9e"      => [ "tiso09e",		"iso09",	"trivial.trans",
+	undef, undef, std2("iso8859-9e",10) ],
 #- japanese needs special console driver for text mode [kon2]
   "jisx0208"   => [ undef,		undef,		"trivial.trans",
 	"euc-jp", "932", "-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ],
-  "utf_ja"   => [ undef,		undef,		"trivial.trans",
-	"utf8", undef, "-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ],
   "koi8-r"     => [ "UniCyr_8x16",	undef,		"koi8-r",
 	"koi8-r", "866", sub { std("microsoft-cp1251", @_) } ],
   "koi8-u"     => [ "UniCyr_8x16",	undef,		"koi8-u",
 	"koi8-u", "866", sub { std("microsoft-cp1251", @_) } ],
-  "utf_koi"     => [ "koi8-k",		"iso01",	"trivial.trans",
+  "utf_ka"      => [ "t_geors",		"geors.uni",	"geors_to_geops.trans",
+	"utf8",  undef, "-*-*-*-*-*-*-*-*-*-*-*-*-georgian-academy" ],
+  "utf_koi8-k"     => [ "koi8-k",		"iso01",	"trivial.trans",
 	"utf8", undef, std("koi8-k") ],
   "cp1251"     => [ "UniCyr_8x16",	undef,		"cp1251",
 	"cp1251", "866", sub { std("microsoft-cp1251", @_) } ],
-  "utf_1251"   => [ "UniCyr_8x16",	undef,		"cp1251",
-	"utf8", undef, sub { std("microsoft-cp1251", @_) } ],
 #- Yiddish needs special console driver for text mode [acon]
 #- (and gtk support isn't done yet)
-#  "cp1255"     => [ "iso08.f16",        "iso08",        "trivial.trans",
-#	"cp1255", "862", std_("microsoft-cp1255") ],
-  "utf_he"     => [ "iso08.f16",        "iso08",        "trivial.trans",
-	"utf8", "862", std_("microsoft-cp1255") ],
+#-  "cp1255"     => [ "iso08.f16",        "iso08",        "trivial.trans",
+#-	"cp1255", "862", std_("microsoft-cp1255") ],
 #- Urdu needs special console driver for text mode [acon]
 #- (and gtk support isn't done yet)
-#  "cp1256"     => [ undef,              undef,          "trivial.trans",
-#	undef, "864", std_("microsoft-cp1255") ],
+#-  "cp1256"     => [ undef,              undef,          "trivial.trans",
+#-	undef, "864", std_("microsoft-cp1255") ],
 #- korean needs special console driver for text mode
   "ksc5601"    => [ undef,		undef,		undef,
 	"euc-kr", "949", "-*-*-*-*-*-*-*-*-*-*-*-*-ksc5601.1987-*" ],
-  "utf_ko"    => [ undef,		undef,		undef,
-	"utf8", undef, "-*-*-*-*-*-*-*-*-*-*-*-*-ksc5601.1987-*" ],
 #- I have no console font for Thai...
   "tis620"     => [ undef,		undef,		"trivial.trans",
 	"tis-620", "874", std2("tis620.2533-1",12) ],
-  "utf_th"     => [ undef,		undef,		"trivial.trans",
-	"utf8", "874", std2("tis620.2533-1",12) ],
-  "tcvn"       => [ "tcvn8x16",		"tcvn",		"trivial.trans",
+#-  "tcvn"       => [ "tcvn8x16",		"tcvn",		"trivial.trans",
+#-	undef, undef, std2("tcvn-5712", 13), std2("tcvn-5712", 10) ],
+  "viscii"     => [ "tcvn8x16",	"viscii.uni",	"viscii1.0_to_viscii1.1.trans",
 	undef, undef, std2("tcvn-5712", 13), std2("tcvn-5712", 10) ],
-  "viscii"     => [ "viscii10-8x16",	"viscii.uni",	"viscii1.0_to_viscii1.1.trans",
-#-	"-*-*-*-*-*-*-*-*-*-*-*-*-viscii1.1-1" ],
-	undef, undef, std2("tcvn-5712", 13), std2("tcvn-5712", 10) ],
-  "utf_vi"     => [ "tcvn8x16",		"tcvn",		"trivial.trans",
-	"utf8", undef, std2("tcvn-5712", 13), std2("tcvn-5712", 10) ],
 #- Farsi (iranian) needs special console driver for text mode [acon]
 #- (and gtk support isn't done yet)
-#  "isiri-3342" => [ undef,		undef,		"trivial.trans",
-#	undef, undef, "-*-*-*-*-*-*-*-*-*-*-*-*-isiri-3342" ],
-  "utf_fa" => [ undef,			undef,		"trivial.trans",
-	"utf8", undef, "-*-*-*-*-*-*-*-*-*-*-*-*-iso10646-1" ],
-#  "tscii-0" => [ "tamil",		undef,		"trivial.trans",
-#	undef, undef, "-*-*-*-*-*-*-*-*-*-*-*-*-tscii-0" ],
+#-  "isiri-3342" => [ undef,		undef,		"trivial.trans",
+#-	undef, undef, "-*-*-*-*-*-*-*-*-*-*-*-*-isiri-3342" ],
+#-  "tscii-0" => [ "tamil",		undef,		"trivial.trans",
+#-	undef, undef, "-*-*-*-*-*-*-*-*-*-*-*-*-tscii-0" ],
   "unicode" => [ undef,			undef,		"trivial.trans",
 	"utf8", undef, "-*-*-*-*-*-*-*-*-*-*-*-*-iso10646-1" ],
 );
@@ -411,6 +370,9 @@ my %lang2country = (
   sv => 'se',
 );
 
+
+my @during_install__lang_having_their_LC_CTYPE = qw(hy ja ko th vi);
+
 #-######################################################################################
 #- Functions
 #-######################################################################################
@@ -431,8 +393,17 @@ sub lang2text     { exists $languages{$_[0]} && $languages{$_[0]}[0] }
 sub lang2charset  { exists $languages{$_[0]} && $languages{$_[0]}[1] }
 sub lang2LANG     { exists $languages{$_[0]} && $languages{$_[0]}[2] }
 sub lang2LANGUAGE { exists $languages{$_[0]} && $languages{$_[0]}[3] }
+sub lang2UTF8     { exists $languages{$_[0]} && $languages{$_[0]}[4] }
 sub getxim { $xim{$_[0]} }
 
+sub lang2console_font {
+    my ($lang) = @_;
+    my $c = $charsets{lang2charset($lang) || return} or return;
+    my ($name, $sfm, $acm) = @$c;
+    undef $acm if lang2UTF8($lang);
+    ($name, $sfm, $acm);
+}
+
 sub lang2country {
     my ($lang, $prefix) = @_;
 
@@ -503,7 +474,7 @@ sub kde_lang2lang {
 sub kde_lang_country2lang {
     my ($klang, $country, $default) = @_;
     my $uc_country = uc $country;
-    # country is used to precise the lang
+    #- country is used to precise the lang
     my @choices = grep { /^$klang/ } list();
     my @sorted = 
       @choices == 2 && length $choices[0] !~ /[._]/ && $choices[1] =~ /UTF-8/ ? @choices :
@@ -540,16 +511,13 @@ 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" ],
-  'utf_1'       => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
-  'utf_2'       => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
-  'utf_15'      => [ "adobe-helvetica,12", "courier,10", "adobe-helvetica,11" ],
   'gb2312' => [ "default-ming,16" ],
   'jisx0208' => [ "misc-fixed,14", "wadalab-gothic,13" ],
   'ksc5601' => [ "daewoo-gothic,16" ],
   'Big5'   => [ "taipei-fixed,16" ],
-  'utf_hy' => [ "clearlyu,17" ],
-  'utf_ka' => [ "clearlyu,17" ],
-  'utf_vi' => [ "misc-fixed,13", "misc-fixed,13", "misc-fixed,10", ],
+  'armscii-8' => [ "clearlyu,17" ],
+  'utf_ka'    => [ "clearlyu,17" ],
+  'viscii'  => [ "misc-fixed,13", "misc-fixed,13", "misc-fixed,10", ],
   'default' => [ "misc-fixed,13", "misc-fixed,13", "misc-fixed,10", ],
 );
 
@@ -577,38 +545,41 @@ sub set {
     }
 
     if ($lang && exists $languages{$lang}) {
-	#- use "packdrake -x" that follow symlinks and expand directory.
-	#- it is necessary as there is a lot of symlinks inside locale.cz2,
-	#- using a compressed cpio archive is nighmare to extract all files.
-	#- reset locale environment variable to avoid any warnings by perl,
-	#- so installation of new locale is done with empty locale ...
-	if (!-e "$ENV{SHARE_PATH}/locale/$lang" && common::usingRamdisk()) {
+	my ($dir, $LANG) = ("$ENV{SHARE_PATH}/locale", lang2LANG($lang));
+	if (! -e "$dir/$LANG" && common::usingRamdisk()) {
 	    @ENV{qw(LANG LC_ALL LANGUAGE LINGUAS)} = ();
 
-	    eval { rm_rf("$ENV{SHARE_PATH}/locale") };
-	    eval {
-		require packdrake;
-		my $packer = new packdrake("$ENV{SHARE_PATH}/locale.cz2", quiet => 1);
-		$packer->extract_archive("$ENV{SHARE_PATH}/locale", lang2LANG($lang));
+	    my @LCs = qw(LC_ADDRESS LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME);
+
+	    my $charset = during_install__lang2charset($lang) || $LANG;
 
-		#- LC_COLLATE and LC_CTYPE are getFile'd (cuz they are big, causing the .cz2 to be *big*)
-		my ($dir) = glob_("$ENV{SHARE_PATH}/locale/*");
-		install_any::getAndSaveFile ("$dir/$_") foreach 'LC_COLLATE', 'LC_CTYPE';
-	    };
+	    #- there are 3 main charsets containing everything for all locales, except LC_CTYPE
+	    #- by default, there is UTF-8.
+	    #- when asked for GB2312 or BIG5, removing the other main charsets
+	    my $main_charset = member($charset, 'GB2312', 'BIG5') ? $charset : 'UTF-8';
+
+	    #- removing everything
+	    #- except in main charset: only removing LC_CTYPE if it is there
+	    eval { rm_rf($_ eq $main_charset ? "$dir/$_/LC_CTYPE" : "$dir/$_") } foreach all($dir);
+
+	    if (! -e "$dir/$main_charset") {
+		#- getting the main charset
+		mkdir "$dir/$main_charset";
+		mkdir "$dir/$main_charset/LC_MESSAGES";
+		install_any::getAndSaveFile ("$dir/$main_charset/$_") foreach @LCs, 'LC_MESSAGES/SYS_LC_MESSAGES';
+	    }
+	    mkdir "$dir/$LANG";
+
+	    #- linking to the main charset
+	    symlink "../$main_charset/$_", "$dir/$LANG/$_" foreach @LCs, 'LC_MESSAGES';	    
+
+	    #- getting LC_CTYPE (putting it directly in $LANG)
+	    install_any::getAndSaveFile ("Mandrake/mdkinst$dir/$charset/LC_CTYPE", "$dir/$LANG/LC_CTYPE");
 	}
 
 #- set all LC_* variables to a unique locale ("C"), and only redefine
 #- LC_CTYPE (for X11 choosing the fontset) and LANGUAGE (for the po files)
-	$ENV{LC_NUMERIC}		= "C";
-	$ENV{LC_TIME}			= "C";
-	$ENV{LC_COLLATE}		= "C";
-	$ENV{LC_MONETARY}		= "C";
-	$ENV{LC_PAPER}			= "C";
-	$ENV{LC_NAME}			= "C";
-	$ENV{LC_ADDRESS}		= "C";
-	$ENV{LC_TELEPHONE}		= "C";
-	$ENV{LC_MEASUREMENT}	= "C";
-	$ENV{LC_IDENTIFICATION}	= "C";
+	$ENV{$_} = 'C' foreach qw(LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION);
 
 #- use lang2LANG() to define LC_CTYPE, so DrakX will use a same encoding
 #- for all variations of a same language, eg both 'ru_RU.KOI8-R' and
@@ -627,7 +598,7 @@ sub set {
 	}
 	load_mo();
     } else {
-	# stick with the default (English) */
+	#- stick with the default (English) */
 	delete $ENV{LANG};
 	delete $ENV{LC_ALL};
 	delete $ENV{LANGUAGE};
@@ -687,33 +658,33 @@ sub write {
     my $h = {};
     $h->{$_} = $lang foreach qw(LC_COLLATE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_MONETARY LC_TIME);
     if ($lang && exists $languages{$lang}) {
-## note: KDE is unable to use the keyboard if LC_* and LANG values differ...
-#	add2hash $h, { LANG => lang2LANG($lang), LANGUAGE => lang2LANGUAGE($lang) };
+##- note: KDE is unable to use the keyboard if LC_* and LANG values differ...
+#-	add2hash $h, { LANG => lang2LANG($lang), LANGUAGE => lang2LANGUAGE($lang) };
 	add2hash $h, { LANG => $lang, LANGUAGE => lang2LANGUAGE($lang) };
 
-	my $c = $charsets{lang2charset($lang) || ''};
-	if ($c && !$user_only) {
+	my ($name, $sfm, $acm) = lang2console_font($lang);
+	if ($name && !$user_only) {
 	    my $p = "$prefix/usr/lib/kbd";
-	    if ($c->[0]) {
+	    if ($name) {
 		eval {
-		    cp_af("$p/consolefonts/$c->[0].psf.gz", "$prefix/etc/sysconfig/console/consolefonts");
-		    add2hash $h, { SYSFONT => $c->[0] };
+		    cp_af("$p/consolefonts/$name.psf.gz", "$prefix/etc/sysconfig/console/consolefonts");
+		    add2hash $h, { SYSFONT => $name };
 		};
-		$@ and log::l("missing console font $c->[0]");
+		$@ and log::l("missing console font $name");
 	    }
-	    if ($c->[1]) {
+	    if ($sfm) {
 		eval {
-		    cp_af(glob_("$p/consoletrans/$c->[1]*"), "$prefix/etc/sysconfig/console/consoletrans");
-		    add2hash $h, { UNIMAP => $c->[1] };
+		    cp_af(glob_("$p/consoletrans/$sfm*"), "$prefix/etc/sysconfig/console/consoletrans");
+		    add2hash $h, { UNIMAP => $sfm };
 		};
-		$@ and log::l("missing console unimap file $c->[1]");
+		$@ and log::l("missing console unimap file $sfm");
 	    }
-	    if ($c->[2]) {
+	    if ($acm) {
 		eval {
-		    cp_af(glob_("$p/consoletrans/$c->[2]*"), "$prefix/etc/sysconfig/console/consoletrans");
-		    add2hash $h, { SYSFONTACM => $c->[2] };
+		    cp_af(glob_("$p/consoletrans/$acm*"), "$prefix/etc/sysconfig/console/consoletrans");
+		    add2hash $h, { SYSFONTACM => $acm };
 		};
-		$@ and log::l("missing console acm file $c->[2]");
+		$@ and log::l("missing console acm file $acm");
 	    }
 
 	}
@@ -778,7 +749,7 @@ sub load_mo {
 	-s $f and return $_;
 
 	if ($::isInstall && common::usingRamdisk()) {
-	    # cleanup
+	    #- cleanup
 	    eval { rm_rf($localedir) };
 	    eval { mkdir_p(dirname("$localedir/$_/$suffix")) };
 	    install_any::getAndSaveFile ("$localedir/$_/$suffix");
@@ -790,7 +761,7 @@ sub load_mo {
 }
 
 
-
+#- used in Makefile during "make get_needed_files"
 sub console_font_files {
     map { -e $_ ? $_ : "$_.gz" }
       (map { "/usr/lib/kbd/consolefonts/$_.psf" } uniq grep {$_} map { $_->[0] } values %charsets),
@@ -800,30 +771,14 @@ sub console_font_files {
 
 sub load_console_font {
     my ($lang) = @_;
-    my ($f, $u, $m) = @{$charsets{lang2charset($lang)} || []};
+    my ($name, $sfm, $acm) = lang2console_font($lang);
 
     require run_program;
     run_program::run(if_($ENV{LD_LOADER}, $ENV{LD_LOADER}), 
-		     'consolechars', '-v', '-f', $f || 'lat0-sun16',
-		     if_($u, '-u', $u), if_($m, '-m', $m));
+		     'consolechars', '-v', '-f', $name || 'lat0-sun16',
+		     if_($sfm, '-u', $sfm), if_($acm, '-m', $acm));
 }
 
-#-sub load_font {
-#-    my ($charset) = @_;
-#-    my $fontFile = "lat0-sun16";
-#-
-#-    if (my $c = $charsets{$charset}) {
-#-	   log::l("loading $charset font");
-#-	   $fontFile = $c->[0];
-#-    }
-#-
-#-    # text mode font
-#-    log::l("loading font $ENV{SHARE_PATH}/consolefonts/$fontFile");
-#-    #c::loadFont("/tmp/$fontFile") or log::l("error in loadFont: one of PIO_FONT PIO_UNIMAPCLR PIO_UNIMAP PIO_UNISCRNMAP failed: $!");
-#-    #print STDERR "\033(K";
-#-
-#-}
-
 sub get_x_fontset {
     my ($lang, $size) = @_;
 
@@ -844,10 +799,13 @@ sub get_x_fontset {
 
 sub fs_options {
     my ($lang) = @_;
-    my $charset = lang2charset($lang) or return;
-    my $c = $charsets{$charset} or return;
-    my ($iocharset, $codepage) = @$c[3..4];
-    $iocharset, $codepage;
+    if (lang2UTF8($lang)) {
+	('utf8', undef);
+    } else {
+	my $c = $charsets{lang2charset($lang) || return} or return;
+	my ($iocharset, $codepage) = @$c[3..4];
+	$iocharset, $codepage;
+    }
 }
 
 sub charset {
@@ -859,6 +817,17 @@ sub charset {
     $l =~ /.*\.(\S+)/ and return $1;
 }
 
+sub during_install__lang2charset {
+    my ($lang) = @_;
+    return if member(lang2LANG($lang), @during_install__lang_having_their_LC_CTYPE);
+
+    my ($c) = lang2charset($lang) or die "bad lang $lang\n";
+    $c = 'cp1251' if $c =~ /koi8-/;
+    $c = 'iso-8859-15' if member($c, 'iso-8859-1', 'C');
+    $c = 'UTF-8' if member($c, 'unicode', 'utf_ka');
+    $c = 'UTF-8' if member($c, 'iso-8859-9e', 'iso-8859-8', 'iso-8859-6'); #- BAD, need fixing
+    uc($c);
+}
 
 sub check {
     $^W = 0;
@@ -878,7 +847,7 @@ sub check {
 
     $warn->("unused entry $_ in \%xim") foreach difference2([ keys %xim ], [ list() ]);
 
-    # consolefonts are checked during build via console_font_files()
+    #- consolefonts are checked during build via console_font_files()
 
     if (my @l = difference2([ 'default', keys %charsets ], [ keys %charset2kde_font ])) {
 	$warn->("no kde font for charset " . join(" ", @l));