From 17b53119d261760c775023b46872758e7e1eada4 Mon Sep 17 00:00:00 2001 From: Pablo Saratxaga Date: Thu, 6 Sep 2001 19:14:22 +0000 Subject: corrected lang.pm to have coherence in locale usage (it was the source of much of the problems); changed keyboard.pm to ignore charset encoding in locale name for locale -> keyboard guessing. removed unused gconv modules, converted az.po to utf-8 (as it was the only remaining az.po on Earth still in a non standard encoding) --- perl-install/keyboard.pm | 36 ++++++++----- perl-install/lang.pm | 80 ++++++++++++++++------------ perl-install/share/gen_locales.sh | 4 +- perl-install/share/list | 6 +-- perl-install/share/locales-skeleton.tar.bz2 | Bin 26740 -> 26715 bytes 5 files changed, 73 insertions(+), 53 deletions(-) diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 4d4a64e84..9be6cfb9e 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -26,41 +26,50 @@ my %lang2keyboard = 'af' => 'us_intl', #-'ar' => 'ar:80 ar_d:70 ar_azerty:60 ar_azerty_d:50', 'az' => 'az:80 tr:10 us_intl:5', +'az_AZ'=> 'az:80 tr:10 us_intl:5', 'be' => 'by:80 ru:50 ru_yawerty:40', - 'be_BY.CP1251' => 'by:80 ru:50 ru_yawerty:40', +'be_BY'=> 'by:80 ru:50 ru_yawerty:40', 'bg' => 'bg:90', 'bg_BG'=> 'bg:90', 'br' => 'fr:90', 'bs' => 'hr:60 yu:50 si:40', 'ca' => 'es:90 fr:15', +'ca_ES'=> 'es:90 fr:15', 'cs' => 'cz_qwerty:70 cz:50 cz_prog:10', 'cy' => 'uk:90', 'da' => 'dk:90', +'da_DK'=> 'dk:90', 'de' => 'de_nodeadkeys:70 de:50', 'de_AT'=> 'de_nodeadkeys:70 de:50', 'de_BE'=> 'be:70 de_nodeadkeys:60 de:50', 'de_CH'=> 'ch_de:70 ch_fr:25 de_nodeadkeys:20 de:15', 'de_DE'=> 'de_nodeadkeys:70 de:50', +'de_LU'=> 'de_nodeadkeys:70 de:50 fr:40 be:35', 'el' => 'gr:90', +'el_GR'=> 'gr:90', 'en' => 'us:90 us_intl:50', 'en_US'=> 'us:90 us_intl:50', 'en_GB'=> 'uk:90 us:60 us_intl:50', 'eo' => 'us_intl:90 dvorak:20', 'es' => 'es:90 la:80 us_intl:50', - 'es@tradicional' => 'es:90 la:80 us_intl:50', +'es@tr'=> 'es:90 la:80 us_intl:50', 'es_AR'=> 'la:80 us_intl:50 es:20', 'es_ES'=> 'es:90', 'es_MX'=> 'la:80 us_intl:50 es:20', 'et' => 'ee:90', 'eu' => 'es:90 fr:15', +'eu_ES'=> 'es:90 fr:15', 'fa' => 'ir:90', 'fi' => 'fi:90', +'fi_FI'=> 'fi:90', 'fr' => 'fr:90', 'fr_BE'=> 'be:90 fr:5', 'fr_CA'=> 'qc:90 fr:5', 'fr_CH'=> 'ch_fr:70 ch_de:15 fr:10', 'fr_FR'=> 'fr:90', +'fr_LU'=> 'fr:70 de_nodeadkeys:50 de:40 be:35', 'ga' => 'uk:90', +'ga_IE'=> 'uk:90', 'gd' => 'uk:90', 'gl' => 'es:90', 'gv' => 'uk:90', @@ -75,6 +84,7 @@ my %lang2keyboard = 'it_IT' => 'it:90', 'ja' => 'jp:80 us:50 us_intl:20', 'ka' => 'ge_la:80 ge_ru:50', +'ka_GE'=> 'ge_la:80 ge_ru:50', 'kl' => 'dk:80 us_intl:30', 'ko' => 'kr:80 us:60', 'kw' => 'uk:90', @@ -90,6 +100,7 @@ my %lang2keyboard = 'nn' => 'no:90 dvorak_no:10', 'no' => 'no:90 dvorak_no:10', 'oc' => 'fr:90', +'oc_FR'=> 'fr:90', 'ph' => 'us:90 us_intl:20', 'pl' => 'pl:80 pl2:60', 'pp' => 'br:80 la:20 pt:10 us_intl:30', @@ -97,27 +108,28 @@ my %lang2keyboard = 'pt_PT'=> 'pt:80', 'ro' => 'ro2:80 ro:40 us-intl:10', 'ru' => 'ru:90 ru_yawerty:80', - 'ru_RU.CP1251' => 'ru:90 ru_yawerty:80', - 'ru_RU.KOI8-R' => 'ru:90 ru_yawerty:80', +'ru_RU'=> 'ru:90 ru_yawerty:80', 'sk' => 'sk_qwerty:80 sk:70 sk_prog:50', 'sl' => 'si:80 hr:50', 'sp' => 'sr:80', 'sq' => 'al:80', 'sr' => 'yu:80', 'sv' => 'se:90 fi:20', +'sv_FI'=> 'fi:90 sv:20', +'sv_SE'=> 'se:90 fi:20', 'tg' => 'tj:80 ru_yawerty:40', 'th' => 'th:90', 'tr' => 'tr_q:90 tr_q:30', 'tt' => 'ru:50 ru_yawerty:40', 'uk' => 'ua:90 ru:50 ru_yawerty:40', -'uk_UA' => 'ua:90 ru:50 ru_yawerty:40', +'uk_UA'=> 'ua:90 ru:50 ru_yawerty:40', 'uz' => 'us:80', 'vi' => 'vn:80 us:60 us_intl:50', -'vi_VN.TCVN' => 'vn us:60 us_intl:50', -'vi_VN.VISCII' => 'vn us:60 us_intl:50', +'vi_VN'=> 'vn us:60 us_intl:50', 'wa' => 'be:90 fr:5', -'zh_CN.GB2312' => 'us:60', -'zh_TW.Big5' => 'us:60', +'wa_BE'=> 'be:90 fr:5', +'zh_CN'=> 'us:60', +'zh_TW'=> 'us:60', ); #- key = extension for Xmodmap file, [0] = description of the keyboard, @@ -269,13 +281,13 @@ sub unpack_keyboards { [ map { [ split ':' ] } split ' ', $k ]; } sub lang2keyboards { - my ($l) = @_; + my ($l) = substr($_[0], 0, 5); my $li = unpack_keyboards($lang2keyboard{$l}) || [ $keyboards{$l} && $l || "us" ]; $li->[0][1] ||= 100; $li; } sub lang2keyboard { - my ($l) = @_; + my ($l) = substr($_[0], 0, 5); my $kb = lang2keyboards($l)->[0][0]; $keyboards{$kb} ? $kb : "us"; #- handle incorrect keyboad mapping to us. } @@ -365,7 +377,7 @@ sub write { my ($prefix, $keyboard, $charset, $isNotDelete) = @_; my $config = read_raw($prefix); - put_in_hash($config, { + put_in_hash($config, { KEYTABLE => keyboard2kmap($keyboard), KBCHARSET => $charset, }); diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 0b58ee36d..57581faa5 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -18,43 +18,51 @@ use log; #- languages, carefully choosen) #- #- when adding a new language here, also add a line in kleyboards list + +# +# NOTE: we cheat for UTF-8 locales, 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 = ( 'en_US' => [ 'English|United States', 'iso-8859-1', 'en', 'en_US:en' ], 'en_GB' => [ 'English|United Kingdom', 'iso-8859-1', 'en', 'en_GB:en' ], 'af' => [ 'Afrikaans', 'iso-8859-1', 'af', 'af:en_ZA' ], 'ar' => [ 'Arabic', 'iso-8859-6', 'ar', 'ar' ], - 'az' => [ 'Azeri (Latin)', 'iso-8859-9e','az', 'az:tr' ], - 'be' => [ 'Belarussian', 'cp1251', 'be', 'be:be_BY.CP1251:ru_RU.CP1251' ], +'az_AZ.UTF-8'=> [ 'Azeri (Latin)', 'iso-8859-9e','az', 'az:tr' ], + 'be' => [ 'Belarussian|cp1251', 'cp1251', 'be', 'be:be_BY.CP1251:ru_RU.CP1251' ], +'be_BY.UTF-8' => [ 'Belarussian|utf-8', 'cp1251', 'be', 'be:be_BY.CP1251:ru_RU.CP1251' ], #- provide aliases for some not very standard names used in po files... 'bg' => [ 'Bulgarian', 'cp1251', 'bg', 'bg:bg.CP1251:bg_BG.CP1251:bg_BG' ], 'br' => [ 'Brezhoneg', 'iso-8859-1', 'br', 'br:fr_FR:fr' ], 'bs' => [ 'Bosnian', 'iso-8859-2', 'bs', 'bs:hr:sr' ], - 'ca' => [ 'Catalan', 'iso-8859-1', 'ca', 'ca:es_ES:es:fr_FR:fr' ], +'ca_ES@euro'=> [ 'Catalan','iso-8859-15','ca', 'ca:es_ES:es:fr_FR:fr' ], 'cs' => [ 'Czech', 'iso-8859-2', 'cs', 'cs' ], 'cy' => [ 'Cymraeg (Welsh)', 'iso-8859-14','cy', 'cy:en_GB:en' ], - 'da' => [ 'Danish', 'iso-8859-1', 'da', 'da' ], -'de_AT' => [ 'German|Austria', 'iso-8859-1', 'de', 'de_AT:de' ], -'de_BE' => [ 'German|Belgium', 'iso-8859-1', 'de', 'de_BE:de' ], + 'da' => [ 'Danish', 'iso-8859-1', 'da', 'da' ], +'de_AT@euro' => [ 'German|Austria','iso-8859-15','de', 'de_AT:de' ], +'de_BE@euro' => [ 'German|Belgium', 'iso-8859-15', 'de', 'de_BE:de' ], 'de_CH' => [ 'German|Switzerland', 'iso-8859-1', 'de', 'de_CH:de' ], -'de_DE' => [ 'German|Germany', 'iso-8859-1', 'de', 'de_DE:de' ], +'de_DE@euro' => [ 'German|Germany', 'iso-8859-15', 'de', 'de_DE:de' ], 'el' => [ 'Greek', 'iso-8859-7', 'el', 'el' ], 'eo' => [ 'Esperanto', 'iso-8859-3', 'eo', 'eo' ], 'es_AR' => [ 'Spanish|Argentina', 'iso-8859-1', 'es', 'es_AR:es_UY:es:es_ES' ], -'es_ES' => [ 'Spanish|Spain (modern sorting)', 'iso-8859-1', 'es', 'es_ES:es' ], +'es_ES@euro' => [ 'Spanish|Spain (modern sorting)', 'iso-8859-15', 'es', 'es_ES:es' ], 'es@tradicional' => [ 'Spanish|Spain (traditional sorting)', 'iso-8859-1', 'es', 'es' ], 'es_MX' => [ 'Spanish|Mexico', 'iso-8859-1', 'es', 'es_MX:es:es_ES' ], 'et' => [ 'Estonian', 'iso-8859-15','et', 'et' ], - 'eu' => [ 'Euskara (Basque)', 'iso-8859-1', 'eu', 'eu:es_ES:fr_FR:es:fr' ], - 'fa' => [ 'Farsi (Iranian)', 'isiri-3342', 'fa', 'fa' ], - 'fi' => [ 'Finnish (Suomi)', 'iso-8859-15', 'fi', 'fi' ], +'eu_ES@euro'=> [ 'Euskara (Basque)', 'iso-8859-15', 'eu', 'eu:es_ES:fr_FR:es:fr' ], +#-'fa' => [ 'Farsi (Iranian)', 'isiri-3342', 'fa', 'fa' ], +'fi_FI@euro'=> [ 'Finnish (Suomi)', 'iso-8859-15','fi', 'fi' ], #-'fo' => [ 'Faroese', 'iso-8859-1', 'fo', 'fo' ], -'fr_BE' => [ 'French|Belgium', 'iso-8859-1', 'fr', 'fr_BE:fr' ], -'fr_CA' => [ 'French|Canada', 'iso-8859-1', 'fr', 'fr_CA:fr' ], +'fr_BE@euro'=> [ '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-1', 'fr', 'fr_CH:fr' ], -'fr_FR' => [ 'French|France', 'iso-8859-1', 'fr', 'fr_FR:fr' ], - 'ga' => [ 'Gaeilge (Irish)', 'iso-8859-14','ga', 'ga:en_IE:en' ], +'fr_FR@euro'=> [ 'French|France', 'iso-8859-15','fr', 'fr_FR:fr' ], +'ga_IE@euro'=> [ 'Gaeilge (Irish)', 'iso-8859-15','ga', 'ga:en_IE:en' ], #-'gd' => [ 'Scottish gaelic', 'iso-8859-14','gd', 'gd:en_GB:en' ], - 'gl' => [ 'Galego (Galician)', 'iso-8859-1', 'gl', 'gl:es_ES:pt_PT:pt_BR:es:pt' ], +'gl_ES@euro'=> [ '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' ], @@ -66,11 +74,11 @@ my %languages = ( 'id' => [ 'Indonesian', 'iso-8859-1', 'id', 'id:in_ID' ], 'is' => [ 'Icelandic', 'iso-8859-1', 'is', 'is' ], 'it_CH' => [ 'Italian|Switzerland', 'iso-8859-1', 'it', 'it_IT:it' ], -'it_IT' => [ 'Italian|Italy', 'iso-8859-1', 'it', 'it_IT:it' ], +'it_IT@euro'=> [ 'Italian|Italy','iso-8859-15','it', 'it_IT:it' ], #-'iu' => [ 'Inuktitut', 'unicodeIU', 'iu', 'iu' ], 'ja' => [ 'Japanese', 'jisx0208', 'ja', 'ja_JP.ujis:ja' ], - 'ka' => [ 'Georgian', 'georgian-ps','ka', 'ka' ], - 'kl' => [ 'Greenlandic (inuit)', 'iso-8859-1', 'kl', 'kl' ], +'ka_GE.UTF-8'=> [ 'Georgian', 'georgian-ps','ka', 'ka' ], +#-'kl' => [ 'Greenlandic (inuit)', 'iso-8859-1', 'kl', 'kl' ], 'ko' => [ 'Korean', 'ksc5601', 'ko', 'ko' ], #-'kw' => [ 'Cornish gaelic', 'iso-8859-14','kw', 'kw:en_GB:en' ], #-'lo' => [ 'Laotian', 'mulelao-1', 'lo', 'lo' ], @@ -79,8 +87,8 @@ my %languages = ( 'mi' => [ 'Maori', 'iso-8859-13','mi', 'mi' ], 'mk' => [ 'Macedonian (Cyrillic)', 'iso-8859-5', 'mk', 'mk' ], #-'ms' => [ 'Malay', 'iso-8859-1', 'ms', 'ms' ], -'nl_BE' => [ 'Dutch|Belgium', 'iso-8859-1', 'nl', 'nl_NL:nl' ], -'nl_NL' => [ 'Dutch|Netherlands', 'iso-8859-1', 'nl', 'nl_NL:nl' ], +'nl_BE@euro'=> [ 'Dutch|Belgium', 'iso-8859-15', 'nl', 'nl_BE:nl' ], +'nl_NL@euro'=> [ 'Dutch|Netherlands','iso-8859-15', 'nl', 'nl_NL:nl' ], # '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 @@ -91,27 +99,27 @@ my %languages = ( 'pl' => [ 'Polish', 'iso-8859-2', 'pl', 'pl' ], #-'pp' => [ 'Papiamento', 'iso-8859-1', 'pp', 'pp' ], 'pt_BR' => [ 'Portuguese|Brazil', 'iso-8859-1', 'pt_BR', 'pt_BR:pt_PT:pt' ], -'pt_PT' => [ 'Portuguese|Portugal', 'iso-8859-1', 'pt', 'pt_PT:pt:pt_BR' ], +'pt_PT@euro'=> [ 'Portuguese|Portugal','iso-8859-15','pt', 'pt_PT:pt:pt_BR' ], 'ro' => [ 'Romanian', 'iso-8859-2', 'ro', 'ro' ], -'ru_RU.KOI8-R' => [ 'Russian|KOI8-R', 'koi8-r', 'ru', 'ru_RU.KOI8-R:ru' ], -'ru_RU.CP1251' => [ 'Russian|CP1251', 'cp1251', 'ru', 'ru_RU.CP1251:ru' ], +'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', 'cp1251', 'ru', 'ru_RU:ru' ], 'sk' => [ 'Slovak', 'iso-8859-2', 'sk', 'sk' ], 'sl' => [ 'Slovenian', 'iso-8859-2', 'sl', 'sl' ], 'sp' => [ 'Serbian|Cyrillic', 'iso-8859-5', 'sp', 'sp:sr' ], 'sr' => [ 'Serbian|Latin', 'iso-8859-2', 'sr', 'sr' ], 'sv' => [ 'Swedish', 'iso-8859-1', 'sv', 'sv' ], - 'ta' => [ 'Tamil', 'tscii-0', 'ta', 'ta' ], - 'tg' => [ 'Tajik', 'koi8-c', 'tg', 'tg' ], +#-'ta' => [ 'Tamil', 'tscii-0', 'ta', 'ta' ], +'tg_TJ.UTF-8'=> [ 'Tajik', 'koi8-k', 'tg', 'tg' ], 'th' => [ 'Thai', 'tis620', 'th', 'th' ], 'tr' => [ 'Turkish', 'iso-8859-9', 'tr', 'tr' ], - 'tt' => [ 'Tatar', 'tatar-cyr', 'tg', 'tg' ], +#-'tt_RU.UTF-8'=> [ 'Tatar', 'koi8-k', 'tg', 'tg' ], #-'ur' => [ 'Urdu', 'cp1256', 'ur', 'ur' ], 'uk_UA' => [ 'Ukrainian', 'koi8-u', 'uk', 'uk_UA:uk' ], 'uz' => [ 'Uzbek', 'iso-8859-1', 'uz', 'uz' ], - 'vi' => [ 'Vietnamese|TCVN', 'tcvn', 'vi', - 'vi_VN.TCVN:vi_VN.TCVN-5712:vi_VN.tcvn:vi' ], -'vi_VN.VISCII' => [ 'Vietnamese|VISCII','viscii', 'vi', - 'vi_VN.VISCII:vi_VN.viscii:vi' ], +'vi_VN.TCVN' => [ 'Vietnamese|TCVN', 'tcvn', 'vi', 'vi' ], +'vi_VN.VISCII' => [ 'Vietnamese|VISCII','viscii', 'vi', 'vi' ], +'vi_VN.UTF-8' => [ 'Vietnamese|UTF-8','tcvn', 'vi', 'vi' ], 'wa' => [ 'Walon', 'iso-8859-1', 'wa', 'wa:fr_BE:fr' ], #-'yi' => [ 'Yiddish', 'cp1255', 'yi', 'yi' ], #'zh_HK.Big5' => [ 'Chinese|Traditional|Hong Kong|Big5', 'Big5', 'zh_TW.Big5', 'zh_TW.Big5:zh_TW.big5:zh_TW:zh_HK' ], @@ -246,11 +254,11 @@ my %charsets = ( "jisx0208" => [ undef, undef, "trivial.trans", "euc-jp", "932", "-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ], "koi8-r" => [ "UniCyr_8x16", undef, "koi8-r", - "koi8-r", "866", std("koi8-r") ], + "koi8-r", "866", sub { std("microsoft-cp1251", @_) } ], "koi8-u" => [ "UniCyr_8x16", undef, "koi8-u", - "koi8-u", "866", std("koi8-u") ], + "koi8-u", "866", sub { std("microsoft-cp1251", @_) } ], "koi8-k" => [ "koi8-k", "iso01", "trivial.trans", - undef, undef, std("koi8-c") ], + undef, undef, std("koi8-k") ], "tatar-cyr" => [ "tatar-cyr", undef, "cp1251", undef, undef, std("tatar-cyr") ], "cp1251" => [ "UniCyr_8x16", undef, "cp1251", @@ -319,6 +327,8 @@ sub set { eval { require packdrake; my $packer = new packdrake("$ENV{SHARE_PATH}/locale.cz2", quiet => 1); + # "UTF-8" locale directory is always needed + $packer->extract_archive("$ENV{SHARE_PATH}/locale", "UTF-8"); $packer->extract_archive("$ENV{SHARE_PATH}/locale", split(":", $languages{$lang}[3])); }; } @@ -336,7 +346,7 @@ sub set { $ENV{LC_MEASUREMENT} = "C"; $ENV{LC_IDENTIFICATION} = "C"; - $ENV{LC_CTYPE} = $lang; + $ENV{LC_CTYPE} = $languages{$lang}[2]; $ENV{LC_MESSAGES} = $languages{$lang}[2]; $ENV{LANG} = $languages{$lang}[2]; $ENV{LANGUAGE} = $languages{$lang}[3]; diff --git a/perl-install/share/gen_locales.sh b/perl-install/share/gen_locales.sh index 828c893a0..88b12b3f5 100755 --- a/perl-install/share/gen_locales.sh +++ b/perl-install/share/gen_locales.sh @@ -9,14 +9,14 @@ for i in LC_ADDRESS LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MONETARY LC_N done # lc_ctype for common encoding -for i in CP1251 CP1255 CP1256 ISO-8859-13 ISO-8859-14 ISO-8859-15 ISO-8859-2 ISO-8859-3 ISO-8859-5 ISO-8859-7 ISO-8859-9 ISO-8859-9E KOI8-U KOI8-R ; do +for i in CP1251 ISO-8859-13 ISO-8859-14 ISO-8859-15 ISO-8859-2 ISO-8859-3 ISO-8859-5 ISO-8859-7 ISO-8859-9 ISO-8859-9E KOI8-U KOI8-R ; do f=usr/share/locale/$i/LC_CTYPE [ -e /$f ] || { echo missing /$f ; exit 1 ; } cp -f /$f $f done rm -rf .tmp2 ; mkdir .tmp2 ; cd .tmp2 -for i in hy ja ko ta th vi ; do +for i in hy ja ko th vi ; do ii=locales-`echo $i | sed 's/\(..\).*/\1/'` rpm2cpio /RPMS/$ii-*.rpm | cpio -id --quiet f=usr/share/locale/$i/LC_CTYPE diff --git a/perl-install/share/list b/perl-install/share/list index d7c95b143..410cd52de 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -30,23 +30,21 @@ /usr/lib/gconv/libJIS.so /usr/lib/gconv/libKSC.so /usr/lib/gconv/EUC-KR.so -/usr/lib/gconv/ISIRI-3342.so /usr/lib/gconv/ISO8859-15.so /usr/lib/gconv/ISO8859-14.so /usr/lib/gconv/ISO8859-13.so +/usr/lib/gconv/ISO8859-9E.so /usr/lib/gconv/ISO8859-9.so /usr/lib/gconv/ISO8859-7.so -/usr/lib/gconv/ISO8859-6.so /usr/lib/gconv/ISO8859-5.so /usr/lib/gconv/ISO8859-3.so /usr/lib/gconv/ISO8859-2.so /usr/lib/gconv/ISO8859-1.so +/usr/lib/gconv/KOI8-K.so /usr/lib/gconv/KOI8-U.so /usr/lib/gconv/KOI8-R.so /usr/lib/gconv/TIS-620.so /usr/lib/gconv/CP1251.so -/usr/lib/gconv/CP1255.so -/usr/lib/gconv/CP1256.so /usr/lib/gconv/GEORGIAN-PS.so /usr/lib/gconv/EUC-CN.so /usr/lib/gconv/gconv-modules diff --git a/perl-install/share/locales-skeleton.tar.bz2 b/perl-install/share/locales-skeleton.tar.bz2 index c8765905c..5afb2629e 100644 Binary files a/perl-install/share/locales-skeleton.tar.bz2 and b/perl-install/share/locales-skeleton.tar.bz2 differ -- cgit v1.2.1