Added some more English locales; and changed all locale names using xx

notation to xx_YY notation (so it's easier to just append a ".UTF-8" in
case we provide a way to let the user choose if he wants UTF-8 or not)

2 files changed, 54 insertions, 44 deletions

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index f51e19e4b..6a337aefe 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -43,8 +43,12 @@ my %lang2keyboard =
   'el'  => 'gr:90',
   'en'  => 'us:90 us_intl:50',
 'en_US' => 'us:90 us_intl:50',
+'en_AU' => 'uk:70 us:60 us_intl:50',
+'en_CA' => 'qc:60 us:50 uk:40 us_intl:30',
 'en_GB' => 'uk:89 us:60 us_intl:50',
 'en_IE' => 'uk:89 us:60 us_intl:50',
+'en_NZ' => 'uk:70 us:60 us_intl:50',
+'en_ZA' => 'us:80 uk:50 us_intl:40',
   'eo'  => 'us_intl:89 dvorak:20',
   'es'  => 'es:85 la:80 us_intl:50',
 'es@tr' => 'es:85 la:80 us_intl:50',
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 7328ae10b..b7d3232f4 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -26,101 +26,106 @@ use log;
 
 my %languages = my @languages = (
 'en_US' => [ 'English|United States',	'C', 'en', 'en_US:en' ],
+'en_AU' => [ 'English|Australia',	'iso-8859-15', 'en', 'en_CA:en_GB:en' ],
+'en_CA' => [ 'English|Canada',		'iso-8859-15', 'en', 'en_CA:en_GB: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_NZ' => [ 'English|New Zealand',	'iso-8859-15', 'en', 'en_CA:en_GB:en' ],
+'en_ZA' => [ 'English|South Africa',	'iso-8859-15', 'en', 'en_ZA:en_GB: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' ],
+'af_ZA'  => [ 'Afrikaans',		'iso-8859-1', 'af', 'af:en_ZA:en_GB' ],
 'am_ET.UTF-8' => [ 'Amharic',		'utf_am',     'am', 'am', 'UTF-8' ],
 'ar_EG.UTF-8' => [ 'Arabic',		'iso-8859-6', 'ar', 'ar', 'UTF-8' ],
 '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' => [ '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', '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' => [ 'Bulgarian (CP1251)',	'cp1251',     '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' ],
+'br_FR' => [ 'Brezhoneg',		'iso-8859-15', 'br', 'br:fr_FR:fr' ],
+'bs_BA' => [ 'Bosnian',			'iso-8859-2', 'bs', 'bs' ],
 'ca_ES' => [ 'Catalan',			'iso-8859-15', 'ca', 'ca:es_ES:es' ],
-  'cs'  => [ 'Czech',			'iso-8859-2', 'cs', 'cs' ],
+'cs_CZ' => [ 'Czech',			'iso-8859-2', 'cs', 'cs' ],
 'cy_GB.UTF-8' => [ 'Cymraeg (Welsh)',	'iso-8859-14',   'cy', 'cy:en_GB:en', 'UTF-8' ],
-  'da'  => [ 'Danish',			'iso-8859-15', 'da', 'da' ],		
+'da_DK' => [ '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' => [ 'Greek',        'iso-8859-7', 'el', 'el' ],
 'el_GR.UTF-8' => [ 'Greek (UTF-8)',        'iso-8859-7',     'el', 'el', 'UTF-8' ],
-  'eo'  => [ 'Esperanto',		'iso-8859-3',      'eo', 'eo', 'UTF-8' ],
+'eo_XX' => [ '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)', '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' ],
+'et_EE'  => [ 'Estonian',		'iso-8859-15', 'et', 'et' ],
 'eu_ES' => [ 'Euskara (Basque)', 'iso-8859-15', 'eu', 'eu' ],
 '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' ],
+#-'fo_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)', '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' ],
+#-'gd_GB' => [ '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' ],
+#-'gv_GB' => [ 'Manx gaelic',		'iso-8859-14','gv', 'gv:en_GB:en' ],
 #- 'iw' was the old code for hebrew language
 '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' ],
+'hi_IN.UTF-8' => [ 'Hindi',		'unicode', 'hi', 'hi:en_IN:en_GB', 'UTF-8' ],
+'hr_HR' => [ 'Croatian',		'iso-8859-2', 'hr', 'hr' ],
+'hu_HU' => [ 'Hungarian', 		'iso-8859-2', 'hu', 'hu' ],
 'hy_AM.UTF-8' => [ 'Armenian',     'utf_hy',     'hy', 'hy', 'UTF-8' ],
+#'ia_XX' => [ 'Interlingua',		'unicode',     'ia', 'ia' ],
 #- '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' ],
-  'is'  => [ 'Icelandic', 		'iso-8859-1', 'is', 'is' ],
+'id_ID' => [ 'Indonesian',		'iso-8859-1', 'id', 'id:in_ID' ],
+'is_IS' => [ 'Icelandic', 		'iso-8859-1', 'is', 'is' ],
 'it_CH' => [ 'Italian|Switzerland',	'iso-8859-15', 'it', 'it_IT:it' ],
 'it_IT' => [ 'Italian|Italy', 'iso-8859-15', 'it', 'it_IT:it' ],
-#-'iu'  => [ 'Inuktitut', 		'utf_iu',  'iu', 'iu' ],
-  'ja'  => [ 'Japanese',		'jisx0208',   'ja', 'ja_JP.ujis:ja' ],
+#-'iu_CA' => [ 'Inuktitut', 		'utf_iu',  'iu', 'iu' ],
+'ja_JP' => [ 'Japanese',		'jisx0208',   'ja', 'ja_JP.ujis:ja' ],
 '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' ],
+#-'kl_GL' => [ 'Greenlandic (inuit)',	'iso-8859-1', 'kl', 'kl' ],
+'ko_KR' => [ 'Korean',           'ksc5601',    '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',			'utf_lo',  'lo', 'lo' ],
-  'lt'  => [ 'Lithuanian',		'iso-8859-13', 'lt', 'lt' ],
-  'lv'  => [ 'Latvian',			'iso-8859-13', 'lv', 'lv' ],   
+#-'kw_GB' => [ 'Cornish gaelic',		'iso-8859-14','kw', 'kw:en_GB:en' ],
+#-'lo_LA' => [ 'Laotian',			'utf_lo',  'lo', 'lo' ],
+'lt_LT' => [ 'Lithuanian',		'iso-8859-13', 'lt', 'lt' ],
+'lv_LV' => [ 'Latvian',			'iso-8859-13', 'lv', 'lv' ],   
 'mi_NZ.UTF-8' => [ 'Maori',		'iso-8859-13', 'mi', 'mi', 'UTF-8' ],
 'mk_MK.UTF-8' => [ 'Macedonian (Cyrillic)', 'cp1251',   'mk', 'mk', 'UTF-8' ],
-  'ms'  => [ 'Malay',			'iso-8859-1', 'ms', 'ms' ],
+'ms_MY' => [ 'Malay',			'iso-8859-1', 'ms', 'ms' ],
 '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
-  'no'  => [ 'Norwegian|Bokmaal',	'iso-8859-1', 'no', 'no:nb:nn:no@nynorsk:no_NY' ],
+'no_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
-  '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' ],
-#-'ph'  => [ 'Pilipino',		'iso-8859-1', 'ph', 'ph:tl' ],
-  'pl'  => [ 'Polish',			'iso-8859-2', 'pl', 'pl' ],
-#-'pp'	=> [ 'Papiamento',		'iso-8859-1', 'pp', 'pp' ],
+'nn_NO'	=> [ 'Norwegian|Nynorsk',	'iso-8859-1', 'no', 'nn:no@nynorsk:no_NY:no:nb' ],
+#-'oc_FR' => [ 'Occitan',			'iso-8859-1', 'oc', 'oc:fr_FR' ],
+#-'ph_PH' => [ 'Pilipino',		'iso-8859-1', 'ph', 'ph:tl' ],
+'pl_PL' => [ 'Polish',			'iso-8859-2', 'pl', 'pl' ],
+#-'pp_AN'=> [ '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-15', 'pt', 'pt_PT:pt:pt_BR' ],
-  'ro'  => [ 'Romanian',  		'iso-8859-2', 'ro', 'ro' ],
+'ro_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',	'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' ],
+'sk_SK' => [ 'Slovak',    		'iso-8859-2', 'sk', 'sk' ],
+'sl_SI' => [ 'Slovenian',		'iso-8859-2', 'sl', 'sl' ],
+#'sp_YU.ISO-8859-5' => [ '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', 'cp1251',   'sp', 'sp:sr', 'UTF-8' ],
-  'sr'  => [ 'Serbian|Latin (ISO-8859-2)', 'iso-8859-2', 'sr', 'sr' ],
+'sr_YU.ISO-8859-2' => [ 'Serbian|Latin (ISO-8859-2)', 'iso-8859-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' ],
+'sv_SE' => [ '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)
@@ -129,18 +134,19 @@ my %languages = my @languages = (
 #- itself as a fake iso-8859-1
 #'ta_IN.UTF-8' => [ 'Tamil (UTF-8)',	'iso-8859-1',      'ta', 'ta', 'UTF-8' ],
 'ta_IN' => [ 'Tamil (TSCII)',		'tscii',      'ta', 'ta' ],
+'ta_IN.UTF-8' => [ 'Tamil (UTF-8)',	'unicode',     'ta', 'ta' ],
 'tg_TJ.UTF-8' => [ 'Tajik',		'utf_koi8-k',    'tg', 'tg', 'UTF-8' ],
-  'th'  => [ 'Thai|TIS-620',            'tis620',     'th', 'th' ],
+'th_TH' => [ 'Thai|TIS-620',            'tis620',     'th', 'th' ],
 'th_TH.UTF-8' => [ 'Thai (UTF-8)',         'tis620',     'th', 'th', 'UTF-8' ],
-  'tr'  => [ 'Turkish',	 		'iso-8859-9', 'tr', 'tr' ],
+'tr_TR' => [ 'Turkish',	 		'iso-8859-9', 'tr', 'tr' ],
 #-'tt_RU.UTF-8' => [ 'Tatar',		'utf_koi8-k',  'tt', 'tt' ],
-#-'ur'	=> [ 'Urdu',			'cp1256',     'ur', 'ur' ],  
+#-'ur_PK' => [ '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',	'cp1251',   'uk', 'uk_UA:uk', 'UTF-8' ],
-  'uz'  => [ 'Uzbek',			'iso-8859-1', 'uz', 'uz' ],
+'uz_UZ' => [ 'Uzbek',			'iso-8859-1', 'uz', 'uz' ],
 'vi_VN.UTF-8' => [ 'Vietnamese',  'utf_vi',   'vi', 'vi', 'UTF-8' ],
-  'wa'  => [ 'Walon',     		'iso-8859-15', 'wa', 'wa:fr_BE:fr' ],
+'wa_BE' => [ '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