completed language list

completed language->keyboard guessing list
aesthetic changes to an English message (removed \n and let gtk+
do the formatting, it is nicer)

1 files changed, 93 insertions, 75 deletions

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index d5eeb9876..64c801068 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -23,87 +23,105 @@ my $KMAP_MAGIC = 0x8B39C07F;
 my %lang2keyboard =
 (
   'af' => 'us_intl',
-  'az' => 'az',
-  'be' => 'by',
-  'be_BY.CP1251' => 'by',
-  'bg' => 'bg',
-'bg_BG'=> 'bg',
-  'br' => 'fr',
-  'ca' => 'es',
-  'cs' => 'cz_qwerty',
-  'cy' => 'uk',
-  'da' => 'dk',
-  'de' => 'de',
-'de_AT'=> 'de',
-'de_CH'=> 'ch_de',
-'de_DE'=> 'de', 
-  'el' => 'gr',
-  'en' => 'us',
-'en_US'=> 'us',
-'en_GB'=> 'uk',
-  'eo' => 'us_intl',
-  'es' => 'es',
-  'es@tradicional' => 'es',
-'es_AR'=> 'la',
-'es_ES'=> 'es',
-'es_MX'=> 'la',
-  'et' => 'ee',
-  'eu' => 'es',
-  'fa' => 'ir',
-  'fi' => 'fi',
-  'fr' => 'fr',
-'fr_BE'=> 'be',
-'fr_CA'=> 'qc',
-'fr_CH'=> 'ch_fr',
-'fr_FR'=> 'fr',
-  'ga' => 'uk',
-  'gl' => 'es',
-  'he' => 'il',
-  'hr' => 'hr',
-  'hu' => 'hu',
-  'hy' => 'am',
-  'is' => 'is',
-  'it' => 'it',
-  'ja' => 'jp',
-  'ka' => 'ge_la',
-  'lt' => 'lt',
-  'mk' => 'mk',
-  'nb' => 'no',
-'nl_BE'=> 'be',
-'nl_NL'=> 'us_intl:95 uk:2 nl:1',
-#'nl_NL'=> 'nl',
-  'no' => 'no',
-  'no@nynorsk' => 'no',
-  'ny' => 'no',
-  'oc' => 'fr',
-  'pl' => 'pl',
-  'pt' => 'pt',
-'pt_BR'=> 'br',
-'pt_PT'=> 'pt',
-  'ru' => 'ru',
-  'ru_RU.KOI8-R' => 'ru',
-  'sk' => 'sk_qwerty',
-  'sl' => 'si',
-  'sp' => 'sr',
-  'sr' => 'yu',
-  'sv' => 'se',
-  'sv@ny' => 'se',
-  'sv@traditionell' => 'se',
-  'th' => 'th',
-  'tr' => 'tr_q',
-  'uk' => 'ua',
-'uk_UA' => 'ua',
-  'vi' => 'vn',
-'vi_VN.tcvn' => 'vn',
-'vi_VN.viscii' => 'vn',
-  'wa' => 'be',
+#-'ar' => 'ar:80',
+  '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',
+  'bg' => 'bg:90',
+'bg_BG'=> 'bg:90',
+  'br' => 'fr:90',
+  'bs' => 'hr:60 sr:50 si:40',
+  'ca' => 'es:90 fr:15',
+  'cs' => 'cz_qwerty:70 cz:50 cz_prog:10',
+  'cy' => 'uk:90',
+  'da' => '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', 
+  'el' => '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_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',
+  'fa' => 'ir:90',
+  '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',
+  'ga' => 'uk:90',
+  'gd' => 'uk:90',
+  'gl' => 'es:90',
+  'gv' => 'uk:90',
+  'he' => 'il:90 il_phonetic:10',
+  'hr' => 'hr:90 si:50',
+  'hu' => 'hu:90',
+  'hy' => 'am:80 am_old:10 am_phonetic:5',
+  'id' => 'us:90 us_intl:20',
+  'is' => 'is:90',
+'it_CH' => 'ch_fr:80 ch_de:60 it:50',
+'it_IT' => 'it:90',
+  'ja' => 'jp:80 us:50 us_intl:20',
+  'ka' => 'ge_la:80 ge_ru:50',
+  'kl' => 'dk:80 us_intl:30',
+  'ko' => 'us:60',
+  'kw' => 'uk:90',
+  'lo' => 'us:60',
+  'lt' => 'lt:80 lt_new:70 lt_b:60 lt_p:50',
+  'lv' => 'lt:60 lt_new:50 lt_b:40 lt_p:30 ee:20',
+  'mi' => 'us_intl:60 uk:20 us:10',
+  'mk' => 'mk:80',
+  'ms' => 'us:90 us_intl:20',
+  'nb' => 'no:90 dvorak_no:10',
+'nl_BE'=> 'be:90 nl:10 us_intl:5',
+'nl_NL'=> 'us_intl:95 nl:15 us:10 uk:5',
+  'nn' => 'no:90 dvorak_no:10',
+  'no' => 'no:90 dvorak_no:10',
+  'oc' => 'fr:90',
+  'ph' => 'us:90 us_intl:20',
+  'pl' => 'pl:80 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'=> 'pt:80',
+  'ro' => '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',
+  'sk' => 'sk_qwerty:80 sk:70 sk_prog:50',
+  'sl' => 'si:80 hr:50',
+  'sp' => 'sr:80',
+  'sr' => 'yu:80',
+  'sv' => 'se:90 fi:20',
+  'tg' => 'ru:50 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',
+  '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',
+  'wa' => 'be:90 fr:5',
+'zh_CN.GB2312' => 'us:60',
+'zh_TW.Big5' => 'us:60',
 );
 
 #- key = extension for Xmodmap file, [0] = description of the keyboard,
 #- [1] = name for loadkeys, [2] = name for XKB
 my %keyboards = (
 arch() =~ /^sparc/ ? (
- "cs" => [ __("Czech (QWERTZ)"), "sunt5-cz-us", "czsk(cz_us_qwertz)" ],
+ "cz" => [ __("Czech (QWERTZ)"), "sunt5-cz-us", "czsk(cz_us_qwertz)" ],
  "de" => [ __("German"),         "sunt5-de-latin1", "de" ],
  "dvorak" => [ __("Dvorak"),     "sundvorak",   "dvorak" ],
  "es" => [ __("Spanish"),        "sunt5-es",    "es" ],