merged keyboards with XFree86

2 files changed, 23 insertions, 3 deletions

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index c81073282..66705bb8b 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -30,8 +30,9 @@ my %lang2keyboard =
 'be_BE'=> 'by:80 ru:50 ru_yawerty:40',
   'bg' => 'bg_phonetic:60 bg:50',
 'bg_BG'=> 'bg_phonetic:60 bg:50',
+  'bn' => 'ben:80 dev:20 us_intl:5',
   'br' => 'fr:90',
-  'bs' => 'hr:60 yu:50 si:40',
+  'bs' => 'bs:90',
   'ca' => 'es:89 fr:15',
 'ca_Es'=> 'es:89 fr:15',
   'cs' => 'cz_qwerty:70 cz:50',
@@ -73,9 +74,11 @@ my %lang2keyboard =
   'gd' => 'uk:90',
   'gl' => 'es:90',
 'gl_ES'=> 'es:90',
+  'gu' => 'guj:90',
   'gv' => 'uk:90',
   'he' => 'il:89 il_phonetic:10',
 'he_IL'=> 'il:89 il_phonetic:10',
+  'hi' => 'dev:90',
   'hr' => 'hr:80 si:50',
   'hu' => 'hu:90',
   'hy' => 'am:80 am_old:10 am_phonetic:5',
@@ -94,19 +97,24 @@ my %lang2keyboard =
   'ko' => 'kr:80 us:60',
 'ko_KR'=> 'kr:80 us:60',
   'kw' => 'uk:90',
-  'lo' => 'us:60',
+  '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'=> 'mk:80',
   'mk' => 'mk:80',
+  'mn' => 'mng:75 ru:20 ru_yawerty:5',
+  'mr' => 'dev:90',
   'ms' => 'us:90 us_intl:20',
+  'mt' => 'mt:55 mt_us:35 us_intl:10',
+  'my' => 'mm:90',
   'nb' => 'no:85 dvorak_no:10',
 'nl_BE'=> 'be:80 nl:10 us_intl:5',
 'nl_NL'=> 'us_intl:80 nl:15 us:10 uk:5',
   'nn' => 'no:85 dvorak_no:10',
   'no' => 'no:85 dvorak_no:10',
   'oc' => 'fr:90',
+  'pa' => 'gur:90',
   'ph' => 'us:90 us_intl:20',
   'pl' => 'pl:80 pl2:60',
   'pp' => 'br:80 la:20 pt:10 us_intl:30',
