From 24601315cd2375b62c56369da5b85e64eb9f4fc2 Mon Sep 17 00:00:00 2001 From: Pablo Saratxaga Date: Wed, 2 Jan 2002 11:48:39 +0000 Subject: changed @euro locales to plain names; now old currencies ones are obsolete --- perl-install/lang.pm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 80ec77201..0531b4a88 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -27,7 +27,7 @@ use log; 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' ], -'en_IE@euro' => [ 'English|Ireland (euro)','iso-8859-15', 'en', 'en_IE:en_GB:en' ], +'en_IE' => [ 'English|Ireland', 'iso-8859-15', 'en', 'en_IE:en_GB:en' ], 'af' => [ 'Afrikaans', 'iso-8859-1', 'af', 'af:en_ZA' ], 'ar' => [ 'Arabic', 'iso-8859-6', 'ar', 'ar' ], 'az_AZ.UTF-8'=> [ 'Azeri (Latin)', 'iso-8859-9e','az', 'az:tr' ], @@ -37,32 +37,32 @@ my %languages = ( '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_ES@euro'=> [ 'Catalan','iso-8859-15','ca', 'ca:es_ES:es:fr_FR:fr' ], +'ca_ES' => [ '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@euro' => [ 'German|Austria','iso-8859-15','de', 'de_AT:de' ], -'de_BE@euro' => [ 'German|Belgium', 'iso-8859-15', 'de', 'de_BE:de' ], +'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-1', 'de', 'de_CH:de' ], -'de_DE@euro' => [ 'German|Germany', 'iso-8859-15', 'de', 'de_DE:de' ], +'de_DE' => [ '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@euro' => [ 'Spanish|Spain (modern sorting)', 'iso-8859-15', 'es', 'es_ES:es' ], +'es_ES' => [ '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_ES@euro'=> [ 'Euskara (Basque)', 'iso-8859-15', 'eu', 'eu:es_ES:fr_FR:es:fr' ], +'eu_ES' => [ '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' ], +'fi_FI' => [ 'Finnish (Suomi)', 'iso-8859-15','fi', 'fi' ], #-'fo' => [ 'Faroese', 'iso-8859-1', 'fo', 'fo' ], -'fr_BE@euro'=> [ 'French|Belgium', 'iso-8859-15','fr', 'fr_BE:fr' ], +'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-1', 'fr', 'fr_CH:fr' ], -'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' ], +'fr_FR' => [ 'French|France', 'iso-8859-15','fr', 'fr_FR:fr' ], +'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@euro'=> [ 'Galego (Galician)', 'iso-8859-15','gl', 'gl:es_ES:pt_PT:pt_BR:es:pt' ], +'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' ], @@ -74,7 +74,7 @@ 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@euro'=> [ 'Italian|Italy','iso-8859-15','it', 'it_IT:it' ], +'it_IT' => [ 'Italian|Italy','iso-8859-15','it', 'it_IT:it' ], #-'iu' => [ 'Inuktitut', 'unicodeIU', 'iu', 'iu' ], 'ja' => [ 'Japanese', 'jisx0208', 'ja', 'ja_JP.ujis:ja' ], 'ka_GE.UTF-8'=> [ 'Georgian', 'georgian-ps','ka', 'ka' ], @@ -88,8 +88,8 @@ my %languages = ( 'mk' => [ 'Macedonian (Cyrillic)', 'iso-8859-5', 'mk', 'mk' ], #-'ms' => [ 'Malay', 'iso-8859-1', 'ms', 'ms' ], 'mt' => [ 'Maltese', 'iso-8859-3', 'mt', 'mt' ], -'nl_BE@euro'=> [ 'Dutch|Belgium', 'iso-8859-15', 'nl', 'nl_BE:nl' ], -'nl_NL@euro'=> [ 'Dutch|Netherlands','iso-8859-15', 'nl', 'nl_NL:nl' ], +'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 '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 @@ -100,7 +100,7 @@ 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@euro'=> [ 'Portuguese|Portugal','iso-8859-15','pt', 'pt_PT:pt:pt_BR' ], +'pt_PT' => [ '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:ru' ], 'ru_RU.CP1251' => [ 'Russian|CP1251', 'cp1251', 'ru', 'ru_RU:ru' ], -- cgit v1.2.1