Enabled choice of Guarani, Quichua and Berber (tifinagh) at install time;

changed various encoding names internally used for font choosing from
language based to encoding based (following iso-15924 naming)

2 files changed, 60 insertions, 49 deletions

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 04b7921ea..04f2437b4 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -21,14 +21,15 @@ use log;
 #-      default locale shown here (field [2]) and ll: the language (the key))
 our %langs = (
 'af' =>    [ 'Afrikaans',           'Afrikaans',         'af_ZA', '  3  ', 'iso-8859-1' ],
-'am' =>    [ 'Amharic',             'ZZ emarNa',         'am_ET', '  3  ', 'utf_am' ],
+'am' =>    [ 'Amharic',             'ZZ emarNa',         'am_ET', '  3  ', 'utf_ethi' ],
 'ar' =>    [ 'Arabic',              'AA Arabic',         'ar_EG', ' 23  ', 'utf_ar' ],
-'as' =>    [ 'Assamese',            'ZZ Assamese',       'as_IN', ' 2   ', 'utf_bn' ],
+'as' =>    [ 'Assamese',            'ZZ Assamese',       'as_IN', ' 2   ', 'utf_beng' ],
 'az' =>    [ 'Azeri (Latin)',       'Azerbaycanca',      'az_AZ', ' 2   ', 'utf_az' ],
 'be' =>    [ 'Belarussian',         'Belaruskaya',       'be_BY', '1    ', 'cp1251' ],
-#-'ber' => [ 'Berber',              'ZZ Tamazight',      'ber_MA','  3  ', 'unicode' ],
+#- ber_MA not yet done, using fr_FR locale instead
+'ber' =>   [ 'Berber',              'ZZ Tamazight',      'fr_FR', '  3  ', 'utf_tfng', 'ber:fr' ],
 'bg' =>    [ 'Bulgarian',           'Blgarski',          'bg_BG', '1    ', 'cp1251' ],
-'bn' =>    [ 'Bengali',             'ZZ Bengali',        'bn_BD', ' 2   ', 'utf_bn' ],
+'bn' =>    [ 'Bengali',             'ZZ Bengali',        'bn_BD', ' 2   ', 'utf_beng' ],
 'br' =>    [ 'Breton',              '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' ],
@@ -54,25 +55,26 @@ our %langs = (
 'ga' =>    [ 'Gaelic (Irish)',      'Gaeilge',           'ga_IE', '1    ', 'iso-8859-15', 'ga:en_IE:en_GB:en' ],
 #'gd' =>   [ 'Gaelic (Scottish)',   'Gaidhlig',          'gd_GB', '1    ', 'utf_lat8',    'gd:en_GB:en' ],
 'gl' =>    [ 'Galician',            'Galego',            'gl_ES', '1    ', 'iso-8859-15', 'gl:es_ES:es:pt:pt_BR' ],
-#'gn' =>   [ 'Guarani',             'Avane-e',           'gn_PY', '    5', 'utf8',    'gn:es_PY:es' ],
+#- gn_PY not yet done, using es_PY locale instead
+'gn' =>    [ 'Guarani',             'Avane-e',           'es_PY', '    5', 'utf_lat1',    'gn:es_PY:es' ],
 'gu' =>    [ 'Gujarati',            'ZZ Gujarati',       'gu_IN', ' 2   ', 'unicode' ],
 #'gv' =>   [ 'Gaelic (Manx)',       'Gaelg',             'gv_GB', '1    ', 'utf_lat8',    'gv:en_GB:en' ],
 'he' =>    [ 'Hebrew',              'AA Ivrit',          'he_IL', ' 2   ', 'utf_he' ],
-'hi' =>    [ 'Hindi',               'ZZ Hindi',          'hi_IN', ' 2   ', 'utf_hi' ],
+'hi' =>    [ 'Hindi',               'ZZ Hindi',          'hi_IN', ' 2   ', 'utf_deva' ],
 '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   ', 'utf_hy' ],
+'hy' =>    [ 'Armenian',            'ZZ Armenian',       'hy_AM', ' 2   ', 'utf_armn' ],
 # locale not done yet
-#'ia' =>   [ 'Interlingua',         'Interlingua',       'ia_XX', '1   5', 'utf8' ],
+#'ia' =>   [ 'Interlingua',         'Interlingua',       'ia_XX', '1   5', 'utf_lat1' ],
 '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', 'utf8iu' ],
