From eed5dcf40405959a3fefe486e0845744b2f87b49 Mon Sep 17 00:00:00 2001 From: Pablo Saratxaga Date: Wed, 21 Sep 2005 20:06:56 +0000 Subject: synchronized XKB keyboard names with what is in latest xorg --- perl-install/keyboard.pm | 98 ++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index 0399eb7ce..5e15ec4b4 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -89,7 +89,7 @@ our %lang2keyboard = 'lt' => 'lt:80 lt_new:70 lt_b:60 lt_p:50', 'ltg' => 'lv:90 lt:40 lt_new:30 lt_b:20 lt_p:10 ee: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', + 'mi' => 'mao:90 uk:30 us_intl:20', 'mk' => 'mk:90', 'ml' => 'mal:90', 'mn' => 'mng:90 ru:20 ru_yawerty:5', @@ -189,64 +189,61 @@ arch() =~ /^sparc/ ? ( "ar" => [ N_("_: keyboard\nArabic"), "us", "ara(digits)", 1 ], "az" => [ N_("_: keyboard\nAzerbaidjani (latin)"), "az", "az", 0 ], "be" => [ N_("_: keyboard\nBelgian"), "be2-latin1", "be", 0 ], - "ben" => [ N_("_: keyboard\nBengali (Inscript-layout)"), "us", "ben", 1 ], - "ben2" => [ N_("_: keyboard\nBengali (Probhat)"), "us", "ben(probhat)", 1 ], + "ben" => [ N_("_: keyboard\nBengali (Inscript-layout)"), "us", "in(ben)", 1 ], + "ben2" => [ N_("_: keyboard\nBengali (Probhat)"), "us", "in(ben_probhat)", 1 ], "bg_phonetic" => [ N_("_: keyboard\nBulgarian (phonetic)"), "bg", "bg(phonetic)", 1 ], "bg" => [ N_("_: keyboard\nBulgarian (BDS)"), "bg", "bg", 1 ], "br" => [ N_("_: keyboard\nBrazilian (ABNT-2)"), "br-abnt2", "br", 0 ], - "bs" => [ N_("_: keyboard\nBosnian"), "croat", "bs", 0 ], + "bs" => [ N_("_: keyboard\nBosnian"), "croat", "ba", 0 ], "by" => [ N_("_: keyboard\nBelarusian"), "by-cp1251", "by", 1 ], -# old XKB layout - "ch_de" => [ N_("_: keyboard\nSwiss (German layout)"), "sg-latin1", "de_CH", 0 ], -# old XKB layout - "ch_fr" => [ N_("_: keyboard\nSwiss (French layout)"), "fr_CH-latin1", "fr_CH", 0 ], + "ch_de" => [ N_("_: keyboard\nSwiss (German layout)"), "sg-latin1", "ch(de)", 0 ], + "ch_fr" => [ N_("_: keyboard\nSwiss (French layout)"), "fr_CH-latin1", "ch(fr)", 0 ], # TODO: console map "chr" => [ N_("_: keyboard\nCherokee syllabics"), "us", "chr", 1 ], "cz" => [ N_("_: keyboard\nCzech (QWERTZ)"), "cz", "cz", 0 ], "cz_qwerty" => [ N_("_: keyboard\nCzech (QWERTY)"), "cz-lat2", "cz(qwerty)", 0 ], "de" => [ N_("_: keyboard\nGerman"), "de-latin1", "de", 0 ], "de_nodeadkeys" => [ N_("_: keyboard\nGerman (no dead keys)"), "de-latin1-nodeadkeys", "de(nodeadkeys)", 0 ], - "dev" => [ N_("_: keyboard\nDevanagari"), "us", "dev", 0 ], + "dev" => [ N_("_: keyboard\nDevanagari"), "us", "in(deva)", 1 ], "dk" => [ N_("_: keyboard\nDanish"), "dk-latin1", "dk", 0 ], - "dvorak" => [ N_("_: keyboard\nDvorak (US)"), "pc-dvorak-latin1", "dvorak", 0 ], + "dvorak" => [ N_("_: keyboard\nDvorak (US)"), "pc-dvorak-latin1", "us(dvorak)", 0 ], # TODO: console map -# "dvorak_eo" => [ N_("_: keyboard\nDvorak (Esperanto)"), "us", "dvorak(eo)", 0 ], + "dvorak_eo" => [ N_("_: keyboard\nDvorak (Esperanto)"), "us", "dvorak(eo)", 0 ], # TODO: console map - "dvorak_fr" => [ N_("_: keyboard\nDvorak (French)"), "us", "dvorak(fr)", 0 ], + "dvorak_fr" => [ N_("_: keyboard\nDvorak (French)"), "us", "fr(dvorak)", 0 ], # TODO: console map - "dvorak_gb" => [ N_("_: keyboard\nDvorak (UK)"), "pc-dvorak-latin1", "dvorak(gb)", 0 ], - "dvorak_no" => [ N_("_: keyboard\nDvorak (Norwegian)"), "no-dvorak", "dvorak(no)", 0 ], + "dvorak_gb" => [ N_("_: keyboard\nDvorak (UK)"), "pc-dvorak-latin1", "gb(dvorak)", 0 ], + "dvorak_no" => [ N_("_: keyboard\nDvorak (Norwegian)"), "no-dvorak", "no(dvorak)", 0 ], # TODO: console map - "dvorak_pl" => [ N_("_: keyboard\nDvorak (Polish)"), "us", "dvorak(pl)", 0 ], - "dvorak_se" => [ N_("_: keyboard\nDvorak (Swedish)"), "se-dvorak", "dvorak(se)", 0 ], - "dz" => [ N_("_: keyboard\nDzongkha/Tibetan"), "us", "dz", 1 ], + "dvorak_pl" => [ N_("_: keyboard\nDvorak (Polish)"), "us", "pl(dvorak)", 0 ], + "dvorak_se" => [ N_("_: keyboard\nDvorak (Swedish)"), "se-dvorak", "se(dvorak)", 0 ], + "dz" => [ N_("_: keyboard\nDzongkha/Tibetan"), "us", "bt", 1 ], "ee" => [ N_("_: keyboard\nEstonian"), "ee-latin9", "ee", 0 ], "es" => [ N_("_: keyboard\nSpanish"), "es-latin1", "es", 0 ], "fi" => [ N_("_: keyboard\nFinnish"), "fi-latin1", "fi", 0 ], # there used to be a "fo" layout in XFree86... "fo" => [ N_("_: keyboard\nFaroese"), "is", "is", 0 ], "fr" => [ N_("_: keyboard\nFrench"), "fr-latin1", "fr", 0 ], - "ge_ru" => [N_("_: keyboard\nGeorgian (\"Russian\" layout)"), "ge_ru-georgian_academy", "ge_ru",1], - "ge_la" => [N_("_: keyboard\nGeorgian (\"Latin\" layout)"), "ge_la-georgian_academy", "ge_la",1], - "gr" => [ N_("_: keyboard\nGreek"), "gr-8859_7", "el(extended)", 1 ], - "gr_pl" => [ N_("_: keyboard\nGreek (polytonic)"), "gr-8859_7", "el(polytonic)", 1 ], - "guj" => [ N_("_: keyboard\nGujarati"), "us", "guj", 1 ], - "gur" => [ N_("_: keyboard\nGurmukhi"), "us", "gur", 1 ], + "ge_ru" => [N_("_: keyboard\nGeorgian (\"Russian\" layout)"), "ge_ru-georgian_academy", "ge(ru)",1], + "ge_la" => [N_("_: keyboard\nGeorgian (\"Latin\" layout)"), "ge_la-georgian_academy", "ge(la)",1], + "gr" => [ N_("_: keyboard\nGreek"), "gr-8859_7", "gr(extended)", 1 ], + "gr_pl" => [ N_("_: keyboard\nGreek (polytonic)"), "gr-8859_7", "gr(polytonic)", 1 ], + "guj" => [ N_("_: keyboard\nGujarati"), "us", "in(guj)", 1 ], + "gur" => [ N_("_: keyboard\nGurmukhi"), "us", "in(guru)", 1 ], "hr" => [ N_("_: keyboard\nCroatian"), "croat", "hr", 0 ], "hu" => [ N_("_: keyboard\nHungarian"), "hu-latin2", "hu", 0 ], "ie" => [ N_("_: keyboard\nIrish"), "uk", "ie", 0 ], "il" => [ N_("_: keyboard\nIsraeli"), "il-8859_8", "il", 1 ], - "il_phonetic" => [ N_("_: keyboard\nIsraeli (phonetic)"), "hebrew", "il_phonetic", 1 ], + "il_phonetic" => [ N_("_: keyboard\nIsraeli (phonetic)"), "hebrew", "il(phonetic)", 1 ], "ir" => [ N_("_: keyboard\nIranian"), "ir-isiri_3342", "ir", 1 ], "is" => [ N_("_: keyboard\nIcelandic"), "is-latin1", "is", 0 ], "it" => [ N_("_: keyboard\nItalian"), "it-latin1", "it", 0 ], - "iu" => [ N_("_: keyboard\nInuktitut"), "us", "iu", 1 ], -# old XKB layout + "iu" => [ N_("_: keyboard\nInuktitut"), "us", "ca(ike)", 1 ], # Japanese keyboard is dual latin/kana; but telling it here shows a # message to choose the switching key that is misleading, as input methods # are not automatically enabled when typing in kana - "jp" => [ N_("_: keyboard\nJapanese 106 keys"), "jp106", "jp", 0 ], - "kan" => [ N_("_: keyboard\nKannada"), "us", "kan", 1 ], + "jp" => [ N_("_: keyboard\nJapanese 106 keys"), "jp106", "us,jp", 0 ], + "kan" => [ N_("_: keyboard\nKannada"), "us", "in(kan)", 1 ], # There is no XKB korean file yet; but using xmodmap one disables # some functionality; "us" used for XKB until this is fixed "kr" => [ N_("_: keyboard\nKorean"), "us", "us", 1 ], @@ -256,23 +253,24 @@ arch() =~ /^sparc/ ? ( "la" => [ N_("_: keyboard\nLatin American"), "la-latin1", "latam", 0 ], # TODO: console map "lao" => [ N_("_: keyboard\nLaotian"), "us", "la", 1 ], -# "lt" => [ N_("_: keyboard\nLithuanian AZERTY (old)"), "lt-latin7", "lt(lt_a)", 0 ], + "lt" => [ N_("_: keyboard\nLithuanian AZERTY (old)"), "lt-latin7", "lt(lt_a)", 0 ], #- TODO: write a console kbd map for lt_new "lt_new" => [ N_("_: keyboard\nLithuanian AZERTY (new)"), "lt-latin7", "lt(std)", 0 ], "lt_b" => [ N_("_: keyboard\nLithuanian \"number row\" QWERTY"), "ltb-latin7", "lt(us)", 1 ], -# "lt_p" => [ N_("_: keyboard\nLithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt(phonetic)", 0 ], + "lt_p" => [ N_("_: keyboard\nLithuanian \"phonetic\" QWERTY"), "ltp-latin7", "lt(phonetic)", 0 ], "lv" => [ N_("_: keyboard\nLatvian"), "lv-latin7", "lv", 0 ], - "mal" => [ N_("_: keyboard\nMalayalam"), "us", "mal(mlplusnum)", 1 ], - "mk" => [ N_("_: keyboard\nMacedonian"), "mk", "mk", 1 ], + "mal" => [ N_("_: keyboard\nMalayalam"), "us", "in(mal)", 1 ], +#"mao" => [ N_("_: keyboard\nMaori"), "us", "mao", 0 ], + "mk" => [ N_("_: keyboard\nMacedonian"), "mk", "mkd", 1 ], "mm" => [ N_("_: keyboard\nMyanmar (Burmese)"), "us", "mm", 1 ], - "mng" => [ N_("_: keyboard\nMongolian (cyrillic)"), "us", "mng", 1 ], + "mng" => [ N_("_: keyboard\nMongolian (cyrillic)"), "us", "mn", 1 ], "mt" => [ N_("_: keyboard\nMaltese (UK)"), "uk", "mt", 0 ], - "mt_us" => [ N_("_: keyboard\nMaltese (US)"), "us", "mt_us", 0 ], + "mt_us" => [ N_("_: keyboard\nMaltese (US)"), "us", "mt(us)", 0 ], "nl" => [ N_("_: keyboard\nDutch"), "nl-latin1", "nl", 0 ], "no" => [ N_("_: keyboard\nNorwegian"), "no-latin1", "no", 0 ], - "ori" => [ N_("_: keyboard\nOriya"), "us", "ori", 1 ], + "ori" => [ N_("_: keyboard\nOriya"), "us", "in(ori)", 1 ], "pl" => [ N_("_: keyboard\nPolish (qwerty layout)"), "pl", "pl", 0 ], - "pl2" => [ N_("_: keyboard\nPolish (qwertz layout)"), "pl-latin2", "pl2", 0 ], + "pl2" => [ N_("_: keyboard\nPolish (qwertz layout)"), "pl-latin2", "pl(qwertz)", 0 ], # TODO: console map "ps" => [ N_("_: keyboard\nPashto"), "us", "ps", 1 ], "pt" => [ N_("_: keyboard\nPortuguese"), "pt-latin1", "pt", 0 ], @@ -283,31 +281,31 @@ arch() =~ /^sparc/ ? ( "ro" => [ N_("_: keyboard\nRomanian (qwerty)"), "ro", "ro(us)", 0 ], "ru" => [ N_("_: keyboard\nRussian"), "ru4", "ru(winkeys)", 1 ], "ru_yawerty" => [ N_("_: keyboard\nRussian (phonetic)"), "ru-yawerty", "ru(phonetic)", 1 ], - "sapmi" => [ N_("_: keyboard\nSaami (norwegian)"), "no-latin1", "sapmi", 0 ], - "sapmi_sefi" => [ N_("_: keyboard\nSaami (swedish/finnish)"), "se-latin1", "sapmi(sefi)", 0 ], + "sapmi" => [ N_("_: keyboard\nSaami (norwegian)"), "no-latin1", "no(smi)", 0 ], + "sapmi_sefi" => [ N_("_: keyboard\nSaami (swedish/finnish)"), "se-latin1", "se(smi)", 0 ], # TODO: console map - "sd" => [ N_("_: keyboard\nSindhi"), "us", "sd", 1 ], + "sd" => [ N_("_: keyboard\nSindhi"), "us", "sd(digits)", 1 ], "se" => [ N_("_: keyboard\nSwedish"), "se-latin1", "se", 0 ], "si" => [ N_("_: keyboard\nSlovenian"), "slovene", "si", 0 ], # TODO: console map - "sin" => [ N_("_: keyboard\nSinhala"), "us", "sin", 1 ], + "sin" => [ N_("_: keyboard\nSinhala"), "us", "lk", 1 ], "sk" => [ N_("_: keyboard\nSlovakian (QWERTZ)"), "sk-qwertz", "sk", 0 ], "sk_qwerty" => [ N_("_: keyboard\nSlovakian (QWERTY)"), "sk-qwerty", "sk(qwerty)", 0 ], # TODO: console map - "sr" => [ N_("_: keyboard\nSerbian (cyrillic)"), "sr", "yu,sr", 1 ], - "syr" => [ N_("_: keyboard\nSyriac"), "us", "syr", 1 ], - "syr_p" => [ N_("_: keyboard\nSyriac (phonetic)"), "us", "syr_phonetic", 1 ], - "tel" => [ N_("_: keyboard\nTelugu"), "us", "tel", 1 ], + "sr" => [ N_("_: keyboard\nSerbian (cyrillic)"), "sr", "srp(basic),srp(latin)", 1 ], + "syr" => [ N_("_: keyboard\nSyriac"), "us", "sy(syc)", 1 ], + "syr_p" => [ N_("_: keyboard\nSyriac (phonetic)"), "us", "sy(syc_phonetic)", 1 ], + "tel" => [ N_("_: keyboard\nTelugu"), "us", "in(tel)", 1 ], # no console kbd that I'm aware of - "tml" => [ N_("_: keyboard\nTamil (ISCII-layout)"), "us", "tml(INSCRIPT)", 1 ], - "tscii" => [ N_("_: keyboard\nTamil (Typewriter-layout)"), "us", "tml(UNI)", 1 ], + "tml" => [ N_("_: keyboard\nTamil (ISCII-layout)"), "us", "in(tam)", 1 ], + "tscii" => [ N_("_: keyboard\nTamil (Typewriter-layout)"), "us", "in(tam_unicode)", 1 ], "th" => [ N_("_: keyboard\nThai (Kedmanee)"), "th", "th", 1 ], "th_tis" => [ N_("_: keyboard\nThai (TIS-820)"), "th", "th(tis)", 1 ], # TODO: console map "th_pat" => [ N_("_: keyboard\nThai (Pattachote)"), "us", "th(pat)", 1 ], # TODO: console map # NOTE: we define a triple layout here - "tifinagh" => [ N_("_: keyboard\nTifinagh (moroccan layout) (+latin/arabic)"), "fr", "fr,tifinagh,ara(azerty)", 1 ], + "tifinagh" => [ N_("_: keyboard\nTifinagh (moroccan layout) (+latin/arabic)"), "fr", "fr,tifinagh(basic),ara(azerty)", 1 ], "tifinagh_p" => [ N_("_: keyboard\nTifinagh (phonetic) (+latin/arabic)"), "fr", "fr,tifinagh(phonetic),ara(azerty)", 1 ], # TODO: console map "tj" => [ N_("_: keyboard\nTajik"), "ru4", "tj", 1 ], @@ -320,12 +318,12 @@ arch() =~ /^sparc/ ? ( "uk" => [ N_("UK keyboard"), "uk", "gb", 0 ], # TODO: console map "ur" => [ N_("_: keyboard\nUrdu keyboard"), "us", "ur", 1 ], - "us" => [ N_("US keyboard"), "us", "en_US", 0 ], - "us_intl" => [ N_("US keyboard (international)"), "us-intl", "us_intl", 0 ], + "us" => [ N_("US keyboard"), "us", "us", 0 ], + "us_intl" => [ N_("US keyboard (international)"), "us-intl", "us(alt-intl)", 0 ], "uz" => [ N_("_: keyboard\nUzbek (cyrillic)"), "uz.uni", "uz", 1 ], # old XKB layout "vn" => [ N_("_: keyboard\nVietnamese \"numeric row\" QWERTY"), "vn-tcvn", "vn(toggle)", 0 ], - "yu" => [ N_("_: keyboard\nYugoslavian (latin)"), "sr", "yu", 0 ], + "yu" => [ N_("_: keyboard\nYugoslavian (latin)"), "sr", "srp(latin)", 0 ], ), ); -- cgit v1.2.1