Enabled Arabic keyboard,

added full list of countries listed in iso 3166,
changed japanese charset->font for KDE,
removed charset names no longer used

1 files changed, 43 insertions, 39 deletions

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 53acc6a3a..a807a9b7b 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -23,26 +23,26 @@ my $KMAP_MAGIC = 0x8B39C07F;
 my %lang2keyboard =
 (
   'af'  => 'us_intl',
-#-'ar'  => 'ar:80 ar_d:70 ar_azerty:60 ar_azerty_d:50',
-  'az'  => 'az:80 tr_q:10 us_intl:5',
-  'be'  => 'by:80 ru:50 ru_yawerty:40',
+  'ar'  => 'ar:90',
+  'az'  => 'az:90 tr_q:10 us_intl:5',
+  'be'  => 'by:90 ru:50 ru_yawerty:40',
   'bg'  => 'bg_phonetic:60 bg:50',
-  'bn'  => 'ben:80 dev:20 us_intl:5',
+  'bn'  => 'ben:90 dev:20 us_intl:5',
   'br'  => 'fr:90',
   'bs'  => 'bs:90',
-  'ca'  => 'es:89 fr:15',
+  'ca'  => 'es:90 fr:15',
   'cs'  => 'cz_qwerty:70 cz:50',
   'cy'  => 'uk:90',
   'da'  => 'dk:90',
   'de'  => 'de_nodeadkeys:70 de:50 be:50 ch_de:50',
   'el'  => 'gr:90',
-  'en'  => 'us:90 us_intl:50',
-'en_US' => 'us:89 us_intl:50 qc:50 uk:50',
-'en_GB' => 'uk:89 us:60 us_intl:50 us:50',
+  'en'  => 'us:89 us_intl:50 qc:50 uk:50',
+'en_US' => 'us:90 us_intl:50',
+'en_GB' => 'uk:89 us:60 us_intl:50',
   'eo'  => 'us_intl:89 dvorak:20',
   'es'  => 'es:85 la:80 us_intl:50',
   'et'  => 'ee:90',
-  'eu'  => 'es:89 fr:15',
+  'eu'  => 'es:90 fr:15',
   'fa'  => 'ir:90',
   'fi'  => 'fi:90',
   'fr'  => 'fr:89 qc:85 be:85 ch_fr:70',
@@ -51,59 +51,62 @@ my %lang2keyboard =
   'gl'  => 'es:90',
   'gu'  => 'guj:90',
   'gv'  => 'uk:90',
-  'he'  => 'il:89 il_phonetic:10',
+  'he'  => 'il:90 il_phonetic:10',
   'hi'  => 'dev:90',
-  'hr'  => 'hr:80 si:50',
+  'hr'  => 'hr:90 si:50',
   'hu'  => 'hu:90',
-  'hy'  => 'am:80 am_old:10 am_phonetic:5',
+  'hy'  => 'am:90 am_old:10 am_phonetic:5',
   'id'  => 'us:90 us_intl:20',
   'is'  => 'is:90',
   'iu'  => 'iu:90',
-  'it'  => 'it:89 ch_fr:50 ch_de:50',
-  'ja'  => 'jp:80 us:50 us_intl:20',
-  'ka'  => 'ge_la:80 ge_ru:50',
+  'it'  => 'it:90 ch_fr:50 ch_de:50',
+  'ja'  => 'jp:90 us:50 us_intl:20',
+  'ka'  => 'ge_la:90 ge_ru:50',
   'kl'  => 'dk:80 us_intl:30',
-  'ko'  => 'kr:80 us:60',
+#-'kn'  => 'kan:90',
+  'ko'  => 'kr:90 us:60',
   'kw'  => 'uk:90',
   'lo'  => 'lao:90',
   'lt'  => 'lt:80 lt_new:70 lt_b:60 lt_p:50',
-  'lv'  => 'lv:80 lt:40 lt_new:30 lt_b:20 lt_p:10 ee:5',
-  'mi'  => 'us_intl:60 uk:20 us:10',
-  'mk'  => 'mk:80',
-  'ml'  => 'mal:80',
-  'mn'  => 'mng:75 ru:20 ru_yawerty:5',
+  'lv'  => 'lv:90 lt:40 lt_new:30 lt_b:20 lt_p:10 ee:5',
+  'mi'  => 'us_intl:90 uk:20 us:10',
+  'mk'  => 'mk:90',
+  'ml'  => 'mal:90',
+  'mn'  => 'mng:90 ru:20 ru_yawerty:5',
   'mr'  => 'dev:90',
   'ms'  => 'us:90 us_intl:20',
-  'mt'  => 'mt:55 mt_us:35 us_intl:10',
+  'mt'  => 'mt:90 mt_us:35 us_intl:10',
   'my'  => 'mm:90',
-  'nb'  => 'no:85 dvorak_no:10',
+  'nb'  => 'no:90 dvorak_no:10',
   'nl'  => 'us_intl:80: be:70 nl:10 us:5',
-  'nn'  => 'no:85 dvorak_no:10',
-  'no'  => 'no:85 dvorak_no:10',
+  'nn'  => 'no:90 dvorak_no:10',
+  'no'  => 'no:90 dvorak_no:10',
   'oc'  => 'fr:90',
+#-'or'  => 'ori:90',
   'pa'  => 'gur:90',
   'ph'  => 'us:90 us_intl:20',
-  'pl'  => 'pl:80 pl2:60',
+  'pl'  => 'pl:90 pl2:60',
   'pp'  => 'br:80 la:20 pt:10 us_intl:30',
-'pt_BR' => 'br:80 la:20 pt:10 us_intl:30',
-  'pt'  => 'pt:80',
+'pt_BR' => 'br:90 la:20 pt:10 us_intl:30',
+  'pt'  => 'pt:90',
   'ro'  => 'ro2:80 ro:40 us_intl:10',
   'ru'  => 'ru:85 ru_yawerty:80 ua:50',
   'sk'  => 'sk_qwerty:80 sk:70',
-  'sl'  => 'si:80 hr:50',
+  'sl'  => 'si:90 hr:50',
   'sp'  => 'sr:80',
-  'sq'  => 'al:80',
+  'sq'  => 'al:90',
   'sr'  => 'yu:80',
-  'sv'  => 'se:85 fi:30 dvorak_se:10 sv:10',
+  'sv'  => 'se:90 fi:30 dvorak_se:10 sv:10',
   'ta'  => 'tscii:80 tml:20',
-  'tg'  => 'tj:80 ru_yawerty:40',
+#-'te'  => 'tel:90',
+  'tg'  => 'tj:90 ru_yawerty:40',
   'th'  => 'th:90',
-  'tr'  => 'tr_q:85 tr_q:30',
+  'tr'  => 'tr_q:90 tr_q:30',
   'tt'  => 'ru:50 ru_yawerty:40',
-  'uk'  => 'ua:85 ru:50 ru_yawerty:40',
+  'uk'  => 'ua:90 ru:50 ru_yawerty:40',
   'uz'  => 'us:80',
   'vi'  => 'vn:80 us:60 us_intl:50',
-  'wa'  => 'be:85 fr:5',
+  'wa'  => 'be:90 fr:5',
 'zh_CN' => 'us:60',
 'zh_TW' => 'us:60',
 );