+'iu' =>    [ 'Inuktitut',           'ZZ Inuktitut',      'iu_CA', '    5', 'utf_iu' ],
 'ja' =>    [ 'Japanese',            'ZZ Nihongo',        'ja_JP', ' 2   ', 'jisx0208' ],
-'ka' =>    [ 'Georgian',            'ZZ Georgian',       'ka_GE', ' 2   ', 'utf_ka' ],
+'ka' =>    [ 'Georgian',            'ZZ Georgian',       'ka_GE', ' 2   ', 'utf_geor' ],
 'kl' =>    [ 'Greenlandic (inuit)', 'Kalaallisut',       'kl_GL', '    5', 'iso-8859-1' ],
-'km' =>    [ 'Khmer',               'ZZ Khmer',          'km_KH', ' 2   ', 'utf_km' ],
-'kn' =>    [ 'Kannada',             'ZZ Kannada',        'kn_IN', ' 2   ', 'utf_kn' ],
+'km' =>    [ 'Khmer',               'ZZ Khmer',          'km_KH', ' 2   ', 'utf_khmr' ],
+'kn' =>    [ 'Kannada',             'ZZ Kannada',        'kn_IN', ' 2   ', 'utf_knda' ],
 'ko' =>    [ 'Korean',              'ZZ Korea',          'ko_KR', ' 2   ', 'ksc5601' ],
 'ku' =>    [ 'Kurdish',             'Kurdi',             'ku_TR', ' 2   ', 'iso-8859-9' ],
 #-'kw' =>  [ 'Cornish',             'Kernewek',          'kw_GB', '1    ', 'utf_lat8',    'kw:en_GB:en' ],