@@ -187,9 +195,13 @@ arch() =~ /^sparc/ ? (
  "az" => [ __("Azerbaidjani (latin)"),"az",         "az",    0 ],
 #"a3" => [ __("Azerbaidjani (cyrillic)"), "az-koi8k","az(cyrillic)",1 ],
  "be" => [ __("Belgian"),        "be2-latin1",      "be",    0 ],
+ "ben"=> [ __("Bengali"),        "us",              "ben",   1 ],
 "bg_phonetic" => [ __("Bulgarian (phonetic)"),"bg", "bg(phonetic)", 1 ],
  "bg" => [ __("Bulgarian (BDS)"), "bg",             "bg",    1 ],
  "br" => [ __("Brazilian (ABNT-2)"),"br-abnt2",     "br",    0 ],
+#- Bosnia and Croatia use the same layout, but people are confused if there
+#- isn't an antry for their country
+ "bs" => [ __("Bosnian"),	 "croat",           "hr",    0 ],
  "by" => [ __("Belarusian"),      "by-cp1251",      "by",    1 ],
  "ch_de" => [ __("Swiss (German layout)"), "sg-latin1", "de_CH", 0 ],
  "ch_fr" => [ __("Swiss (French layout)"), "fr_CH-latin1", "fr_CH", 0 ],
@@ -197,6 +209,7 @@ arch() =~ /^sparc/ ? (
  "cz_qwerty" => [ __("Czech (QWERTY)"), "cz-lat2", "cz_qwerty", 0 ],
  "de" => [ __("German"),         "de-latin1",       "de",    0 ],
  "de_nodeadkeys" => [ __("German (no dead keys)"), "de-latin1-nodeadkeys", "de(nodeadkeys)", 0 ],
+ "dev" => [ __("Devanagari",     "us",              "dev",   0 ],
  "dk" => [ __("Danish"),         "dk-latin1",       "dk",    0 ],
  "dvorak" => [ __("Dvorak (US)"), "pc-dvorak-latin1", "dvorak", 0 ],
  "dvorak_no" => [ __("Dvorak (Norwegian)"), "no-dvorak", "dvorak(no)", 0 ],
@@ -208,6 +221,8 @@ arch() =~ /^sparc/ ? (
  "ge_ru"=>[__("Georgian (\"Russian\" layout)"),"ge_ru-georgian_academy","ge_ru",1],
  "ge_la"=>[__("Georgian (\"Latin\" layout)"),"ge_la-georgian_academy","ge_la",1],
  "gr" => [ __("Greek"),          "gr-8859_7",       "el",    1 ],
+ "guj"=> [ __("Gujarati"),       "us",              "guj",   1 ],
+ "gur"=> [ __("Gurmukhi"),       "us",              "gur",   1 ],
  "hu" => [ __("Hungarian"),      "hu-latin2",       "hu",    0 ],
  "hr" => [ __("Croatian"),	 "croat",           "hr",    0 ],
  "il" => [ __("Israeli"),        "il-8859_8",       "il",    1 ],
@@ -215,12 +230,13 @@ arch() =~ /^sparc/ ? (
  "ir" => [ __("Iranian"),        "ir-isiri_3342",   "ir",    1 ],
  "is" => [ __("Icelandic"),      "is-latin1",       "is",    0 ],
  "it" => [ __("Italian"),        "it-latin1",       "it",    0 ],
-#"iu" => [ __("Inuktitut"),      "iu",              "iu",    1 ],
+ "iu" => [ __("Inuktitut"),      "us",              "iu",    1 ],
  "jp" => [ __("Japanese 106 keys"), "jp106",        "jp",    1 ],
 #There is no XKB korean file yet; but using xmodmap one disables
 # some functioanlity; "us" used for XKB until this is fixed
  "kr" => [ __("Korean keyboard"), "us",             "us",    1 ],
  "la" => [ __("Latin American"), "la-latin1",       "la",    0 ],
+ "lao"=> [ __("Laotian"),	 "us",	            "lao",   1 ], 
  "lt" => [ __("Lithuanian AZERTY (old)"), "lt-latin7", "lt_a", 0 ],
 #- TODO: write a console kbd map for lt_new
  "lt_new" => [ __("Lithuanian AZERTY (new)"), "lt-latin7", "lt_std", 0 ],
@@ -228,6 +244,10 @@ arch() =~ /^sparc/ ? (
  "lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p", 0 ],
  "lv" => [ __("Latvian"),	 "lv-latin7",       "lv",    0 ],
  "mk" => [ __("Macedonian"),	 "mk",              "mk",    1 ],
+ "mm" => [ __("Myanmar (Burmese)"),"us",            "mm",    1 ],
+ "mng"=> [ __("Mongolian (cyrillic)"),"us",         "mng",   1 ],
+ "mt" => [ __("Maltese (UK)"),   "uk",              "mt",    0 ],
+ "mt_us" => [ __("Maltese (US)"),"us",              "mt_us", 0 ],
  "nl" => [ __("Dutch"),          "nl-latin1",       "nl",    0 ],
  "no" => [ __("Norwegian"),      "no-latin1",       "no",    0 ],
  "pl" => [ __("Polish (qwerty layout)"), "pl",      "pl",    0 ],
diff --git a/perl-install/share/keyboards.tar.bz2 b/perl-install/share/keyboards.tar.bz2
index 6028d4dad..df2b00e64 100644
--- a/perl-install/share/keyboards.tar.bz2
+++ b/perl-install/share/keyboards.tar.bz2