@@ -143,10 +146,7 @@ arch() =~ /^sparc/ ? (
  "am_old" => [ N_("Armenian (old)"), "am_old",	    "am(old)", 1 ],
  "am" => [ N_("Armenian (typewriter)"), "am-armscii8", "am",   1 ],
  "am_phonetic" => [ N_("Armenian (phonetic)"), "am_phonetic", "am(phonetic)",1 ],
-#-"ar_azerty" => [ N_("Arabic (AZERTY)"),"ar-8859_6","ar(azerty)",1 ],
-#-"ar_azerty_d" => [ N_("Arabic (AZERTY, arabic digits)"),"ar-8859_6","ar(azerty_digits)",1 ],
-#-"ar" => [ N_("Arabic (QWERTY)"),"ar-8859_6",      "ar",    1 ],
-#-"ar_d" => [ N_("Arabic (QWERTY, arabic digits)"),"ar-8859_6","ar(digits)",1 ],
+ "ar" => [ N_("Arabic"),          "ar-8859_6",       "ar(digits)",   1 ],
  "az" => [ N_("Azerbaidjani (latin)"), "az",         "az",    0 ],
 #"a3" => [ N_("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)",1 ],
  "be" => [ N_("Belgian"),        "be2-latin1",      "be",    0 ],
@@ -187,6 +187,7 @@ arch() =~ /^sparc/ ? (
  "it" => [ N_("Italian"),        "it-latin1",       "it",    0 ],
  "iu" => [ N_("Inuktitut"),      "us",              "iu",    1 ],
  "jp" => [ N_("Japanese 106 keys"), "jp106",        "jp",    1 ],
+#-"kan" => [ N_("Kannada"),        "us",              "kan",  1 ],
 #There is no XKB korean file yet; but using xmodmap one disables
 # some functioanlity; "us" used for XKB until this is fixed
  "kr" => [ N_("Korean keyboard"), "us",             "us",    1 ],
@@ -206,6 +207,7 @@ arch() =~ /^sparc/ ? (
  "mt_us" => [ N_("Maltese (US)"), "us",             "mt_us", 0 ],
  "nl" => [ N_("Dutch"),          "nl-latin1",       "nl",    0 ],
  "no" => [ N_("Norwegian"),      "no-latin1",       "no",    0 ],
+#-"ori" => [ N_("Oriya"),          "us",              "ori",  1 ],
  "pl" => [ N_("Polish (qwerty layout)"), "pl",      "pl",    0 ],
  "pl2" => [ N_("Polish (qwertz layout)"), "pl-latin2", "pl2", 0 ],
  "pt" => [ N_("Portuguese"),     "pt-latin1",       "pt",    0 ],
@@ -221,6 +223,8 @@ arch() =~ /^sparc/ ? (
  "sk_qwerty" => [ N_("Slovakian (QWERTY)"), "sk-qwerty", "sk_qwerty", 0 ],
 # TODO: console map
  "sr" => [ N_("Serbian (cyrillic)"), "sr",          "sr",    0 ],
+#-"syr" => [ N_("Syriak"),         "us",             "syr",  1 ],
+#-"tel" => [ N_("Telugu"),         "us",             "tel",  1 ],
 # no console kbd that I'm aware of
  "tml" => [ N_("Tamil (ISCII-layout)"), "us",       "tml",   1 ],
  "tscii" => [ N_("Tamil (Typewriter-layout)"), "us", "ta(UNI)", 1 ],