@@ -80,7 +82,7 @@ our %langs = (
 #- lb_LU not yet done, using de_LU locale instead
 'lb' =>    [ 'Luxembourgish',       'Letzebuergesch',    'de_LU', '1    ', 'iso-8859-15', 'lb:de_LU' ],
 'li' =>    [ 'Limbourgish',         'Limburgs',          'li_NL', '1    ', 'iso-8859-15' ],
-'lo' =>    [ 'Laotian',             'Laotian',           'lo_LA', ' 2   ', 'utf_lo' ],
+'lo' =>    [ 'Laotian',             'Laotian',           'lo_LA', ' 2   ', 'utf_laoo' ],
 'lt' =>    [ 'Lithuanian',          'Lietuviskai',       'lt_LT', '1    ', 'iso-8859-13' ],
 #- ltg_LV locale not done yet, using lv_LV for now
 #- "ltg" is not a standard lang code, ISO-639 code was refused;
@@ -90,9 +92,9 @@ our %langs = (
 'lv' =>    [ 'Latvian',             'Latviesu',          'lv_LV', '1    ', 'iso-8859-13' ],
 'mi' =>    [ 'Maori',               'Maori',             'mi_NZ', '   4 ', 'unicode' ],
 'mk' =>    [ 'Macedonian',          'Makedonski',        'mk_MK', '1    ', 'utf_cyr1' ],
-'ml' =>    [ 'Malayalam',           'ZZ Malayalam',      'ml_IN', ' 2   ', 'utf_ml' ],
+'ml' =>    [ 'Malayalam',           'ZZ Malayalam',      'ml_IN', ' 2   ', 'utf_mlym' ],
 'mn' =>    [ 'Mongolian',           'Mongol',            'mn_MN', ' 2   ', 'utf_cyr2' ],
-'mr' =>    [ 'Marathi',             'ZZ Marathi',        'mr_IN', ' 2   ', 'utf_hi' ],
+'mr' =>    [ 'Marathi',             'ZZ Marathi',        'mr_IN', ' 2   ', 'utf_deva' ],
 'ms' =>    [ 'Malay',               'Bahasa Melayu',     'ms_MY', ' 2   ', 'iso-8859-1' ],
 'mt' =>    [ 'Maltese',             'Maltin',            'mt_MT', '1 3  ', 'unicode' ],
 'nb' =>    [ 'Norwegian Bokmaal',   'Norsk, Bokmal',     'nb_NO', '1    ', 'iso-8859-1',  'nb:no' ],
@@ -101,7 +103,7 @@ our %langs = (
 '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' ],
 'oc' =>    [ 'Occitan',             'Occitan',           'oc_FR', '1    ', 'iso-8859-1',  'oc:fr_FR:fr' ],
-'pa_IN' => [ 'Punjabi (gurmukhi)',  'ZZ Punjabi',        'pa_IN', ' 2   ', 'utf_pa' ],
+'pa_IN' => [ 'Punjabi (gurmukhi)',  'ZZ Punjabi',        'pa_IN', ' 2   ', 'utf_guru' ],
 #- 'tl' in priority position for now, as 'fil' is not much used.
 #- Monolingual window managers will not see the menus otherwise
 #- "ph_PH" should change to "fil_PH" in the future ("ph" is not
@@ -110,6 +112,8 @@ our %langs = (
 'pl' =>    [ 'Polish',              'Polski',            'pl_PL', '1    ', 'iso-8859-2' ],
 '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' ],
+#- qu_PE not yet done, using es_PE locale instead
+'qu' =>    [ 'Quichua',             'Runa Simi',         'es_PE', '    5', 'utf_lat1', 'qu:es_PE:es' ],
 'ro' =>    [ 'Romanian',            'Romana',            'ro_RO', '1    ', 'iso-8859-2' ],
 'ru' =>    [ 'Russian',             'Russkij',           'ru_RU', '12   ', 'koi8-u' ],
 'sc' =>    [ 'Sardinian',           'Sardu',             'sc_IT', '1    ', 'iso-8859-15', 'sc:it_IT:it' ],
@@ -126,13 +130,13 @@ our %langs = (
 'ss' =>    [ 'Swati',               'SiSwati',           'en_ZA', '  3  ', 'iso-8859-1', 'ss:en_ZA' ],
 'st' =>    [ 'Sotho',               'Sesotho',           'st_ZA', '  3  ', 'iso-8859-1', 'st:nso:en_ZA' ],
 'sv' =>    [ 'Swedish',             'Svenska',           'sv_SE', '1    ', 'iso-8859-1' ],
-'ta' =>    [ 'Tamil',               'ZZ Tamil',          'ta_IN', ' 2   ', 'utf_ta' ],
+'ta' =>    [ 'Tamil',               'ZZ Tamil',          'ta_IN', ' 2   ', 'utf_taml' ],
 'te' =>    [ 'Telugu',              'ZZ Telugu',         'te_IN', ' 2   ', 'unicode' ],
 'tg' =>    [ 'Tajik',               'Tojiki',            'tg_TJ', ' 2   ', 'utf_cyr2' ],
 'th' =>    [ 'Thai',                'ZZ Thai',           'th_TH', ' 2   ', 'tis620' ],
-'tk' =>    [ 'Turkmen',             'Turkmence',         'tk_TM', ' 2   ', 'utf8' ],
+'tk' =>    [ 'Turkmen',             'Turkmence',         'tk_TM', ' 2   ', 'utf_az' ],
 'tr' =>    [ 'Turkish',             'Turkce',            'tr_TR', '12   ', 'iso-8859-9' ],
-'tt' =>    [ 'Tatar',               'Tatarca',           'tt_RU', ' 2   ', 'utf8' ],
+'tt' =>    [ 'Tatar',               'Tatarca',           'tt_RU', ' 2   ', 'utf_lat5' ],
 #- ug_CN locale not done yet, using ar_EG locale instead
 'ug' =>    [ 'Uyghur',              'AA Uyghur',         'ar_EG', ' 2   ', 'utf_ar', 'ug' ],  
 'uk' =>    [ 'Ukrainian',           'Ukrayinska',        'uk_UA', '1    ', 'koi8-u' ],
@@ -698,25 +702,29 @@ my %charsets = (
 #- I have no console font for Thai...
 "tis620"      => [ undef,         undef,   "trivial.trans", "tis-620",    "874" ],
 # 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_armn"    => [ "arm8",           undef,   undef,      "utf8",    undef ],
 "utf_az"      => [ "tiso09e",        undef,   undef,      "utf8",    undef ],
-"utf_bn"      => [ undef,            undef,   undef,      "utf8",    undef ],
+"utf_beng"    => [ undef,            undef,   undef,      "utf8",    undef ],
 "utf_cyr1"    => [ "UniCyr_8x16",    undef,   undef,      "utf8",    undef ],
 "utf_cyr2"    => [ "koi8-k",         undef,   undef,      "utf8",    undef ],
+"utf_deva"    => [ undef,            undef,   undef,      "utf8",    undef ],
+"utf_ethi"    => [ "Agafari-16",     undef,   undef,      "utf8",    undef ],
+"utf_geor"    => [ "t_geors",        undef,   undef,      "utf8",    undef ],
+"utf_guru"    => [ undef,            undef,   undef,      "utf8",    undef ],
 "utf_he"      => [ "iso08.f16",      undef,   undef,      "utf8",    undef ],
-"utf_hi"      => [ undef,            undef,   undef,      "utf8",    undef ],
-"utf_hy"      => [ "arm8",           undef,   undef,      "utf8",    undef ],
 "utf_iu"      => [ undef,            undef,   undef,      "utf8",    undef ],
-"utf_ka"      => [ "t_geors",        undef,   undef,      "utf8",    undef ],
-"utf_km"      => [ undef,            undef,   undef,      "utf8",    undef ],
-"utf_kn"      => [ undef,            undef,   undef,      "utf8",    undef ],
-"utf_ml"      => [ undef,            undef,   undef,      "utf8",    undef ],
-"utf_lo"      => [ undef,            undef,   undef,      "utf8",    undef ],
-"utf_pa"      => [ undef,            undef,   undef,      "utf8",    undef ],
-"utf_ta"      => [ "tamil",          undef,   undef,      "utf8",    undef ],
-"utf_vi"      => [ "tcvn8x16",       undef,   undef,      "utf8",    undef ],
+"utf_khmr"    => [ undef,            undef,   undef,      "utf8",    undef ],
+"utf_knda"    => [ undef,            undef,   undef,      "utf8",    undef ],
+"utf_laoo"    => [ undef,            undef,   undef,      "utf8",    undef ],
+"utf_lat1"    => [ "lat0-16",        undef,   undef,      "utf8",    undef ],
+"utf_lat5"    => [ "lat5u-16",       undef,   undef,      "utf8",    undef ],
 "utf_lat8"    => [ "iso14.f16",      undef,   undef,      "utf8",    undef ],
+"utf_mlym"    => [ undef,            undef,   undef,      "utf8",    undef ],
+"utf_taml"    => [ "tamil",          undef,   undef,      "utf8",    undef ],
+# console font still to do
+"utf_tfng"    => [ undef,            undef,   undef,      "utf8",    undef ],
+"utf_vi"      => [ "tcvn8x16",       undef,   undef,      "utf8",    undef ],
 # default for utf-8 encodings
 "unicode"     => [ "LatArCyrHeb-16", undef,   undef,      "utf8",    undef ],
 );
@@ -731,8 +739,6 @@ my %charset2kde_charset = (
     cp1251 => 'microsoft-cp1251',
     utf8 => 'iso10646-1',
     tis620 => 'tis620-0',
-    #- 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);
@@ -812,24 +818,29 @@ my %charset2kde_font = (
   'tis620' => [ "Norasi,16", "Norasi,15" ],
   'koi8-u' => [ "Nimbus Sans L,10", "Monospace,10" ],
   'utf_ar' => [ "Terafik,14", "Courier New,13", "Terafik,13" ], 
-  'utf_am' => [ "GF Zemen Unicode,15" ],
   'utf_az' => [ "Nimbus Sans L,12", "Nimbus Mono L,10", "Nimbus Sans L,11" ],
-  'utf_bn' => [ "Mukti Narrow,14", "Mitra Mono,12", "Mukti Narrow,14" ],
   'utf_he' => [ "Nachlieli CLM,13", "Miriam Mono CLM,10", "Nachlieli CLM,11" ],
-  'utf_hi' => [ "Raghindi,14", ],
-  'utf_hy' => [ "Artsounk,12", "Monospace,10", "Artsounk,11" ],
 #-'utf_iu' => [ "????,14", ],
-#-'utf_km' => [ "????,14", ],
-  'utf_kn' => [ "Sampige,14", ],
-  'utf_ml' => [ "malayalam,14", ],
-  'utf_pa' => [ "Lohit Punjab,14", ],
-  'utf_ta' => [ "TSCu_Paranar,14", "Tsc_avarangalfxd,10", "TSCu_Paranar,12", ],
   'utf_vi' => [ "Nimbus Sans L,12", "Nimbus Mono L,10", "Nimbus Sans L,11" ],
+  #- script based
+  'utf_armn' => [ "Artsounk,12", "Monospace,10", "Artsounk,11" ],
+  'utf_beng' => [ "Mukti Narrow,14", "Mitra Mono,12", "Mukti Narrow,14" ],
+  'utf_deva' => [ "Raghindi,14", ],
+  'utf_ethi' => [ "GF Zemen Unicode,15" ],
+  'utf_guru' => [ "Lohit Punjab,14", ],
+#-'utf_khmr' => [ "????,14", ],
+  'utf_knda' => [ "Sampige,14", ],
+  'utf_lat1' => [ "Sans,10", "Monospace,10" ],
+  'utf_lat5' => [ "Sans,10", "Monospace,10" ],
+  'utf_lat8' => [ "Sans,10", "Monospace,10" ],
+  'utf_mlym' => [ "malayalam,14", ],
+  'utf_taml' => [ "TSCu_Paranar,14", "Tsc_avarangalfxd,10", "TSCu_Paranar,12", ],
+  'utf_tfng' => [ "Harpax Berbère,14", ],
   #- the following should be changed to better defaults when better fonts
   #- get available
-  'utf_ka' => [ "ClearlyU,15" ],
-  'utf_lo' => [ "ClearlyU,15" ],
-  'default' => [ "Sans,12", "Monospace,10", "Sans,11" ],
+  'utf_geor' => [ "ClearlyU,15" ],
+  'utf_laoo' => [ "ClearlyU,15" ],
+  'default'  => [ "Sans,12", "Monospace,10", "Sans,11" ],
 );
 
 sub charset2kde_font {
@@ -849,12 +860,12 @@ sub charset2kde_font {
 my %charset2pango_font = (
   'tis620' =>      "Norasi 17",
   'utf_ar' =>      "Roya 14",
+  'utf_armn' =>    "Artsounk 14",
   'utf_cyr2' =>    "Nimbus Sans L 12",
+  'utf_geor' =>    "Sans 14",
   'utf_he' =>      "Sans 12",
-  'utf_hy' =>      "Artsounk 14",
-  'utf_ka' =>      "Sans 14",
-  'utf_lo' =>      "Sans 14",
-  'utf_ta' =>      "TSCu_Paranar 14",
+  'utf_laoo' =>    "Sans 14",
+  'utf_taml' =>    "TSCu_Paranar 14",
   'utf_vi' =>      "Sans 14",
   'iso-8859-7' =>  "Kerkis 14",
   'jisx0208' =>    "Sans 14",
diff --git a/perl-install/pixmaps/langs/lang-qu.png b/perl-install/pixmaps/langs/lang-qu.png
new file mode 100644
index 000000000..53e233cdb
--- /dev/null
+++ b/perl-install/pixmaps/langs/lang-qu.png