actived choosing of all currently known keyboards.

xmodmap files for them all are available; console and XKB ones I'm
working on.

1 files changed, 24 insertions, 34 deletions

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index fd296ef0f..69ed013ce 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -27,18 +27,18 @@ my %lang2keyboard =
 #- key = extension for Xmodmap file, [0] = description of the keyboard,
 #- [1] = name for loadkeys, [2] = name for XKB
 my %keyboards = (
-#- armenian xmodmap have to be checked...
-#- "am" => [ __("Armenian"),       "am-armscii8",  "am" ],
+ "am" => [ __("Armenian"),       "am-armscii8", "am" ],
  "be" => [ __("Belgian"),        "be-latin1",   "be" ],
  "bg" => [ __("Bulgarian"),      "bg",          "bg" ],
-#- TO CHECK CHANGED AS NEXT ONE "cz" => [ __("Czech"),          "cz-latin2",   "czsk" ],
- "cz" => [ __("Czech"),          "cz-lat2",     "czsk" ],
+ "br" => [ __("Brazilian"),      "br-latin1",   "br" ],
+ "ch_de" => [ __("Swiss (French layout)"), "sf-latin1", "fr_CH" ],
+ "ch_fr" => [ __("Swiss (German layout)"), "sg-latin1", "de_CH" ],
+ "cz" => [ __("Czech"),          "cz-latin2",   "cs" ],
  "de" => [ __("German"),         "de-latin1",   "de" ],
  "dk" => [ __("Danish"),         "dk-latin1",   "dk" ],
  "dvorak" => [ __("Dvorak"),     "dvorak",      "dvorak" ],
-#- TO CHECK "ee" => [ __("Estonian"),       "ee-latin9",   "ee" ],
-#- TO CHECK CHANGED AS NEXT ONE "es" => [ __("Spanish"),        "es-latin1",   "es" ],
- "es" => [ __("Spanish"),        "es",          "es" ],
+ "ee" => [ __("Estonian"),       "ee-latin9",   "ee" ],
+ "es" => [ __("Spanish"),        "es-latin1",   "es" ],
  "fi" => [ __("Finnish"),        "fi-latin1",   "fi" ],
  "fr" => [ __("French"),         "fr-latin1",   "fr" ],
 #- georgian keyboards have to be written...
@@ -46,41 +46,31 @@ my %keyboards = (
 #-"ge_la"=>[__("Georgian ("\Latin\" layout)","ge_la-georgian_academy","ge_la"],
 #- TO CHECK CHANGED AS NEXT ONE "gr" => [ __("Greek"),          "gr-8859_7",   "gr" ],
  "gr" => [ __("Greek"),          "gr",          "gr" ],
-#- TO CHECK CHANGED AS NEXT ONE "hu" => [ __("Hungarian"),      "hu-latin2",   "hu" ],
- "hu" => [ __("Hungarian"),      "hu",          "hu" ],
-#- TO CHECK CHANGED AS NEXT ONE "il" => [ __("Israeli"),        "il-8859_8",   "il" ],
- "il" => [ __("Israeli"),        "hebrew",      "il" ],
+ "hu" => [ __("Hungarian"),      "hu-latin2",   "hu" ],
+ "il" => [ __("Israeli"),        "il-8859_8",   "il" ],
+ "il" => [ __("Israeli (Phonetic)"),"hebrew",   "il_phonetic" ],
  "is" => [ __("Icelandic"),      "is-latin1",   "is" ],
-#- TO CHECK CHANGED AS NEXT ONE "it" => [ __("Italian"),        "it-latin1",   "it" ],
- "it" => [ __("Italian"),        "it",   "it" ],
+ "it" => [ __("Italian"),        "it-latin1",   "it" ],
  "la" => [ __("Latin American"), "la-latin1",   "la" ],
-#- TO CHECK CHANGED AS NEXT ONE "nl" => [ __("Dutch"),          "nl-latin1",   "nl" ],
- "nl" => [ __("Dutch"),          "nl",          "nl" ],
-#- TO CHECK "lt" => [ __("Lithuanian AZERTY"), "lta-latin7", "lt" ],
-#- TO CHECK "lt_b" => [ __("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt_b" ],
-#- TO CHECK "lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p" ],
+ "nl" => [ __("Dutch"),          "nl-latin1",   "nl" ],
+ "lt" => [ __("Lithuanian AZERTY"), "lta-latin7", "lt" ],
+ "lt_b" => [ __("Lithuanian \"number row\" QWERTY"), "ltb-latin7", "lt_b" ],
+ "lt_p" => [ __("Lithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt_p" ],
  "no" => [ __("Norwegian"),      "no-latin1",   "no" ],
-#- TO CHECK CHANGED AS NEXT ONE "pl" => [ __("Polish"),         "pl-latin2",   "pl" ],
- "pl" => [ __("Polish"),         "pl",   "pl" ],
+ "pl" => [ __("Polish"),         "pl-latin2",   "pl" ],
  "pt" => [ __("Portuguese"),     "pt-latin1",   "pt" ],
-#- TO CHECK "qc" => [ __("Canadian (Quebec)"), "qc-latin1","ca_enhanced" ],
-#- TO CHECK CHANGED AS NEXT ONE "ru" => [ __("Russian"),        "ru-koi8",     "ru" ],
+ "qc" => [ __("Canadian (Quebec)"), "qc-latin1","ca_enhanced" ],
  "ru" => [ __("Russian"),        "ru",          "ru" ],
  "se" => [ __("Swedish"),        "se-latin1",   "se_SE" ],
-#- TO CHECK CHANGED AS NEXT ONE "sf" => [ __("Swiss (French layout)"), "sf-latin1", "fr_CH" ],
- "sf" => [ __("Swiss (French layout)"), "fr_CH-latin1", "fr_CH" ],
- "sg" => [ __("Swiss (German layout)"), "sg-latin1", "de_CH" ],
-#- TO CHECK "si" => [ __("Slovenian"),      "si-latin1",   "si" ],
-#- TO CHECK "sk" => [ __("Slovakian"),      "sk-latin2",   "czsk" ],
-#- the xmodmap.th has to be fixed to use tis620 keymaps
-#- "th" => [ __("Thai keyboard"),  "th",          "th" ],
+ "si" => [ __("Slovenian"),      "si-latin1",   "si" ],
+ "sk" => [ __("Slovakian"),      "sk-latin2",   "czsk" ],
+ "th" => [ __("Thai keyboard"),  "th",          "th" ],
  "tr_f"  => [ __("Turkish (traditional \"F\" model)"), "tr_f-latin5", "tr_f" ],
  "tr_q" => [ __("Turkish (modern \"Q\" model)"), "tr_q-latin5", "tr_q" ],
-#- TO CHECK CHANGED AS NEXT ONE "uk" => [ __("UK keyboard"),    "uk-latin1",           "gb" ],
- "uk" => [ __("UK keyboard"),    "uk",           "gb" ],
-#- TO CHECK CHANGED AS NEXT ONE "us" => [ __("US keyboard"),    "us-latin",           "us_intl" ],
- "us" => [ __("US keyboard"),    "us",           "us_intl" ],
-#- TO CHECK "yu" => [ __("Yugoslavian (latin layout)"), "yu-latin2", "yu" ],
+ "ua" => [ __("Ukrainian"),      "ua",           "ua" ],
+ "uk" => [ __("UK keyboard"),    "uk-latin1",    "gb" ],
+ "us" => [ __("US keyboard"),    "us-latin1",    "us_intl" ],
+ "yu" => [ __("Yugoslavian (latin layout)"), "yu-latin2", "yu" ],
 );
 
 #-######################################################################################