From 504bffd627220ad2d0827bdc27c0f418597cde14 Mon Sep 17 00:00:00 2001 From: stephan Date: Mon, 6 Feb 2012 14:48:39 +0000 Subject: Synchronisieren mit xkeyboard-config upstream git-svn-id: https://svn.neo-layout.org@2418 b9310e46-f624-0410-8ea1-cfbb3a30dc96 --- linux/X/compat/level5 | 5 - linux/X/compat/misc | 9 +- linux/X/rules/base | 104 +- linux/X/rules/base.xml | 2984 +++++++++++++++++++++++++++++++---------------- linux/X/rules/evdev | 104 +- linux/X/rules/evdev.xml | 2984 +++++++++++++++++++++++++++++++---------------- linux/X/symbols/de | 180 ++- linux/X/symbols/level3 | 4 - linux/X/symbols/level5 | 23 +- linux/X/symbols/shift | 2 - linux/X/types/level5 | 76 +- 11 files changed, 4282 insertions(+), 2193 deletions(-) (limited to 'linux/X') diff --git a/linux/X/compat/level5 b/linux/X/compat/level5 index 4769354..8d28051 100644 --- a/linux/X/compat/level5 +++ b/linux/X/compat/level5 @@ -1,11 +1,6 @@ -// $XKeyboardConfig$ -// $Xorg: level5,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ - // Fairly complete set of symbol interpretations // to provide reasonable default behavior -// $XFree86: xc/programs/xkbcomp/compat/iso9995,v 1.3 2003/02/21 03:16:34 dawes Exp $ - default partial xkb_compatibility "default" { virtual_modifiers LevelFive; diff --git a/linux/X/compat/misc b/linux/X/compat/misc index 68cda95..cfe9a39 100644 --- a/linux/X/compat/misc +++ b/linux/X/compat/misc @@ -1,10 +1,3 @@ -// $XdotOrg: xc/programs/xkbcomp/compat/misc,v 1.1.4.4 2004/03/05 13:41:28 eich Exp $ -// $Xorg: misc,v 1.3 2000/08/17 19:54:34 cpqbld Exp $ -// -// -// -// $XFree86: xc/programs/xkbcomp/compat/misc,v 1.4 2003/05/15 13:31:57 pascal Exp $ - default partial xkb_compatibility "misc" { virtual_modifiers Alt,Meta,Super,Hyper,ScrollLock; @@ -114,6 +107,8 @@ default partial xkb_compatibility "misc" { }; include "ledscroll" + + include "misc(assign_shift_left_action)" }; partial xkb_compatibility "assign_shift_left_action" { diff --git a/linux/X/rules/base b/linux/X/rules/base index 68c29df..44fa866 100644 --- a/linux/X/rules/base +++ b/linux/X/rules/base @@ -1,12 +1,9 @@ // DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part -// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - // // Rules for resolving XKB components for use with XFree86 // Copyright 1996 by Joseph Moss // // 2002 Modifier: Ivan Pascal The XFree86 Project -// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.79 2004/01/09 00:16:01 dawes Exp $ // // If you want non-latin layouts implicitly include the en_US layout @@ -19,7 +16,7 @@ ! $pcmodels = pc101 pc102 pc104 pc105 // Microsoft models (using MS geometry) -! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose +! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose // Nokia devices and keyboards ! $nokiamodels = nokiasu8w nokiarx44 nokiarx51 @@ -60,15 +57,15 @@ genius geniuscomfy2 \ gyration honeywell_euroboard \ hp250x hp5xx hp500fa hpdv5 \ - hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ + hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \ ibm_spacesaver ipaq inspiron intel \ logiaccess logicda logicink \ logiex110 logiclx300 \ logiinkse logiinkseusb logiitc logiik \ logitech_base itouch logiultrax \ logitech_g15 \ - logidinovo logidinovoedge \ - microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ + logidinovo logidinovoedge \ + microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ mx1998 mx2500 mx2750 \ oretec \ @@ -80,7 +77,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - tm2030USB toshiba_s3000 trust trustda \ + toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -114,6 +111,7 @@ lt lv nl no pl pt ro ru \ se sk tr tw ua +! $htcdreamlayouts = us it de ! $dvoraklayouts = br ca de ee es fr gb no pl se us @@ -159,6 +157,7 @@ hpmini110 = hp(mini110) hpdv5 = hp(dv5) omnikey101 = northgate(omnikey101) + sanwaskbkg3 = sanwa(sanwaskbkg3) $pcmodels = pc(%m) $pcgeometries = pc(%m) everex = everex(STEPnote) @@ -192,7 +191,6 @@ * gur basic = pc+in(guru) * ie laptop = pc+ie(basic) * ie CloGaelachLaptop = pc+ie(CloGaelach) - * il si1452 = pc+ie(basic) * in urd = pc+in(urd-phonetic) * iu basic = pc+ca(ike) * lo basic = pc+la(basic) @@ -227,10 +225,6 @@ * yu unicode = pc+srp(latinunicode) * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) - * rs combiningkeys = pc+extras/rs(combiningkeys) - * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) - * us crd = pc+extras/us(crd) - * us intl-unicode = pc+extras/us(intl-unicode) classmate us intl = pc+us(classmate-intl) classmate us alt-intl = pc+us(classmate-alt-intl) classmate us altgr-intl = pc+us(classmate-altgr-intl) @@ -279,7 +273,6 @@ * gur(basic) = pc+in(guru) * ie(laptop) = pc+ie(basic) * ie(CloGaelachLaptop) = pc+ie(CloGaelach) - * il(si1452) = pc+ie(basic) * in(urd) = pc+in(urd-phonetic) * iu(basic) = pc+ca(ike) * lo(basic) = pc+la(basic) @@ -314,11 +307,6 @@ * yu(unicode) = pc+srp(latinunicode) * yu(yz) = pc+srp(latinyz) * yu(unicodeyz) = pc+srp(latinunicodeyz) - * apl = pc+extras/apl - * rs(combiningkeys) = pc+extras/rs(combiningkeys) - * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) - * us(crd) = pc+extras/us(crd) - * us(intl-unicode) = pc+extras/us(intl-unicode) ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2 ataritt * = xfree68_vndr/ataritt(us)+%l%(v) amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 @@ -357,6 +345,7 @@ olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) + htcdream $htcdreamlayouts = %l(htcdream) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) @@ -403,7 +392,6 @@ * gur(basic) = pc+in(guru) * ie(laptop) = pc+ie(basic) * ie(CloGaelachLaptop) = pc+ie(CloGaelach) - * il(si1452) = pc+ie(basic) * in(urd) = pc+in(urd-phonetic) * iu(basic) = pc+ca(ike) * lo(basic) = pc+la(basic) @@ -438,11 +426,6 @@ * yu(unicode) = pc+srp(latinunicode) * yu(yz) = pc+srp(latinyz) * yu(unicodeyz) = pc+srp(latinunicodeyz) - * apl = pc+extras/apl%(v[1]) - * rs(combiningkeys) = pc+extras/rs(combiningkeys) - * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) - * us(crd) = pc+extras/us(crd) - * us(intl-unicode) = pc+extras/us(intl-unicode) ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1]) @@ -475,7 +458,6 @@ * gur basic = pc+in(guru) * ie laptop = pc+ie(basic) * ie CloGaelachLaptop = pc+ie(CloGaelach) - * il si1452 = pc+ie(basic) * in urd = pc+in(urd-phonetic) * iu basic = pc+ca(ike) * lo basic = pc+la(basic) @@ -510,10 +492,6 @@ * yu unicode = pc+srp(latinunicode) * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) - * rs combiningkeys = pc+extras/rs(combiningkeys) - * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) - * us crd = pc+extras/us(crd) - * us intl-unicode = pc+extras/us(intl-unicode) ! model layout[2] = symbols * ar = +ara%(v[2]):2 @@ -558,7 +536,6 @@ * gur(basic) = +in(guru):2 * ie(laptop) = +ie(basic):2 * ie(CloGaelachLaptop) = +ie(CloGaelach):2 - * il(si1452) = +ie(basic):2 * in(urd) = +in(urd-phonetic):2 * iu(basic) = +ca(ike):2 * lo(basic) = +la(basic):2 @@ -593,11 +570,6 @@ * yu(unicode) = +srp(latinunicode):2 * yu(yz) = +srp(latinyz):2 * yu(unicodeyz) = +srp(latinunicodeyz):2 - * apl = +extras/apl%(v[2]):2 - * rs(combiningkeys) = +extras/rs(combiningkeys):2 - * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 - * us(crd) = +extras/us(crd):2 - * us(intl-unicode) = +extras/us(intl-unicode):2 nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2 nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2 * * = +%l[2]%(v[2]):2 @@ -645,7 +617,6 @@ * gur(basic) = +in(guru):3 * ie(laptop) = +ie(basic):3 * ie(CloGaelachLaptop) = +ie(CloGaelach):3 - * il(si1452) = +ie(basic):3 * in(urd) = +in(urd-phonetic):3 * iu(basic) = +ca(ike):3 * lo(basic) = +la(basic):3 @@ -680,11 +651,6 @@ * yu(unicode) = +srp(latinunicode):3 * yu(yz) = +srp(latinyz):3 * yu(unicodeyz) = +srp(latinunicodeyz):3 - * apl = +extras/apl%(v[3]):3 - * rs(combiningkeys) = +extras/rs(combiningkeys):3 - * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 - * us(crd) = +extras/us(crd):3 - * us(intl-unicode) = +extras/us(intl-unicode):3 nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3 nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3 * * = +%l[3]%(v[3]):3 @@ -732,7 +698,6 @@ * gur(basic) = +in(guru):4 * ie(laptop) = +ie(basic):4 * ie(CloGaelachLaptop) = +ie(CloGaelach):4 - * il(si1452) = +ie(basic):4 * in(urd) = +in(urd-phonetic):4 * iu(basic) = +ca(ike):4 * lo(basic) = +la(basic):4 @@ -767,11 +732,6 @@ * yu(unicode) = +srp(latinunicode):4 * yu(yz) = +srp(latinyz):4 * yu(unicodeyz) = +srp(latinunicodeyz):4 - * apl = +extras/apl%(v[4]):4 - * rs(combiningkeys) = +extras/rs(combiningkeys):4 - * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 - * us(crd) = +extras/us(crd):4 - * us(intl-unicode) = +extras/us(intl-unicode):4 nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4 nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4 * * = +%l[4]%(v[4]):4 @@ -792,7 +752,6 @@ * gur basic = +in(guru):2 * ie laptop = +ie(basic):2 * ie CloGaelachLaptop = +ie(CloGaelach):2 - * il si1452 = +ie(basic):2 * in urd = +in(urd-phonetic):2 * iu basic = +ca(ike):2 * lo basic = +la(basic):2 @@ -827,10 +786,6 @@ * yu unicode = +srp(latinunicode):2 * yu yz = +srp(latinyz):2 * yu unicodeyz = +srp(latinunicodeyz):2 - * rs combiningkeys = +extras/rs(combiningkeys):2 - * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 - * us crd = +extras/us(crd):2 - * us intl-unicode = +extras/us(intl-unicode):2 ! model layout[3] variant[3] = symbols * ben basic = +in(ben):3 @@ -848,7 +803,6 @@ * gur basic = +in(guru):3 * ie laptop = +ie(basic):3 * ie CloGaelachLaptop = +ie(CloGaelach):3 - * il si1452 = +ie(basic):3 * in urd = +in(urd-phonetic):3 * iu basic = +ca(ike):3 * lo basic = +la(basic):3 @@ -883,10 +837,6 @@ * yu unicode = +srp(latinunicode):3 * yu yz = +srp(latinyz):3 * yu unicodeyz = +srp(latinunicodeyz):3 - * rs combiningkeys = +extras/rs(combiningkeys):3 - * us alt-intl-unicode = +extras/us(alt-intl-unicode):3 - * us crd = +extras/us(crd):3 - * us intl-unicode = +extras/us(intl-unicode):3 ! model layout[4] variant[4] = symbols * ben basic = +in(ben):4 @@ -904,7 +854,6 @@ * gur basic = +in(guru):4 * ie laptop = +ie(basic):4 * ie CloGaelachLaptop = +ie(CloGaelach):4 - * il si1452 = +ie(basic):4 * in urd = +in(urd-phonetic):4 * iu basic = +ca(ike):4 * lo basic = +la(basic):4 @@ -939,10 +888,6 @@ * yu unicode = +srp(latinunicode):4 * yu yz = +srp(latinyz):4 * yu unicodeyz = +srp(latinunicodeyz):4 - * rs combiningkeys = +extras/rs(combiningkeys):4 - * us alt-intl-unicode = +extras/us(alt-intl-unicode):4 - * us crd = +extras/us(crd):4 - * us intl-unicode = +extras/us(intl-unicode):4 ! model = symbols a4techKB21 = +inet(media_nav_common) @@ -1067,17 +1012,12 @@ grp:shifts_toggle = +group(shifts_toggle) grp:ctrls_toggle = +group(ctrls_toggle) grp:alts_toggle = +group(alts_toggle) - grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) - grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle) - grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) grp:caps_toggle = +capslock(grouplock) grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) grp:shift_caps_switch = +group(shift_caps_switch) grp:win_menu_switch = +group(win_menu_switch) grp:alt_caps_toggle = +group(alt_caps_toggle) - grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) - grp:alt_shift_toggle = +group(alt_shift_toggle) grp:alt_space_toggle = +group(alt_space_toggle) grp:menu_toggle = +group(menu_toggle) grp:lwin_toggle = +group(lwin_toggle) @@ -1090,6 +1030,19 @@ grp:lalt_toggle = +group(lalt_toggle) grp:sclk_toggle = +group(sclk_toggle) grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch) + grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu) + grp:lctrl_lalt_toggle = +group(lctrl_lalt_toggle) + grp:rctrl_ralt_toggle = +group(rctrl_ralt_toggle) + grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) + grp:ctrl_alt_toggle_bidir = +group(ctrl_alt_toggle_bidir) + grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle) + grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) + grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) + grp:ctrl_shift_toggle_bidir = +group(ctrl_shift_toggle_bidir) + grp:lalt_lshift_toggle = +group(lalt_lshift_toggle) + grp:ralt_rshift_toggle = +group(ralt_rshift_toggle) + grp:alt_shift_toggle = +group(alt_shift_toggle) + grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir) lv3:switch = +level3(switch) lv3:ralt_switch = +level3(ralt_switch) lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) @@ -1110,11 +1063,15 @@ caps:super = +capslock(super) caps:hyper = +capslock(hyper) caps:none = +capslock(none) + caps:ctrl_modifier = +capslock(ctrl_modifier) ctrl:nocaps = +ctrl(nocaps) + ctrl:lctrl_meta = +ctrl(lctrl_meta) ctrl:swapcaps = +ctrl(swapcaps) - ctrl:ctrl_ac = +ctrl(ctrl_ac) - ctrl:ctrl_aa = +ctrl(ctrl_aa) - ctrl:ctrl_ra = +ctrl(ctrl_ra) + ctrl:ac_ctrl = +ctrl(ac_ctrl) + ctrl:aa_ctrl = +ctrl(aa_ctrl) + ctrl:rctrl_ralt = +ctrl(rctrl_ralt) + ctrl:menu_rctrl = +ctrl(menu_rctrl) + ctrl:ralt_rctrl = +ctrl(ralt_rctrl) compose:ralt = +compose(ralt) compose:lwin = +compose(lwin) compose:rwin = +compose(rwin) @@ -1131,6 +1088,7 @@ eurosign:2 = +eurosign(2) eurosign:4 = +eurosign(4) eurosign:5 = +eurosign(5) + rupeesign:4 = +rupeesign(4) keypad:oss = +keypad(oss) keypad:legacy = +keypad(legacy) keypad:legacy_wang = +keypad(legacy_wang) @@ -1148,6 +1106,7 @@ nbsp:level4n = +nbsp(level4n) nbsp:level4nl = +nbsp(level4nl) japan:nicola_f_bs = +jp(nicola_f_bs) + japan:hztg_escape = +jp(hztg_escape) kpdl:dot = +kpdl(dot) kpdl:comma = +kpdl(comma) kpdl:dotoss = +kpdl(dotoss) @@ -1160,6 +1119,7 @@ esperanto:qwerty = +epo(qwerty) esperanto:dvorak = +epo(dvorak) terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) + keypad:pointerkeys = +keypad(pointerkeys) apple:alupckeys = +macintosh_vndr/apple(alupckeys) shift:both_capslock = +shift(both_capslock) shift:lshift_both_capslock = +shift(lshift_both_capslock) @@ -1191,9 +1151,9 @@ grp_led:num = +lednum(group_lock) grp_led:caps = +ledcaps(group_lock) grp_led:scroll = +ledscroll(group_lock) - grp:caps_toggle = +ledcaps(group_lock) japan:kana_lock = +japan(kana_lock) caps:shiftlock = +ledcaps(shift_lock) + grab:break_actions = +xfree86(grab_break) ! option = types diff --git a/linux/X/rules/base.xml b/linux/X/rules/base.xml index 952a457..4b97074 100644 --- a/linux/X/rules/base.xml +++ b/linux/X/rules/base.xml @@ -1,6 +1,6 @@ - + @@ -194,14 +194,14 @@ btc9019u - BTC 9019U + BTC 9019U BTC btc9116u - BTC 9116U Mini Wireless Internet and Gaming + BTC 9116U Mini Wireless Internet and Gaming @@ -447,6 +447,20 @@ Gyration + + + htcdream + HTC Dream + HTC + + + + + kinesis + Kinesis + Kinesis + + logitech_base @@ -556,42 +570,42 @@ rapidaccess IBM Rapid Access - IBM + Lenovo (previously IBM) rapidaccess2 IBM Rapid Access II - IBM + Lenovo (previously IBM) thinkpad IBM ThinkPad 560Z/600/600E/A22E - IBM + Lenovo (previously IBM) thinkpad60 IBM ThinkPad R60/T60/R61/T61 - IBM + Lenovo (previously IBM) thinkpadz60 IBM ThinkPad Z60m/Z60t/Z61m/Z61t - IBM + Lenovo (previously IBM) ibm_spacesaver IBM Space Saver - IBM + Lenovo (previously IBM) @@ -613,6 +627,7 @@ logii350 Logitech Internet 350 Keyboard Logitech + 046d:c313 @@ -776,6 +791,13 @@ Memorex + + + microsoft4000 + Microsoft Natural Wireless Ergonomic Keyboard 4000 + Microsoft Inc. + + microsoft7000 @@ -888,88 +910,95 @@ Samsung + + + sanwaskbkg3 + Sanwa Supply SKB-KG3 + Sanwa Supply Inc. + + sk1300 SK-1300 - NEC + NEC sk2500 SK-2500 - NEC + NEC sk6200 SK-6200 - NEC + NEC sk7100 SK-7100 - NEC + NEC sp_inet Super Power Multimedia Keyboard - Generic + Generic sven SVEN Ergonomic 2500 - SVEN + SVEN sven303 SVEN Slim 303 - SVEN + SVEN symplon Symplon PaceBook (tablet PC) - Symplon + Symplon toshiba_s3000 Toshiba Satellite S3000 - Toshiba + Toshiba trust Trust Wireless Keyboard Classic - Trust + Trust trustda Trust Direct Access Keyboard - Trust + Trust trust_slimline Trust Slimline - Trust + Trust @@ -1011,161 +1040,161 @@ yahoo Yahoo! Internet Keyboard - Yahoo! + Yahoo! macbook78 MacBook/MacBook Pro - Apple + Apple macbook79 MacBook/MacBook Pro (Intl) - Apple + Apple macintosh Macintosh - Apple + Apple macintosh_old Macintosh Old - Apple + Apple macintosh_hhk Happy Hacking Keyboard for Mac - Fujitsu + Fujitsu acer_c300 Acer C300 - Acer + Acer acer_ferrari4k Acer Ferrari 4000 - Acer + Acer acer_laptop Acer Laptop - Acer + Acer asus_laptop Asus Laptop - Asus + Asus apple Apple - Apple + Apple apple_laptop Apple Laptop - Apple + Apple applealu_ansi Apple Aluminium Keyboard (ANSI) - Apple + Apple applealu_iso Apple Aluminium Keyboard (ISO) - Apple + Apple applealu_jis Apple Aluminium Keyboard (JIS) - Apple + Apple silvercrest SILVERCREST Multimedia Wireless Keyboard - Silvercrest + Silvercrest emachines Laptop/notebook eMachines m68xx - eMachines + eMachines - benqx - BenQ X-Touch - BenQ + benqx + BenQ X-Touch + BenQ - benqx730 - BenQ X-Touch 730 - BenQ + benqx730 + BenQ X-Touch 730 + BenQ - benqx800 - BenQ X-Touch 800 - BenQ + benqx800 + BenQ X-Touch 800 + BenQ - hhk - Happy Hacking Keyboard - Fujitsu + hhk + Happy Hacking Keyboard + Fujitsu - classmate - Classmate PC - Intel + classmate + Classmate PC + Intel - olpc - OLPC - OLPC + olpc + OLPC + OLPC @@ -1203,106 +1232,124 @@ Creative + + + htcdream + Htc Dream phone + htc + + us - USA - USA - eng + + en + English (US) + + eng + chr + + chr Cherokee - chr + + chr + euro - With EuroSign on 5 + English (US, with euro on 5) intl - International (with dead keys) + English (US, international with dead keys) alt-intl - Alternative international + English (US, alternative international) - + colemak - Colemak + English (Colemak) dvorak - Dvorak + English (Dvorak) dvorak-intl - Dvorak international (with dead keys) + English (Dvorak international with dead keys) dvorak-alt-intl - Dvorak alternative international (no dead keys) + English (Dvorak alternative international no dead keys) dvorak-l - Left handed Dvorak + English (left handed Dvorak) dvorak-r - Right handed Dvorak + English (right handed Dvorak) dvorak-classic - Classic Dvorak + English (classic Dvorak) dvp - Programmer Dvorak + English (programmer Dvorak) rus - Russian phonetic - rus + + ru + Russian (US, phonetic) + + rus + mac - Macintosh + English (Macintosh) altgr-intl - International (AltGr dead keys) + English (international AltGr dead keys) eng fra ger @@ -1311,14 +1358,17 @@ olpc2 - Group toggle on multiply/divide key + English (layout toggle on multiply/divide key) - srp - Serbian + hbs + Serbo-Croatian (US) eng + bos + hbs + hrv srp @@ -1327,52 +1377,73 @@ ad - And - Andorra - cat + + ca + Catalan + + cat + af - Afg - Afghanistan + + fa + Afghani ps + + ps Pashto - pus + + pus + uz - Southern Uzbek - uzb + + uz + Uzbek (Afghanistan) + + uzb + olpc-ps - OLPC Pashto - pus + + ps + Pashto (Afghanistan, OLPC) + + pus + - olpc-fa - OLPC Dari + fa-olpc + fa + Persian (Afghanistan, Dari OLPC) - olpc-uz - OLPC Southern Uzbek - uzb + uz-olpc + + uz + Uzbek (Afghanistan, OLPC) + + uzb + @@ -1380,7 +1451,8 @@ ara - Ara + + ar Arabic AE @@ -1403,43 +1475,45 @@ TN YE - ara + + ara + azerty - azerty + Arabic (azerty) azerty_digits - azerty/digits + Arabic (azerty/digits) digits - digits + Arabic (digits) qwerty - qwerty + Arabic (qwerty) qwerty_digits - qwerty/digits + Arabic (qwerty/digits) buckwalter - Buckwalter + Arabic (Buckwalter) @@ -1447,48 +1521,85 @@ al - Alb - Albania - alb + + sq + Albanian + + alb + am - Arm - Armenia - hye + + hy + Armenian + + hye + phonetic - Phonetic + Armenian (phonetic) phonetic-alt - Alternative Phonetic + Armenian (alternative phonetic) eastern - Eastern + Armenian (eastern) western - Western + Armenian (western) eastern-alt - Alternative Eastern + Armenian (alternative eastern) + + + + + + + at + + de + German (Austria) + + ger + + + + + + nodeadkeys + German (Austria, eliminate dead keys) + + + + + sundeadkeys + German (Austria, Sun dead keys) + + + + + mac + German (Austria, Macintosh) @@ -1496,15 +1607,18 @@ az - Aze - Azerbaijan - aze + + az + Azerbaijani + + aze + cyrillic - Cyrillic + Azerbaijani (Cyrillic) @@ -1512,21 +1626,24 @@ by - Blr - Belarus - bel + + by + Belarusian + + bel + legacy - Legacy + Belarusian (legacy) latin - Latin + Belarusian (Latin) @@ -1534,52 +1651,54 @@ be - Bel - Belgium + + be + Belgian ger + nld fra oss - Alternative + Belgian (alternative) oss_latin9 - Alternative, latin-9 only + Belgian (alternative, latin-9 only) oss_sundeadkeys - Alternative, Sun dead keys + Belgian (alternative, Sun dead keys) iso-alternate - ISO Alternate + Belgian (ISO alternate) nodeadkeys - Eliminate dead keys + Belgian (eliminate dead keys) sundeadkeys - Sun dead keys + Belgian (Sun dead keys) wang - Wang model 724 azerty + Belgian (Wang model 724 azerty) @@ -1587,15 +1706,18 @@ bd - Bgd - Bangladesh - ben + + bn + Bengali + + ben + probhat - Probhat + Bengali (Probhat) @@ -1603,148 +1725,277 @@ in - Ind - India + + in + Indian ben - Bengali - ben + + bn + Bengali (India) + + ben + ben_probhat - Bengali Probhat + + bn + Bengali (India, Probhat) + + ben + + + + + + ben_baishakhi + Bengali (India, Baishakhi) + ben + + + + + ben_bornona + Bengali (India, Bornona) + ben + + + + + ben_gitanjali + Bengali (India, Uni Gitanjali) + ben + + + + + ben_inscript + Bengali (India, Baishakhi Inscript) ben guj + + gu Gujarati - guj + + guj + guru - Gurmukhi - pan + + pa + Punjabi (Gurmukhi) + + pan + jhelum - Gurmukhi Jhelum - pan + + pa + Punjabi (Gurmukhi Jhelum) + + pan + kan + + kn Kannada - kan + + kan + mal + + ml Malayalam - mal - + + mal + + - + mal_lalitha - Malayalam Lalitha - mal - + + ml + Malayalam (Lalitha) + + mal + + + mal_enhanced + + ml + Malayalam (enhanced Inscript with Rupee Sign) + mal + + + + ori + + or Oriya - ori + + ori + tam_unicode - Tamil Unicode - tam + + ta + Tamil (Unicode) + + tam + tam_keyboard_with_numerals - Tamil Keyboard with Numerals - tam + + ta + Tamil (keyboard with numerals) + + tam + tam_TAB - Tamil TAB Typewriter - tam + + ta + Tamil (TAB typewriter) + + tam + tam_TSCII - Tamil TSCII Typewriter - tam + + ta + Tamil (TSCII typewriter) + + tam + tam + + ta Tamil - tam + + tam + tel + + te Telugu - tel + + tel + urd-phonetic - Urdu, Phonetic - urd + + ur + Urdu (phonetic) + + urd + urd-phonetic3 - Urdu, Alternative phonetic - urd + + ur + Urdu (alternative phonetic) + + urd + urd-winkeys - Urdu, Winkeys - urd + + ur + Urdu (WinKeys) + + urd + bolnagri - Hindi Bolnagri - hin + + hi + Hindi (Bolnagri) + + hin + hin-wx - Hindi Wx - hin + + hi + Hindi (Wx) + + hin + + + + + + eng + + en + English (India, with RupeeSign) + + eng + @@ -1752,33 +2003,36 @@ ba - Bih - Bosnia and Herzegovina - bos + + bs + Bosnian + + bos + alternatequotes - Use guillemets for quotes + Bosnian (use guillemets for quotes) unicode - Use Bosnian digraphs + Bosnian (use Bosnian digraphs) unicodeus - US keyboard with Bosnian digraphs + Bosnian (US keyboard with Bosnian digraphs) us - US keyboard with Bosnian letters + Bosnian (US keyboard with Bosnian letters) @@ -1786,40 +2040,45 @@ br - Bra - Brazil - por + + pt + Portuguese (Brazil) + + por + nodeadkeys - Eliminate dead keys + Portuguese (Brazil, eliminate dead keys) dvorak - Dvorak + Portuguese (Brazil, Dvorak) nativo - Nativo + Portuguese (Brazil, nativo) nativo-us - Nativo for USA keyboards + Portuguese (Brazil, nativo for USA keyboards) nativo-epo - Nativo for Esperanto - epo + Portuguese (Brazil, nativo for Esperanto) + + epo + @@ -1827,23 +2086,24 @@ bg - Bgr - Bulgaria - bul + + bg + Bulgarian + + bul + phonetic - Traditional phonetic + Bulgarian (traditional phonetic) - - bas_phonetic - New phonetic + Bulgarian (new phonetic) @@ -1851,56 +2111,184 @@ ma - Morocco + + ar + Arabic (Morocco) french - French - fra + + fr + French (Morocco) + + fra + tifinagh - Tifinagh - ber + + ber + Berber (Morocco, Tifinagh) + + ber + tifinagh-alt - Tifinagh Alternative - ber + + ber + Berber (Morocco, Tifinagh alternative) + + ber + tifinagh-alt-phonetic - Tifinagh Alternative Phonetic - ber + + ber + Berber (Morocco, Tifinagh alternative phonetic) + + ber + tifinagh-extended - Tifinagh Extended - ber + + ber + Berber (Morocco, Tifinagh extended) + + ber + tifinagh-phonetic - Tifinagh Phonetic - ber + + ber + Berber (Morocco, Tifinagh phonetic) + + ber + tifinagh-extended-phonetic - Tifinagh Extended Phonetic - ber + + ber + Berber (Morocco, Tifinagh extended phonetic) + + ber + + + + + + + + cm + + cm + English (Cameroon) + eng + + + + + french + French (Cameroon) + fra + + + + + qwerty + Cameroon Multilingual (qwerty) + + eng + bas + nmg + fub + ewo + xmd + mfh + bkm + ozm + lns + sox + pny + wes + lem + nyj + mfk + mcp + ass + xed + dua + anv + bum + btb + bfd + azo + ken + yam + yat + yas + + + + + + azerty + Cameroon Multilingual (azerty) + + fra + bas + nmg + fub + ewo + xmd + mfh + bkm + ozm + lns + sox + pny + wes + lem + nyj + mfk + mcp + ass + xed + dua + anv + bum + btb + bfd + azo + ken + yam + yat + yas + + + + + + dvorak + Cameroon Multilingual (Dvorak) @@ -1908,75 +2296,80 @@ mm - Mmr - Myanmar - mya + + my + Burmese + + mya + ca - Can - Canada - fra + + fr + French (Canada) + + fra + fr-dvorak - French Dvorak + + fr + French (Canada, Dvorak) fr-legacy - French (legacy) + + fr + French (Canada, legacy) multix - Multilingual + Canadian Multilingual multi - Multilingual, first part + Canadian Multilingual (first part) multi-2gr - Multilingual, second part + Canadian Multilingual (second part) ike - Inuktitut - iku - - - - - shs - Secwepemctsin - - - - - kut - Ktunaxa + ike + Inuktitut + + iku + eng - English - eng + + en + English (Canada) + + eng + @@ -1984,32 +2377,51 @@ cd - COD - Congo, Democratic Republic of the - fra + + fr + French (Democratic Republic of the Congo) + + fra + cn - Chn - China - chi + + zh + Chinese + + chi + tib Tibetan - tib + + tib + tib_asciinum Tibetan (with ASCII numerals) - tib + + tib + + + + + + uig + Uyghur + + uig + @@ -2017,33 +2429,36 @@ hr - Hrv - Croatia - scr + + hr + Croatian + + scr + alternatequotes - Use guillemets for quotes + Croatian (use guillemets for quotes) unicode - Use Croatian digraphs + Croatian (use Croatian digraphs) unicodeus - US keyboard with Croatian digraphs + Croatian (US keyboard with Croatian digraphs) us - US keyboard with Croatian letters + Croatian (US keyboard with Croatian letters) @@ -2051,73 +2466,79 @@ cz - Cze - Czechia - cze + + cs + Czech + + cze + bksl - With <\|> key + Czech (with <\|> key) qwerty - qwerty + Czech (qwerty) qwerty_bksl - qwerty, extended Backslash - - - - - ucw - UCW layout (accented letters only) - - - - - dvorak-ucw - US Dvorak with CZ UCW support - - + Czech (qwerty, extended Backslash) + + + + + ucw + Czech (UCW layout, accented letters only) + + + + + dvorak-ucw + Czech (US Dvorak with CZ UCW support) + + dk - Dnk - Denmark - dan + + da + Danish + + dan + nodeadkeys - Eliminate dead keys + Danish (eliminate dead keys) mac - Macintosh + Danish (Macintosh) mac_nodeadkeys - Macintosh, eliminate dead keys + Danish (Macintosh, eliminate dead keys) dvorak - Dvorak + Danish (Dvorak) @@ -2125,27 +2546,30 @@ nl - Nld - Netherlands - nld + + nl + Dutch + + nld + sundeadkeys - Sun dead keys + Dutch (Sun dead keys) mac - Macintosh + Dutch (Macintosh) std - Standard + Dutch (standard) @@ -2153,35 +2577,41 @@ bt - Btn - Bhutan - dzo + + dz + Dzongkha + + dzo + ee - Est - Estonia - est + + et + Estonian + + est + nodeadkeys - Eliminate dead keys + Estonian (eliminate dead keys) dvorak - Dvorak + Estonian (Dvorak) us - US keyboard with Estonian letters + Estonian (US keyboard with Estonian letters) @@ -2189,43 +2619,62 @@ ir - Irn - Iran - per + + fa + Persian + + per + pes_keypad - Persian, with Persian Keypad + Persian (with Persian Keypad) ku - Kurdish, Latin Q - kur + + ku + Kurdish (Iran, Latin Q) + + kur + ku_f - Kurdish, (F) - kur + + ku + Kurdish (Iran, F) + + kur + ku_alt - Kurdish, Latin Alt-Q - kur + + ku + Kurdish (Iran, Latin Alt-Q) + + kur + ku_ara - Kurdish, Arabic-Latin - kur + + ku + Kurdish (Iran, Arabic-Latin) + + kur + @@ -2233,8 +2682,9 @@ iq - Irq - Iraq + + ar + Iraqi ara kur @@ -2242,29 +2692,45 @@ ku - Kurdish, Latin Q - kur + + ku + Kurdish (Iraq, Latin Q) + + kur + ku_f - Kurdish, (F) - kur + + ku + Kurdish (Iraq, F) + + kur + ku_alt - Kurdish, Latin Alt-Q - kur + + ku + Kurdish (Iraq, Latin Alt-Q) + + kur + ku_ara - Kurdish, Arabic-Latin - kur + + ku + Kurdish (Iraq, Arabic-Latin) + + kur + @@ -2272,15 +2738,18 @@ fo - Fro - Faroe Islands - fao + + fo + Faroese + + fao + nodeadkeys - Eliminate dead keys + Faroese (eliminate dead keys) @@ -2288,35 +2757,37 @@ fi - Fin - Finland - fin + + fi + Finnish + + fin + - nodeadkeys - Eliminate dead keys + classic + Finnish (classic) - smi - Northern Saami - smi - sme + nodeadkeys + Finnish (classic, eliminate dead keys) - classic - Classic + smi + Northern Saami (Finland) + sme mac - Macintosh + Finnish (Macintosh) @@ -2324,107 +2795,114 @@ fr - Fra - France - fra + + fr + French + + fra + nodeadkeys - Eliminate dead keys + French (eliminate dead keys) sundeadkeys - Sun dead keys + French (Sun dead keys) oss - Alternative + French (alternative) oss_latin9 - Alternative, latin-9 only + French (alternative, latin-9 only) oss_nodeadkeys - Alternative, eliminate dead keys + French (alternative, eliminate dead keys) oss_sundeadkeys - Alternative, Sun dead keys + French (alternative, Sun dead keys) latin9 - (Legacy) Alternative + French (legacy, alternative) latin9_nodeadkeys - (Legacy) Alternative, eliminate dead keys + French (legacy, alternative, eliminate dead keys) latin9_sundeadkeys - (Legacy) Alternative, Sun dead keys + French (legacy, alternative, Sun dead keys) bepo - Bepo, ergonomic, Dvorak way + French (Bepo, ergonomic, Dvorak way) bepo_latin9 - Bepo, ergonomic, Dvorak way, latin-9 only + French (Bepo, ergonomic, Dvorak way, latin-9 only) dvorak - Dvorak + French (Dvorak) mac - Macintosh + French (Macintosh) bre - Breton + French (Breton) oci Occitan - oci + + oci + geo - Georgian AZERTY Tskapo - geo + Georgian (France, AZERTY Tskapo) + + geo + @@ -2432,63 +2910,90 @@ gh - Gha - Ghana - eng + + en + English (Ghana) + + eng + generic - Multilingual + English (Ghana, multilingual) akan + + ak Akan - aka + + aka + ewe + + ee Ewe - ewe + + ewe + fula + + ff Fula - ful + + ful + ga + + gaa Ga - gaa + + gaa + hausa + + ha Hausa - hau + + hau + avn + + avn Avatime - avn + + avn + gillbt - GILLBT + English (Ghana, GILLBT) @@ -2496,44 +3001,56 @@ gn - Gin - Guinea - fra + + fr + French (Guinea) + + fra + ge - Geo - Georgia - geo + + ka + Georgian + + geo + ergonomic - Ergonomic + Georgian (ergonomic) mess - MESS + Georgian (MESS) ru - Russian - rus + + ru + Russian (Georgia) + + rus + os - Ossetian - oss + Ossetian (Georgia) + + oss + @@ -2541,89 +3058,101 @@ de - Deu - Germany - ger + + de + German + + ger + deadacute - Dead acute + German (dead acute) deadgraveacute - Dead grave acute + German (dead grave acute) nodeadkeys - Eliminate dead keys + German (eliminate dead keys) ro - Romanian keyboard with German letters + Romanian (Germany) + rum ro_nodeadkeys - Romanian keyboard with German letters, eliminate dead keys + Romanian (Germany, eliminate dead keys) + rum dvorak - Dvorak + German (Dvorak) sundeadkeys - Sun dead keys + German (Sun dead keys) neo - Neo 2 + German (Neo 2) mac - Macintosh + German (Macintosh) mac_nodeadkeys - Macintosh, eliminate dead keys + German (Macintosh, eliminate dead keys) dsb Lower Sorbian - dsb + + dsb + dsb_qwertz Lower Sorbian (qwertz) - dsb + + dsb + - qwerty - qwerty + ru + Russian (Germany, phonetic) + + rus + @@ -2631,33 +3160,36 @@ gr - Grc - Greece - gre + + gr + Greek + + gre + simple - Simple + Greek (simple) extended - Extended + Greek (extended) nodeadkeys - Eliminate dead keys + Greek (eliminate dead keys) polytonic - Polytonic + Greek (polytonic) @@ -2665,128 +3197,126 @@ hu - Hun - Hungary - hun + + hu + Hungarian + + hun + standard - Standard + Hungarian (standard) nodeadkeys - Eliminate dead keys + Hungarian (eliminate dead keys) qwerty - qwerty + Hungarian (qwerty) - - 101_qwertz_comma_dead - 101/qwertz/comma/Dead keys + Hungarian (101/qwertz/comma/dead keys) 101_qwertz_comma_nodead - 101/qwertz/comma/Eliminate dead keys + Hungarian (101/qwertz/comma/eliminate dead keys) 101_qwertz_dot_dead - 101/qwertz/dot/Dead keys + Hungarian (101/qwertz/dot/dead keys) 101_qwertz_dot_nodead - 101/qwertz/dot/Eliminate dead keys + Hungarian (101/qwertz/dot/eliminate dead keys) 101_qwerty_comma_dead - 101/qwerty/comma/Dead keys + Hungarian (101/qwerty/comma/dead keys) 101_qwerty_comma_nodead - 101/qwerty/comma/Eliminate dead keys + Hungarian (101/qwerty/comma/eliminate dead keys) 101_qwerty_dot_dead - 101/qwerty/dot/Dead keys + Hungarian (101/qwerty/dot/dead keys) 101_qwerty_dot_nodead - 101/qwerty/dot/Eliminate dead keys + Hungarian (101/qwerty/dot/eliminate dead keys) - - - 102_qwertz_comma_dead - 102/qwertz/comma/Dead keys + Hungarian (102/qwertz/comma/dead keys) 102_qwertz_comma_nodead - 102/qwertz/comma/Eliminate dead keys + Hungarian (102/qwertz/comma/eliminate dead keys) 102_qwertz_dot_dead - 102/qwertz/dot/Dead keys + Hungarian (102/qwertz/dot/dead keys) 102_qwertz_dot_nodead - 102/qwertz/dot/Eliminate dead keys + Hungarian (102/qwertz/dot/eliminate dead keys) 102_qwerty_comma_dead - 102/qwerty/comma/Dead keys + Hungarian (102/qwerty/comma/dead keys) 102_qwerty_comma_nodead - 102/qwerty/comma/Eliminate dead keys + Hungarian (102/qwerty/comma/eliminate dead keys) 102_qwerty_dot_dead - 102/qwerty/dot/Dead keys + Hungarian (102/qwerty/dot/dead keys) 102_qwerty_dot_nodead - 102/qwerty/dot/Eliminate dead keys + Hungarian (102/qwerty/dot/eliminate dead keys) @@ -2794,33 +3324,36 @@ is - Isl - Iceland - ice + + is + Icelandic + + ice + Sundeadkeys - Sun dead keys + Icelandic (Sun dead keys) nodeadkeys - Eliminate dead keys + Icelandic (eliminate dead keys) mac - Macintosh + Icelandic (Macintosh) dvorak - Dvorak + Icelandic (Dvorak) @@ -2828,27 +3361,30 @@ il - Isr - Israel - heb + + he + Hebrew + + heb + lyx - lyx + Hebrew (lyx) phonetic - Phonetic + Hebrew (phonetic) biblical - Biblical Hebrew (Tiro) + Hebrew (Biblical, Tiro) @@ -2856,34 +3392,39 @@ it - Ita - Italy - ita + + it + Italian + + ita + nodeadkeys - Eliminate dead keys + Italian (eliminate dead keys) mac - Macintosh + Italian (Macintosh) us - US keyboard with Italian letters + Italian (US keyboard with Italian letters) geo - Georgian - geo + Georgian (Italy) + + geo + @@ -2891,27 +3432,36 @@ jp - Jpn - Japan - jpn + + ja + Japanese + + jpn + kana - Kana + Japanese (Kana) + + + + + kana86 + Japanese (Kana 86) - + OADG109A - OADG 109A + Japanese (OADG 109A) - + mac - Macintosh + Japanese (Macintosh) @@ -2919,15 +3469,18 @@ kg - Kgz - Kyrgyzstan - kir + + ki + Kyrgyz + + kir + - + phonetic - Phonetic + Kyrgyz (phonetic) @@ -2935,52 +3488,73 @@ kh - Khm - Cambodia - khm + + km + Khmer (Cambodia) + + khm + kz - Kaz - Kazakhstan - kaz + + kk + Kazakh + + kaz + - - - ruskaz - Russian with Kazakh - kaz + + + ruskaz + + ru + Russian (Kazakhstan, with Kazakh) + kaz rus - - - - - kazrus - Kazakh with Russian + + + + + kazrus + Kazakh (with Russian) kaz rus - - + + la - Lao - Laos - lao + + lo + Lao + + lao + - + + + + stea + Lao (STEA proposed standard layout) + lao + + + + latam - LAm - Latin American + + es + Spanish (Latin American) AR BO @@ -3004,25 +3578,27 @@ UY VE - spa + + spa + nodeadkeys - Eliminate dead keys + Spanish (Latin American, eliminate dead keys) deadtilde - Include dead tilde + Spanish (Latin American, include dead tilde) sundeadkeys - Sun dead keys + Spanish (Latin American, Sun dead keys) @@ -3030,39 +3606,42 @@ lt - Ltu - Lithuania - lit + + lt + Lithuanian + + lit + std - Standard + Lithuanian (standard) us - US keyboard with Lithuanian letters + Lithuanian (US keyboard with Lithuanian letters) ibm - IBM (LST 1205-92) + Lithuanian (IBM LST 1205-92) lekp - LEKP + Lithuanian (LEKP) lekpa - LEKPa + Lithuanian (LEKPa) @@ -3070,27 +3649,48 @@ lv - Lva - Latvia - lav + + lv + Latvian + + lav + apostrophe - Apostrophe (') variant + Latvian (apostrophe variant) tilde - Tilde (~) variant + Latvian (tilde variant) fkey - F-letter (F) variant + Latvian (F variant) + + + + + modern + Latvian (modern) + + + + + ergonomic + Latvian (ergonomic, ŪGJRMV) + + + + + adapted + Latvian (adapted) @@ -3098,60 +3698,66 @@ mao - Mao + + mi Maori - mao + + mao + me - MNE - Montenegro - srp + + sr + Montenegrin + + srp + cyrillic - Cyrillic + Montenegrin (Cyrillic) cyrillicyz - Cyrillic, Z and ZHE swapped + Montenegrin (Cyrillic, Z and ZHE swapped) latinunicode - Latin unicode + Montenegrin (Latin Unicode) latinyz - Latin qwerty + Montenegrin (Latin qwerty) latinunicodeyz - Latin unicode qwerty + Montenegrin (Latin Unicode qwerty) cyrillicalternatequotes - Cyrillic with guillemets + Montenegrin (Cyrillic with guillemets) latinalternatequotes - Latin with guillemets + Montenegrin (Latin with guillemets) @@ -3159,15 +3765,18 @@ mk - Mkd - Macedonia - mkd + + mk + Macedonian + + mkd + nodeadkeys - Eliminate dead keys + Macedonian (eliminate dead keys) @@ -3175,15 +3784,18 @@ mt - Mlt - Malta - mlt + + mt + Maltese + + mlt + us - Maltese keyboard with US layout + Maltese (with US layout) @@ -3191,56 +3803,66 @@ mn - Mng - Mongolia - mng + + mn + Mongolian + + mng + no - Nor - Norway - nor + + no + Norwegian + + nor + nodeadkeys - Eliminate dead keys + Norwegian (eliminate dead keys) dvorak - Dvorak + Norwegian (Dvorak) smi - Northern Saami - sme + Northern Saami (Norway) + + sme + smi_nodeadkeys - Northern Saami, eliminate dead keys - sme + Northern Saami (Norway, eliminate dead keys) + + sme + mac - Macintosh + Norwegian (Macintosh) mac_nodeadkeys - Macintosh, eliminate dead keys + Norwegian (Macintosh, eliminate dead keys) @@ -3248,53 +3870,62 @@ pl - Pol - Poland - pol + + pl + Polish + + pol + qwertz - qwertz + Polish (qwertz) dvorak - Dvorak + Polish (Dvorak) dvorak_quotes - Dvorak, Polish quotes on quotemark key + Polish (Dvorak, Polish quotes on quotemark key) dvorak_altquotes - Dvorak, Polish quotes on key 1 + Polish (Dvorak, Polish quotes on key 1) csb Kashubian - csb + + csb + ru_phonetic_dvorak - Russian phonetic Dvorak - rus + + ru + Russian (Poland, phonetic Dvorak) + + rus + dvp - Programmer Dvorak + Polish (programmer Dvorak) @@ -3302,58 +3933,63 @@ pt - Prt - Portugal - por + + pt + Portuguese + + por + nodeadkeys - Eliminate dead keys + Portuguese (eliminate dead keys) sundeadkeys - Sun dead keys + Portuguese (Sun dead keys) mac - Macintosh + Portuguese (Macintosh) mac_nodeadkeys - Macintosh, eliminate dead keys + Portuguese (Macintosh, eliminate dead keys) mac_sundeadkeys - Macintosh, Sun dead keys + Portuguese (Macintosh, Sun dead keys) nativo - Nativo + Portuguese (Nativo) nativo-us - Nativo for USA keyboards + Portuguese (Nativo for USA keyboards) nativo-epo - Nativo for Esperanto - epo + Esperanto (Portugal, Nativo) + + epo + @@ -3361,61 +3997,36 @@ ro - Rou - Romania - rum + + ro + Romanian + + rum + cedilla - Cedilla + Romanian (cedilla) std - Standard + Romanian (standard) std_cedilla - Standard (Cedilla) + Romanian (standard cedilla) winkeys - Winkeys - - - - - crh_f - Crimean Tatar (Turkish F) - crh - - - - - crh_alt - Crimean Tatar (Turkish Alt-Q) - crh - - - - - crh_dobruca1 - Crimean Tatar (Dobruca-1 Q) - crh - - - - - crh_dobruca2 - Crimean Tatar (Dobruca-2 Q) - crh + Romanian (WinKeys) @@ -3423,114 +4034,135 @@ ru - Rus - Russia - rus + + ru + Russian + + rus + phonetic - Phonetic + Russian (phonetic) phonetic_winkeys - Phonetic Winkeys + Russian (phonetic WinKeys) typewriter - Typewriter + Russian (typewriter) legacy - Legacy + Russian (legacy) typewriter-legacy - Typewriter, legacy + Russian (typewriter, legacy) tt Tatar - tat + + tat + os_legacy - Ossetian, legacy - oss + Ossetian (legacy) + + oss + os_winkeys - Ossetian, Winkeys - oss + Ossetian (WinKeys) + + oss + cv Chuvash - chv + + chv + cv_latin - Chuvash Latin - chv + Chuvash (Latin) + + chv + udm Udmurt - udm + + udm + kom Komi - kom + + kom + - + sah Yakut - sah + + sah + xal Kalmyk - xal + + xal + dos - DOS + Russian (DOS) srp - Serbian + Serbian (Russia) rus srp @@ -3539,7 +4171,18 @@ bak Bashkirian - bak + + bak + + + + + + chm + Mari + + chm + @@ -3547,51 +4190,63 @@ rs - SRB - Serbia - srp + + sr + Serbian (Cyrillic) + + srp + yz - Z and ZHE swapped + Serbian (Cyrillic, Z and ZHE swapped) latin - Latin + Serbian (Latin) latinunicode - Latin Unicode + Serbian (Latin Unicode) latinyz - Latin qwerty + Serbian (Latin qwerty) latinunicodeyz - Latin Unicode qwerty + Serbian (Latin Unicode qwerty) alternatequotes - With guillemets + Serbian (Cyrillic with guillemets) latinalternatequotes - Latin with guillemets + Serbian (Latin with guillemets) + + + + + rue + Pannonian Rusyn (homophonic) + + rue + @@ -3599,21 +4254,24 @@ si - Svn - Slovenia - slv + + sl + Slovenian + + slv + alternatequotes - Use guillemets for quotes + Slovenian (use guillemets for quotes) us - US keyboard with Slovenian letters + Slovenian (US keyboard with Slovenian letters) @@ -3621,27 +4279,30 @@ sk - Svk - Slovakia - slo + + sk + Slovak + + slo + bksl - Extended Backslash + Slovak (extended Backslash) qwerty - qwerty + Slovak (qwerty) qwerty_bksl - qwerty, extended Backslash + Slovak (qwerty, extended Backslash) @@ -3649,53 +4310,60 @@ es - Esp - Spain - spa + + es + Spanish + + spa + nodeadkeys - Eliminate dead keys + Spanish (eliminate dead keys) deadtilde - Include dead tilde + Spanish (include dead tilde) sundeadkeys - Sun dead keys + Spanish (Sun dead keys) dvorak - Dvorak + Spanish (Dvorak) ast - Asturian variant with bottom-dot H and bottom-dot L - ast + Asturian (Spain, with bottom-dot H and bottom-dot L) + + ast + cat - Catalan variant with middle-dot L - cat + Catalan (Spain, with middle-dot L) + + cat + mac - Macintosh + Spanish (Macintosh) @@ -3703,54 +4371,74 @@ se - Swe - Sweden - swe + + sv + Swedish + + swe + nodeadkeys - Eliminate dead keys + Swedish (eliminate dead keys) dvorak - Dvorak + Swedish (Dvorak) rus - Russian phonetic - rus + + ru + Russian (Sweden, phonetic) + + rus + rus_nodeadkeys - Russian phonetic, eliminate dead keys - rus + + ru + Russian (Sweden, phonetic, eliminate dead keys) + + rus + smi - Northern Saami - sme + Northern Saami (Sweden) + + sme + mac - Macintosh + Swedish (Macintosh) svdvorak - Svdvorak + Swedish (Svdvorak) + + + + + swl + Swedish Sign Language + swl @@ -3758,8 +4446,9 @@ ch - Che - Switzerland + + de + German (Switzerland) ger gsw @@ -3767,53 +4456,75 @@ legacy - Legacy + German (Switzerland, legacy) de_nodeadkeys - German, eliminate dead keys + + de + German (Switzerland, eliminate dead keys) de_sundeadkeys - German, Sun dead keys + + de + German (Switzerland, Sun dead keys) fr - French - fra + + fr + French (Switzerland) + + fra + fr_nodeadkeys - French, eliminate dead keys - fra + + fr + French (Switzerland, eliminate dead keys) + + fra + fr_sundeadkeys - French, Sun dead keys - fra + + fr + French (Switzerland, Sun dead keys) + + fra + fr_mac - French (Macintosh) - fra + + fr + French (Switzerland, Macintosh) + + fra + de_mac - German (Macintosh) + + de + German (Switzerland, Macintosh) @@ -3821,42 +4532,61 @@ sy - Syr - Syria - syr + + ar + Arabic (Syria) + + syr + syc + + syc Syriac syc_phonetic - Syriac phonetic + + syc + Syriac (phonetic) ku - Kurdish, Latin Q - kur + + ku + Kurdish (Syria, Latin Q) + + kur + ku_f - Kurdish, (F) - kur + + ku + Kurdish (Syria, F) + + kur + ku_alt - Kurdish, Latin Alt-Q - kur + + ku + Kurdish (Syria, Latin Alt-Q) + + kur + @@ -3864,15 +4594,18 @@ tj - Tjk - Tajikistan - tgk + + tg + Tajik + + tgk + legacy - Legacy + Tajik (legacy) @@ -3880,23 +4613,32 @@ lk - Lka - Sri Lanka - sin + + si + Sinhala (phonetic) + + sin + tam_unicode - Tamil Unicode - tam + + ta + Tamil (Sri Lanka, Unicode) + + tam + tam_TAB - Tamil TAB Typewriter - tam + Tamil (Sri Lanka, TAB Typewriter) + + tam + @@ -3904,21 +4646,24 @@ th - Tha - Thailand - tha + + th + Thai + + tha + tis - TIS-820.2538 + Thai (TIS-820.2538) pat - Pattachote + Thai (Pattachote) @@ -3926,150 +4671,200 @@ tr - Tur - Turkey - tur + + tr + Turkish + + tur + f - (F) + Turkish (F) alt - Alt-Q + Turkish (Alt-Q) sundeadkeys - Sun dead keys + Turkish (Sun dead keys) ku - Kurdish, Latin Q - kur + + ku + Kurdish (Turkey, Latin Q) + + kur + ku_f - Kurdish, (F) - kur + + ku + Kurdish (Turkey, F) + + kur + ku_alt - Kurdish, Latin Alt-Q - kur + + ku + Kurdish (Turkey, Latin Alt-Q) + + kur + intl - International (with dead keys) + Turkish (international with dead keys) crh + + crh Crimean Tatar (Turkish Q) - crh + + crh + crh_f + + crh Crimean Tatar (Turkish F) - crh + + crh + crh_alt + + crh Crimean Tatar (Turkish Alt-Q) - crh + + crh + - ua - Ukr - Ukraine - ukr + tw + + zh + Taiwanese + + trv + - phonetic - Phonetic + indigenous + Taiwanese (indigenous) + + ami + tay + bnn + ckv + pwn + pyu + dru + ais + ssf + tao + tsu + - typewriter - Typewriter + saisiyat + + xsy + Saisiyat (Taiwan) + + xsy + + + + + + ua + + uk + Ukrainian + + ukr + + + - winkeys - Winkeys + phonetic + Ukrainian (phonetic) - legacy - Legacy + typewriter + Ukrainian (typewriter) - rstu - - Standard RSTU + winkeys + Ukrainian (WinKeys) - rstu_ru - - Standard RSTU on Russian layout - - - - - homophonic - Homophonic + legacy + Ukrainian (legacy) - crh - Crimean Tatar (Turkish Q) - crh + rstu + Ukrainian (standard RSTU) - crh_f - Crimean Tatar (Turkish F) - crh + rstu_ru + Russian (Ukraine, standard RSTU) - crh_alt - Crimean Tatar (Turkish Alt-Q) - crh + homophonic + Ukrainian (homophonic) @@ -4077,45 +4872,54 @@ gb - GBr - United Kingdom - eng + + en + English (UK) + + eng + extd - Extended - Winkeys + English (UK, extended WinKeys) intl - International (with dead keys) + English (UK, international with dead keys) dvorak - Dvorak + English (UK, Dvorak) dvorakukp - Dvorak (UK Punctuation) + English (UK, Dvorak with UK punctuation) mac - Macintosh + English (UK, Macintosh) + + + + + mac_intl + English (UK, Macintosh international) colemak - Colemak + English (UK, Colemak) @@ -4123,36 +4927,18 @@ uz - Uzb - Uzbekistan - uzb + + uz + Uzbek + + uzb + latin - Latin - - - - - crh - Crimean Tatar (Turkish Q) - crh - - - - - crh_f - Crimean Tatar (Turkish F) - crh - - - - - crh_alt - Crimean Tatar (Turkish Alt-Q) - crh + Uzbek (Latin) @@ -4160,71 +4946,91 @@ vn - Vnm - Vietnam - vie + + vi + Vietnamese + + vie + - + kr - Kor - Korea, Republic of - kor + + ko + Korean + + kor + - - - kr104 - 101/104 key Compatible - - + + + kr104 + Korean (101/104 key compatible) + + nec_vndr/jp - Jpn - Japan (PC-98xx Series) - JP - jpn + + ja + Japanese (PC-98xx Series) + + JP + + + jpn + ie - Irl - Ireland - eng + + ie + Irish + + eng + CloGaelach CloGaelach - gla + + gla + UnicodeExpert - UnicodeExpert + Irish (UnicodeExpert) ogam Ogham - - + + sga + + ogam_is434 - Ogham IS434 - + Ogham (IS434) + + sga + @@ -4232,30 +5038,45 @@ pk - Pak - Pakistan - urd + + ur + Urdu (Pakistan) + + urd + urd-crulp - CRULP - urd + Urdu (Pakistan, CRULP) urd-nla - NLA - urd + Urdu (Pakistan, NLA) ara - Arabic - ara + ar + Arabic (Pakistan) + + ara + + + + + + snd + + sd + Sindhi + + sd + @@ -4263,32 +5084,41 @@ mv - Mdv - Maldives - div + + dv + Dhivehi + + div + - + za - Zaf - South Africa - eng + + en + English (South Africa) + + eng + epo - Epo - Esperanto - epo + + eo + Esperanto + + epo + legacy - displaced semicolon and quote (obsolete) + Esperanto (displaced semicolon and quote, obsolete) @@ -4296,38 +5126,56 @@ np - Npl - Nepal - nep + + ne + Nepali + + nep + ng - Nga - Nigeria - eng + + en + English (Nigeria) + + eng + igbo + + ig Igbo - ibo + + ibo + yoruba + + yo Yoruba - yor + + yor + hausa + + ha Hausa - hau + + hau + @@ -4335,38 +5183,45 @@ et - Eth - Ethiopia - amh + + am + Amharic + + amh + sn - Sen - Senegal - wol + + wo + Wolof + + wol + brai - Brl + + brl Braille left_hand - Left hand + Braille (left hand) right_hand - Right hand + Braille (right hand) @@ -4374,15 +5229,18 @@ tm - Tkm - Turkmenistan - tuk + + tk + Turkmen + + tuk + alt - Alt-Q + Turkmen (Alt-Q) @@ -4390,27 +5248,39 @@ ml - Mli - Mali - bam + + bm + Bambara + + bam + fr-oss - Français (France Alternative) + + fr + French (Mali, alternative) + + fr + us-mac - English (USA Macintosh) + + en + English (Mali, US Macintosh) us-intl - English (USA International) + + en + English (Mali, US international) @@ -4418,18 +5288,173 @@ tz - Tza - Tanzania - swa + + sw + Swahili (Tanzania) + + swa + ke - Ken - Kenya - swa + + sw + Swahili (Kenya) + + swa + + + + + kik + + ki + Kikuyu + + kik + + + + + + + + bw + + tn + Tswana + + tsn + + + + + + ph + + ph + Filipino + eng + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + qwerty-bay + Filipino (QWERTY Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + capewell-dvorak + Filipino (Capewell-Dvorak Latin) + + + + + capewell-dvorak-bay + Filipino (Capewell-Dvorak Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + capewell-qwerf2k6 + Filipino (Capewell-QWERF 2006 Latin) + + + + + capewell-qwerf2k6-bay + Filipino (Capewell-QWERF 2006 Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + colemak + Filipino (Colemak Latin) + + + + + colemak-bay + Filipino (Colemak Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + dvorak + Filipino (Dvorak Latin) + + + + + dvorak-bay + Filipino (Dvorak Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + @@ -4472,7 +5497,7 @@ + + + eurosign - Adding EuroSign to certain keys + Adding currency signs to certain keys + @@ -5247,7 +6326,7 @@ - - - - - - - - - - + @@ -5449,6 +6469,12 @@ NICOLA-F style Backspace + diff --git a/linux/X/rules/evdev b/linux/X/rules/evdev index 307c2a5..64c2dd1 100644 --- a/linux/X/rules/evdev +++ b/linux/X/rules/evdev @@ -1,12 +1,9 @@ // DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part -// $Xorg: xfree86,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ - // // Rules for resolving XKB components for use with XFree86 // Copyright 1996 by Joseph Moss // // 2002 Modifier: Ivan Pascal The XFree86 Project -// $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.79 2004/01/09 00:16:01 dawes Exp $ // // If you want non-latin layouts implicitly include the en_US layout @@ -19,7 +16,7 @@ ! $pcmodels = pc101 pc102 pc104 pc105 // Microsoft models (using MS geometry) -! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose +! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose // Nokia devices and keyboards ! $nokiamodels = nokiasu8w nokiarx44 nokiarx51 @@ -60,15 +57,15 @@ genius geniuscomfy2 \ gyration honeywell_euroboard \ hp250x hp5xx hp500fa hpdv5 \ - hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \ + hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \ ibm_spacesaver ipaq inspiron intel \ logiaccess logicda logicink \ logiex110 logiclx300 \ logiinkse logiinkseusb logiitc logiik \ logitech_base itouch logiultrax \ logitech_g15 \ - logidinovo logidinovoedge \ - microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ + logidinovo logidinovoedge \ + microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ microsoftoffice microsoftmult \ mx1998 mx2500 mx2750 \ oretec \ @@ -80,7 +77,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - tm2030USB toshiba_s3000 trust trustda \ + toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -114,6 +111,7 @@ lt lv nl no pl pt ro ru \ se sk tr tw ua +! $htcdreamlayouts = us it de ! $dvoraklayouts = br ca de ee es fr gb no pl se us @@ -148,6 +146,7 @@ hpmini110 = hp(mini110) hpdv5 = hp(dv5) omnikey101 = northgate(omnikey101) + sanwaskbkg3 = sanwa(sanwaskbkg3) $pcmodels = pc(%m) $pcgeometries = pc(%m) everex = everex(STEPnote) @@ -181,7 +180,6 @@ * gur basic = pc+in(guru) * ie laptop = pc+ie(basic) * ie CloGaelachLaptop = pc+ie(CloGaelach) - * il si1452 = pc+ie(basic) * in urd = pc+in(urd-phonetic) * iu basic = pc+ca(ike) * lo basic = pc+la(basic) @@ -216,10 +214,6 @@ * yu unicode = pc+srp(latinunicode) * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) - * rs combiningkeys = pc+extras/rs(combiningkeys) - * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) - * us crd = pc+extras/us(crd) - * us intl-unicode = pc+extras/us(intl-unicode) classmate us intl = pc+us(classmate-intl) classmate us alt-intl = pc+us(classmate-alt-intl) classmate us altgr-intl = pc+us(classmate-altgr-intl) @@ -268,7 +262,6 @@ * gur(basic) = pc+in(guru) * ie(laptop) = pc+ie(basic) * ie(CloGaelachLaptop) = pc+ie(CloGaelach) - * il(si1452) = pc+ie(basic) * in(urd) = pc+in(urd-phonetic) * iu(basic) = pc+ca(ike) * lo(basic) = pc+la(basic) @@ -303,11 +296,6 @@ * yu(unicode) = pc+srp(latinunicode) * yu(yz) = pc+srp(latinyz) * yu(unicodeyz) = pc+srp(latinunicodeyz) - * apl = pc+extras/apl - * rs(combiningkeys) = pc+extras/rs(combiningkeys) - * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) - * us(crd) = pc+extras/us(crd) - * us(intl-unicode) = pc+extras/us(intl-unicode) ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2 ataritt * = xfree68_vndr/ataritt(us)+%l%(v) amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 @@ -346,6 +334,7 @@ olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) + htcdream $htcdreamlayouts = %l(htcdream) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) @@ -392,7 +381,6 @@ * gur(basic) = pc+in(guru) * ie(laptop) = pc+ie(basic) * ie(CloGaelachLaptop) = pc+ie(CloGaelach) - * il(si1452) = pc+ie(basic) * in(urd) = pc+in(urd-phonetic) * iu(basic) = pc+ca(ike) * lo(basic) = pc+la(basic) @@ -427,11 +415,6 @@ * yu(unicode) = pc+srp(latinunicode) * yu(yz) = pc+srp(latinyz) * yu(unicodeyz) = pc+srp(latinunicodeyz) - * apl = pc+extras/apl%(v[1]) - * rs(combiningkeys) = pc+extras/rs(combiningkeys) - * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) - * us(crd) = pc+extras/us(crd) - * us(intl-unicode) = pc+extras/us(intl-unicode) ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1]) @@ -464,7 +447,6 @@ * gur basic = pc+in(guru) * ie laptop = pc+ie(basic) * ie CloGaelachLaptop = pc+ie(CloGaelach) - * il si1452 = pc+ie(basic) * in urd = pc+in(urd-phonetic) * iu basic = pc+ca(ike) * lo basic = pc+la(basic) @@ -499,10 +481,6 @@ * yu unicode = pc+srp(latinunicode) * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) - * rs combiningkeys = pc+extras/rs(combiningkeys) - * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) - * us crd = pc+extras/us(crd) - * us intl-unicode = pc+extras/us(intl-unicode) ! model layout[2] = symbols * ar = +ara%(v[2]):2 @@ -547,7 +525,6 @@ * gur(basic) = +in(guru):2 * ie(laptop) = +ie(basic):2 * ie(CloGaelachLaptop) = +ie(CloGaelach):2 - * il(si1452) = +ie(basic):2 * in(urd) = +in(urd-phonetic):2 * iu(basic) = +ca(ike):2 * lo(basic) = +la(basic):2 @@ -582,11 +559,6 @@ * yu(unicode) = +srp(latinunicode):2 * yu(yz) = +srp(latinyz):2 * yu(unicodeyz) = +srp(latinunicodeyz):2 - * apl = +extras/apl%(v[2]):2 - * rs(combiningkeys) = +extras/rs(combiningkeys):2 - * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 - * us(crd) = +extras/us(crd):2 - * us(intl-unicode) = +extras/us(intl-unicode):2 nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2 nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2 * * = +%l[2]%(v[2]):2 @@ -634,7 +606,6 @@ * gur(basic) = +in(guru):3 * ie(laptop) = +ie(basic):3 * ie(CloGaelachLaptop) = +ie(CloGaelach):3 - * il(si1452) = +ie(basic):3 * in(urd) = +in(urd-phonetic):3 * iu(basic) = +ca(ike):3 * lo(basic) = +la(basic):3 @@ -669,11 +640,6 @@ * yu(unicode) = +srp(latinunicode):3 * yu(yz) = +srp(latinyz):3 * yu(unicodeyz) = +srp(latinunicodeyz):3 - * apl = +extras/apl%(v[3]):3 - * rs(combiningkeys) = +extras/rs(combiningkeys):3 - * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 - * us(crd) = +extras/us(crd):3 - * us(intl-unicode) = +extras/us(intl-unicode):3 nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3 nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3 * * = +%l[3]%(v[3]):3 @@ -721,7 +687,6 @@ * gur(basic) = +in(guru):4 * ie(laptop) = +ie(basic):4 * ie(CloGaelachLaptop) = +ie(CloGaelach):4 - * il(si1452) = +ie(basic):4 * in(urd) = +in(urd-phonetic):4 * iu(basic) = +ca(ike):4 * lo(basic) = +la(basic):4 @@ -756,11 +721,6 @@ * yu(unicode) = +srp(latinunicode):4 * yu(yz) = +srp(latinyz):4 * yu(unicodeyz) = +srp(latinunicodeyz):4 - * apl = +extras/apl%(v[4]):4 - * rs(combiningkeys) = +extras/rs(combiningkeys):4 - * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 - * us(crd) = +extras/us(crd):4 - * us(intl-unicode) = +extras/us(intl-unicode):4 nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4 nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4 * * = +%l[4]%(v[4]):4 @@ -781,7 +741,6 @@ * gur basic = +in(guru):2 * ie laptop = +ie(basic):2 * ie CloGaelachLaptop = +ie(CloGaelach):2 - * il si1452 = +ie(basic):2 * in urd = +in(urd-phonetic):2 * iu basic = +ca(ike):2 * lo basic = +la(basic):2 @@ -816,10 +775,6 @@ * yu unicode = +srp(latinunicode):2 * yu yz = +srp(latinyz):2 * yu unicodeyz = +srp(latinunicodeyz):2 - * rs combiningkeys = +extras/rs(combiningkeys):2 - * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 - * us crd = +extras/us(crd):2 - * us intl-unicode = +extras/us(intl-unicode):2 ! model layout[3] variant[3] = symbols * ben basic = +in(ben):3 @@ -837,7 +792,6 @@ * gur basic = +in(guru):3 * ie laptop = +ie(basic):3 * ie CloGaelachLaptop = +ie(CloGaelach):3 - * il si1452 = +ie(basic):3 * in urd = +in(urd-phonetic):3 * iu basic = +ca(ike):3 * lo basic = +la(basic):3 @@ -872,10 +826,6 @@ * yu unicode = +srp(latinunicode):3 * yu yz = +srp(latinyz):3 * yu unicodeyz = +srp(latinunicodeyz):3 - * rs combiningkeys = +extras/rs(combiningkeys):3 - * us alt-intl-unicode = +extras/us(alt-intl-unicode):3 - * us crd = +extras/us(crd):3 - * us intl-unicode = +extras/us(intl-unicode):3 ! model layout[4] variant[4] = symbols * ben basic = +in(ben):4 @@ -893,7 +843,6 @@ * gur basic = +in(guru):4 * ie laptop = +ie(basic):4 * ie CloGaelachLaptop = +ie(CloGaelach):4 - * il si1452 = +ie(basic):4 * in urd = +in(urd-phonetic):4 * iu basic = +ca(ike):4 * lo basic = +la(basic):4 @@ -928,10 +877,6 @@ * yu unicode = +srp(latinunicode):4 * yu yz = +srp(latinyz):4 * yu unicodeyz = +srp(latinunicodeyz):4 - * rs combiningkeys = +extras/rs(combiningkeys):4 - * us alt-intl-unicode = +extras/us(alt-intl-unicode):4 - * us crd = +extras/us(crd):4 - * us intl-unicode = +extras/us(intl-unicode):4 ! model = symbols $evdevkbds = +inet(evdev)+inet(%m) @@ -1008,17 +953,12 @@ grp:shifts_toggle = +group(shifts_toggle) grp:ctrls_toggle = +group(ctrls_toggle) grp:alts_toggle = +group(alts_toggle) - grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) - grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle) - grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) grp:caps_toggle = +capslock(grouplock) grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) grp:shift_caps_switch = +group(shift_caps_switch) grp:win_menu_switch = +group(win_menu_switch) grp:alt_caps_toggle = +group(alt_caps_toggle) - grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) - grp:alt_shift_toggle = +group(alt_shift_toggle) grp:alt_space_toggle = +group(alt_space_toggle) grp:menu_toggle = +group(menu_toggle) grp:lwin_toggle = +group(lwin_toggle) @@ -1031,6 +971,19 @@ grp:lalt_toggle = +group(lalt_toggle) grp:sclk_toggle = +group(sclk_toggle) grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch) + grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu) + grp:lctrl_lalt_toggle = +group(lctrl_lalt_toggle) + grp:rctrl_ralt_toggle = +group(rctrl_ralt_toggle) + grp:ctrl_alt_toggle = +group(ctrl_alt_toggle) + grp:ctrl_alt_toggle_bidir = +group(ctrl_alt_toggle_bidir) + grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle) + grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle) + grp:ctrl_shift_toggle = +group(ctrl_shift_toggle) + grp:ctrl_shift_toggle_bidir = +group(ctrl_shift_toggle_bidir) + grp:lalt_lshift_toggle = +group(lalt_lshift_toggle) + grp:ralt_rshift_toggle = +group(ralt_rshift_toggle) + grp:alt_shift_toggle = +group(alt_shift_toggle) + grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir) lv3:switch = +level3(switch) lv3:ralt_switch = +level3(ralt_switch) lv3:ralt_switch_multikey = +level3(ralt_switch_multikey) @@ -1051,11 +1004,15 @@ caps:super = +capslock(super) caps:hyper = +capslock(hyper) caps:none = +capslock(none) + caps:ctrl_modifier = +capslock(ctrl_modifier) ctrl:nocaps = +ctrl(nocaps) + ctrl:lctrl_meta = +ctrl(lctrl_meta) ctrl:swapcaps = +ctrl(swapcaps) - ctrl:ctrl_ac = +ctrl(ctrl_ac) - ctrl:ctrl_aa = +ctrl(ctrl_aa) - ctrl:ctrl_ra = +ctrl(ctrl_ra) + ctrl:ac_ctrl = +ctrl(ac_ctrl) + ctrl:aa_ctrl = +ctrl(aa_ctrl) + ctrl:rctrl_ralt = +ctrl(rctrl_ralt) + ctrl:menu_rctrl = +ctrl(menu_rctrl) + ctrl:ralt_rctrl = +ctrl(ralt_rctrl) compose:ralt = +compose(ralt) compose:lwin = +compose(lwin) compose:rwin = +compose(rwin) @@ -1072,6 +1029,7 @@ eurosign:2 = +eurosign(2) eurosign:4 = +eurosign(4) eurosign:5 = +eurosign(5) + rupeesign:4 = +rupeesign(4) keypad:oss = +keypad(oss) keypad:legacy = +keypad(legacy) keypad:legacy_wang = +keypad(legacy_wang) @@ -1089,6 +1047,7 @@ nbsp:level4n = +nbsp(level4n) nbsp:level4nl = +nbsp(level4nl) japan:nicola_f_bs = +jp(nicola_f_bs) + japan:hztg_escape = +jp(hztg_escape) kpdl:dot = +kpdl(dot) kpdl:comma = +kpdl(comma) kpdl:dotoss = +kpdl(dotoss) @@ -1101,6 +1060,7 @@ esperanto:qwerty = +epo(qwerty) esperanto:dvorak = +epo(dvorak) terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) + keypad:pointerkeys = +keypad(pointerkeys) apple:alupckeys = +macintosh_vndr/apple(alupckeys) shift:both_capslock = +shift(both_capslock) shift:lshift_both_capslock = +shift(lshift_both_capslock) @@ -1132,9 +1092,9 @@ grp_led:num = +lednum(group_lock) grp_led:caps = +ledcaps(group_lock) grp_led:scroll = +ledscroll(group_lock) - grp:caps_toggle = +ledcaps(group_lock) japan:kana_lock = +japan(kana_lock) caps:shiftlock = +ledcaps(shift_lock) + grab:break_actions = +xfree86(grab_break) ! option = types diff --git a/linux/X/rules/evdev.xml b/linux/X/rules/evdev.xml index 952a457..4b97074 100644 --- a/linux/X/rules/evdev.xml +++ b/linux/X/rules/evdev.xml @@ -1,6 +1,6 @@ - + @@ -194,14 +194,14 @@ btc9019u - BTC 9019U + BTC 9019U BTC btc9116u - BTC 9116U Mini Wireless Internet and Gaming + BTC 9116U Mini Wireless Internet and Gaming @@ -447,6 +447,20 @@ Gyration + + + htcdream + HTC Dream + HTC + + + + + kinesis + Kinesis + Kinesis + + logitech_base @@ -556,42 +570,42 @@ rapidaccess IBM Rapid Access - IBM + Lenovo (previously IBM) rapidaccess2 IBM Rapid Access II - IBM + Lenovo (previously IBM) thinkpad IBM ThinkPad 560Z/600/600E/A22E - IBM + Lenovo (previously IBM) thinkpad60 IBM ThinkPad R60/T60/R61/T61 - IBM + Lenovo (previously IBM) thinkpadz60 IBM ThinkPad Z60m/Z60t/Z61m/Z61t - IBM + Lenovo (previously IBM) ibm_spacesaver IBM Space Saver - IBM + Lenovo (previously IBM) @@ -613,6 +627,7 @@ logii350 Logitech Internet 350 Keyboard Logitech + 046d:c313 @@ -776,6 +791,13 @@ Memorex + + + microsoft4000 + Microsoft Natural Wireless Ergonomic Keyboard 4000 + Microsoft Inc. + + microsoft7000 @@ -888,88 +910,95 @@ Samsung + + + sanwaskbkg3 + Sanwa Supply SKB-KG3 + Sanwa Supply Inc. + + sk1300 SK-1300 - NEC + NEC sk2500 SK-2500 - NEC + NEC sk6200 SK-6200 - NEC + NEC sk7100 SK-7100 - NEC + NEC sp_inet Super Power Multimedia Keyboard - Generic + Generic sven SVEN Ergonomic 2500 - SVEN + SVEN sven303 SVEN Slim 303 - SVEN + SVEN symplon Symplon PaceBook (tablet PC) - Symplon + Symplon toshiba_s3000 Toshiba Satellite S3000 - Toshiba + Toshiba trust Trust Wireless Keyboard Classic - Trust + Trust trustda Trust Direct Access Keyboard - Trust + Trust trust_slimline Trust Slimline - Trust + Trust @@ -1011,161 +1040,161 @@ yahoo Yahoo! Internet Keyboard - Yahoo! + Yahoo! macbook78 MacBook/MacBook Pro - Apple + Apple macbook79 MacBook/MacBook Pro (Intl) - Apple + Apple macintosh Macintosh - Apple + Apple macintosh_old Macintosh Old - Apple + Apple macintosh_hhk Happy Hacking Keyboard for Mac - Fujitsu + Fujitsu acer_c300 Acer C300 - Acer + Acer acer_ferrari4k Acer Ferrari 4000 - Acer + Acer acer_laptop Acer Laptop - Acer + Acer asus_laptop Asus Laptop - Asus + Asus apple Apple - Apple + Apple apple_laptop Apple Laptop - Apple + Apple applealu_ansi Apple Aluminium Keyboard (ANSI) - Apple + Apple applealu_iso Apple Aluminium Keyboard (ISO) - Apple + Apple applealu_jis Apple Aluminium Keyboard (JIS) - Apple + Apple silvercrest SILVERCREST Multimedia Wireless Keyboard - Silvercrest + Silvercrest emachines Laptop/notebook eMachines m68xx - eMachines + eMachines - benqx - BenQ X-Touch - BenQ + benqx + BenQ X-Touch + BenQ - benqx730 - BenQ X-Touch 730 - BenQ + benqx730 + BenQ X-Touch 730 + BenQ - benqx800 - BenQ X-Touch 800 - BenQ + benqx800 + BenQ X-Touch 800 + BenQ - hhk - Happy Hacking Keyboard - Fujitsu + hhk + Happy Hacking Keyboard + Fujitsu - classmate - Classmate PC - Intel + classmate + Classmate PC + Intel - olpc - OLPC - OLPC + olpc + OLPC + OLPC @@ -1203,106 +1232,124 @@ Creative + + + htcdream + Htc Dream phone + htc + + us - USA - USA - eng + + en + English (US) + + eng + chr + + chr Cherokee - chr + + chr + euro - With EuroSign on 5 + English (US, with euro on 5) intl - International (with dead keys) + English (US, international with dead keys) alt-intl - Alternative international + English (US, alternative international) - + colemak - Colemak + English (Colemak) dvorak - Dvorak + English (Dvorak) dvorak-intl - Dvorak international (with dead keys) + English (Dvorak international with dead keys) dvorak-alt-intl - Dvorak alternative international (no dead keys) + English (Dvorak alternative international no dead keys) dvorak-l - Left handed Dvorak + English (left handed Dvorak) dvorak-r - Right handed Dvorak + English (right handed Dvorak) dvorak-classic - Classic Dvorak + English (classic Dvorak) dvp - Programmer Dvorak + English (programmer Dvorak) rus - Russian phonetic - rus + + ru + Russian (US, phonetic) + + rus + mac - Macintosh + English (Macintosh) altgr-intl - International (AltGr dead keys) + English (international AltGr dead keys) eng fra ger @@ -1311,14 +1358,17 @@ olpc2 - Group toggle on multiply/divide key + English (layout toggle on multiply/divide key) - srp - Serbian + hbs + Serbo-Croatian (US) eng + bos + hbs + hrv srp @@ -1327,52 +1377,73 @@ ad - And - Andorra - cat + + ca + Catalan + + cat + af - Afg - Afghanistan + + fa + Afghani ps + + ps Pashto - pus + + pus + uz - Southern Uzbek - uzb + + uz + Uzbek (Afghanistan) + + uzb + olpc-ps - OLPC Pashto - pus + + ps + Pashto (Afghanistan, OLPC) + + pus + - olpc-fa - OLPC Dari + fa-olpc + fa + Persian (Afghanistan, Dari OLPC) - olpc-uz - OLPC Southern Uzbek - uzb + uz-olpc + + uz + Uzbek (Afghanistan, OLPC) + + uzb + @@ -1380,7 +1451,8 @@ ara - Ara + + ar Arabic AE @@ -1403,43 +1475,45 @@ TN YE - ara + + ara + azerty - azerty + Arabic (azerty) azerty_digits - azerty/digits + Arabic (azerty/digits) digits - digits + Arabic (digits) qwerty - qwerty + Arabic (qwerty) qwerty_digits - qwerty/digits + Arabic (qwerty/digits) buckwalter - Buckwalter + Arabic (Buckwalter) @@ -1447,48 +1521,85 @@ al - Alb - Albania - alb + + sq + Albanian + + alb + am - Arm - Armenia - hye + + hy + Armenian + + hye + phonetic - Phonetic + Armenian (phonetic) phonetic-alt - Alternative Phonetic + Armenian (alternative phonetic) eastern - Eastern + Armenian (eastern) western - Western + Armenian (western) eastern-alt - Alternative Eastern + Armenian (alternative eastern) + + + + + + + at + + de + German (Austria) + + ger + + + + + + nodeadkeys + German (Austria, eliminate dead keys) + + + + + sundeadkeys + German (Austria, Sun dead keys) + + + + + mac + German (Austria, Macintosh) @@ -1496,15 +1607,18 @@ az - Aze - Azerbaijan - aze + + az + Azerbaijani + + aze + cyrillic - Cyrillic + Azerbaijani (Cyrillic) @@ -1512,21 +1626,24 @@ by - Blr - Belarus - bel + + by + Belarusian + + bel + legacy - Legacy + Belarusian (legacy) latin - Latin + Belarusian (Latin) @@ -1534,52 +1651,54 @@ be - Bel - Belgium + + be + Belgian ger + nld fra oss - Alternative + Belgian (alternative) oss_latin9 - Alternative, latin-9 only + Belgian (alternative, latin-9 only) oss_sundeadkeys - Alternative, Sun dead keys + Belgian (alternative, Sun dead keys) iso-alternate - ISO Alternate + Belgian (ISO alternate) nodeadkeys - Eliminate dead keys + Belgian (eliminate dead keys) sundeadkeys - Sun dead keys + Belgian (Sun dead keys) wang - Wang model 724 azerty + Belgian (Wang model 724 azerty) @@ -1587,15 +1706,18 @@ bd - Bgd - Bangladesh - ben + + bn + Bengali + + ben + probhat - Probhat + Bengali (Probhat) @@ -1603,148 +1725,277 @@ in - Ind - India + + in + Indian ben - Bengali - ben + + bn + Bengali (India) + + ben + ben_probhat - Bengali Probhat + + bn + Bengali (India, Probhat) + + ben + + + + + + ben_baishakhi + Bengali (India, Baishakhi) + ben + + + + + ben_bornona + Bengali (India, Bornona) + ben + + + + + ben_gitanjali + Bengali (India, Uni Gitanjali) + ben + + + + + ben_inscript + Bengali (India, Baishakhi Inscript) ben guj + + gu Gujarati - guj + + guj + guru - Gurmukhi - pan + + pa + Punjabi (Gurmukhi) + + pan + jhelum - Gurmukhi Jhelum - pan + + pa + Punjabi (Gurmukhi Jhelum) + + pan + kan + + kn Kannada - kan + + kan + mal + + ml Malayalam - mal - + + mal + + - + mal_lalitha - Malayalam Lalitha - mal - + + ml + Malayalam (Lalitha) + + mal + + + mal_enhanced + + ml + Malayalam (enhanced Inscript with Rupee Sign) + mal + + + + ori + + or Oriya - ori + + ori + tam_unicode - Tamil Unicode - tam + + ta + Tamil (Unicode) + + tam + tam_keyboard_with_numerals - Tamil Keyboard with Numerals - tam + + ta + Tamil (keyboard with numerals) + + tam + tam_TAB - Tamil TAB Typewriter - tam + + ta + Tamil (TAB typewriter) + + tam + tam_TSCII - Tamil TSCII Typewriter - tam + + ta + Tamil (TSCII typewriter) + + tam + tam + + ta Tamil - tam + + tam + tel + + te Telugu - tel + + tel + urd-phonetic - Urdu, Phonetic - urd + + ur + Urdu (phonetic) + + urd + urd-phonetic3 - Urdu, Alternative phonetic - urd + + ur + Urdu (alternative phonetic) + + urd + urd-winkeys - Urdu, Winkeys - urd + + ur + Urdu (WinKeys) + + urd + bolnagri - Hindi Bolnagri - hin + + hi + Hindi (Bolnagri) + + hin + hin-wx - Hindi Wx - hin + + hi + Hindi (Wx) + + hin + + + + + + eng + + en + English (India, with RupeeSign) + + eng + @@ -1752,33 +2003,36 @@ ba - Bih - Bosnia and Herzegovina - bos + + bs + Bosnian + + bos + alternatequotes - Use guillemets for quotes + Bosnian (use guillemets for quotes) unicode - Use Bosnian digraphs + Bosnian (use Bosnian digraphs) unicodeus - US keyboard with Bosnian digraphs + Bosnian (US keyboard with Bosnian digraphs) us - US keyboard with Bosnian letters + Bosnian (US keyboard with Bosnian letters) @@ -1786,40 +2040,45 @@ br - Bra - Brazil - por + + pt + Portuguese (Brazil) + + por + nodeadkeys - Eliminate dead keys + Portuguese (Brazil, eliminate dead keys) dvorak - Dvorak + Portuguese (Brazil, Dvorak) nativo - Nativo + Portuguese (Brazil, nativo) nativo-us - Nativo for USA keyboards + Portuguese (Brazil, nativo for USA keyboards) nativo-epo - Nativo for Esperanto - epo + Portuguese (Brazil, nativo for Esperanto) + + epo + @@ -1827,23 +2086,24 @@ bg - Bgr - Bulgaria - bul + + bg + Bulgarian + + bul + phonetic - Traditional phonetic + Bulgarian (traditional phonetic) - - bas_phonetic - New phonetic + Bulgarian (new phonetic) @@ -1851,56 +2111,184 @@ ma - Morocco + + ar + Arabic (Morocco) french - French - fra + + fr + French (Morocco) + + fra + tifinagh - Tifinagh - ber + + ber + Berber (Morocco, Tifinagh) + + ber + tifinagh-alt - Tifinagh Alternative - ber + + ber + Berber (Morocco, Tifinagh alternative) + + ber + tifinagh-alt-phonetic - Tifinagh Alternative Phonetic - ber + + ber + Berber (Morocco, Tifinagh alternative phonetic) + + ber + tifinagh-extended - Tifinagh Extended - ber + + ber + Berber (Morocco, Tifinagh extended) + + ber + tifinagh-phonetic - Tifinagh Phonetic - ber + + ber + Berber (Morocco, Tifinagh phonetic) + + ber + tifinagh-extended-phonetic - Tifinagh Extended Phonetic - ber + + ber + Berber (Morocco, Tifinagh extended phonetic) + + ber + + + + + + + + cm + + cm + English (Cameroon) + eng + + + + + french + French (Cameroon) + fra + + + + + qwerty + Cameroon Multilingual (qwerty) + + eng + bas + nmg + fub + ewo + xmd + mfh + bkm + ozm + lns + sox + pny + wes + lem + nyj + mfk + mcp + ass + xed + dua + anv + bum + btb + bfd + azo + ken + yam + yat + yas + + + + + + azerty + Cameroon Multilingual (azerty) + + fra + bas + nmg + fub + ewo + xmd + mfh + bkm + ozm + lns + sox + pny + wes + lem + nyj + mfk + mcp + ass + xed + dua + anv + bum + btb + bfd + azo + ken + yam + yat + yas + + + + + + dvorak + Cameroon Multilingual (Dvorak) @@ -1908,75 +2296,80 @@ mm - Mmr - Myanmar - mya + + my + Burmese + + mya + ca - Can - Canada - fra + + fr + French (Canada) + + fra + fr-dvorak - French Dvorak + + fr + French (Canada, Dvorak) fr-legacy - French (legacy) + + fr + French (Canada, legacy) multix - Multilingual + Canadian Multilingual multi - Multilingual, first part + Canadian Multilingual (first part) multi-2gr - Multilingual, second part + Canadian Multilingual (second part) ike - Inuktitut - iku - - - - - shs - Secwepemctsin - - - - - kut - Ktunaxa + ike + Inuktitut + + iku + eng - English - eng + + en + English (Canada) + + eng + @@ -1984,32 +2377,51 @@ cd - COD - Congo, Democratic Republic of the - fra + + fr + French (Democratic Republic of the Congo) + + fra + cn - Chn - China - chi + + zh + Chinese + + chi + tib Tibetan - tib + + tib + tib_asciinum Tibetan (with ASCII numerals) - tib + + tib + + + + + + uig + Uyghur + + uig + @@ -2017,33 +2429,36 @@ hr - Hrv - Croatia - scr + + hr + Croatian + + scr + alternatequotes - Use guillemets for quotes + Croatian (use guillemets for quotes) unicode - Use Croatian digraphs + Croatian (use Croatian digraphs) unicodeus - US keyboard with Croatian digraphs + Croatian (US keyboard with Croatian digraphs) us - US keyboard with Croatian letters + Croatian (US keyboard with Croatian letters) @@ -2051,73 +2466,79 @@ cz - Cze - Czechia - cze + + cs + Czech + + cze + bksl - With <\|> key + Czech (with <\|> key) qwerty - qwerty + Czech (qwerty) qwerty_bksl - qwerty, extended Backslash - - - - - ucw - UCW layout (accented letters only) - - - - - dvorak-ucw - US Dvorak with CZ UCW support - - + Czech (qwerty, extended Backslash) + + + + + ucw + Czech (UCW layout, accented letters only) + + + + + dvorak-ucw + Czech (US Dvorak with CZ UCW support) + + dk - Dnk - Denmark - dan + + da + Danish + + dan + nodeadkeys - Eliminate dead keys + Danish (eliminate dead keys) mac - Macintosh + Danish (Macintosh) mac_nodeadkeys - Macintosh, eliminate dead keys + Danish (Macintosh, eliminate dead keys) dvorak - Dvorak + Danish (Dvorak) @@ -2125,27 +2546,30 @@ nl - Nld - Netherlands - nld + + nl + Dutch + + nld + sundeadkeys - Sun dead keys + Dutch (Sun dead keys) mac - Macintosh + Dutch (Macintosh) std - Standard + Dutch (standard) @@ -2153,35 +2577,41 @@ bt - Btn - Bhutan - dzo + + dz + Dzongkha + + dzo + ee - Est - Estonia - est + + et + Estonian + + est + nodeadkeys - Eliminate dead keys + Estonian (eliminate dead keys) dvorak - Dvorak + Estonian (Dvorak) us - US keyboard with Estonian letters + Estonian (US keyboard with Estonian letters) @@ -2189,43 +2619,62 @@ ir - Irn - Iran - per + + fa + Persian + + per + pes_keypad - Persian, with Persian Keypad + Persian (with Persian Keypad) ku - Kurdish, Latin Q - kur + + ku + Kurdish (Iran, Latin Q) + + kur + ku_f - Kurdish, (F) - kur + + ku + Kurdish (Iran, F) + + kur + ku_alt - Kurdish, Latin Alt-Q - kur + + ku + Kurdish (Iran, Latin Alt-Q) + + kur + ku_ara - Kurdish, Arabic-Latin - kur + + ku + Kurdish (Iran, Arabic-Latin) + + kur + @@ -2233,8 +2682,9 @@ iq - Irq - Iraq + + ar + Iraqi ara kur @@ -2242,29 +2692,45 @@ ku - Kurdish, Latin Q - kur + + ku + Kurdish (Iraq, Latin Q) + + kur + ku_f - Kurdish, (F) - kur + + ku + Kurdish (Iraq, F) + + kur + ku_alt - Kurdish, Latin Alt-Q - kur + + ku + Kurdish (Iraq, Latin Alt-Q) + + kur + ku_ara - Kurdish, Arabic-Latin - kur + + ku + Kurdish (Iraq, Arabic-Latin) + + kur + @@ -2272,15 +2738,18 @@ fo - Fro - Faroe Islands - fao + + fo + Faroese + + fao + nodeadkeys - Eliminate dead keys + Faroese (eliminate dead keys) @@ -2288,35 +2757,37 @@ fi - Fin - Finland - fin + + fi + Finnish + + fin + - nodeadkeys - Eliminate dead keys + classic + Finnish (classic) - smi - Northern Saami - smi - sme + nodeadkeys + Finnish (classic, eliminate dead keys) - classic - Classic + smi + Northern Saami (Finland) + sme mac - Macintosh + Finnish (Macintosh) @@ -2324,107 +2795,114 @@ fr - Fra - France - fra + + fr + French + + fra + nodeadkeys - Eliminate dead keys + French (eliminate dead keys) sundeadkeys - Sun dead keys + French (Sun dead keys) oss - Alternative + French (alternative) oss_latin9 - Alternative, latin-9 only + French (alternative, latin-9 only) oss_nodeadkeys - Alternative, eliminate dead keys + French (alternative, eliminate dead keys) oss_sundeadkeys - Alternative, Sun dead keys + French (alternative, Sun dead keys) latin9 - (Legacy) Alternative + French (legacy, alternative) latin9_nodeadkeys - (Legacy) Alternative, eliminate dead keys + French (legacy, alternative, eliminate dead keys) latin9_sundeadkeys - (Legacy) Alternative, Sun dead keys + French (legacy, alternative, Sun dead keys) bepo - Bepo, ergonomic, Dvorak way + French (Bepo, ergonomic, Dvorak way) bepo_latin9 - Bepo, ergonomic, Dvorak way, latin-9 only + French (Bepo, ergonomic, Dvorak way, latin-9 only) dvorak - Dvorak + French (Dvorak) mac - Macintosh + French (Macintosh) bre - Breton + French (Breton) oci Occitan - oci + + oci + geo - Georgian AZERTY Tskapo - geo + Georgian (France, AZERTY Tskapo) + + geo + @@ -2432,63 +2910,90 @@ gh - Gha - Ghana - eng + + en + English (Ghana) + + eng + generic - Multilingual + English (Ghana, multilingual) akan + + ak Akan - aka + + aka + ewe + + ee Ewe - ewe + + ewe + fula + + ff Fula - ful + + ful + ga + + gaa Ga - gaa + + gaa + hausa + + ha Hausa - hau + + hau + avn + + avn Avatime - avn + + avn + gillbt - GILLBT + English (Ghana, GILLBT) @@ -2496,44 +3001,56 @@ gn - Gin - Guinea - fra + + fr + French (Guinea) + + fra + ge - Geo - Georgia - geo + + ka + Georgian + + geo + ergonomic - Ergonomic + Georgian (ergonomic) mess - MESS + Georgian (MESS) ru - Russian - rus + + ru + Russian (Georgia) + + rus + os - Ossetian - oss + Ossetian (Georgia) + + oss + @@ -2541,89 +3058,101 @@ de - Deu - Germany - ger + + de + German + + ger + deadacute - Dead acute + German (dead acute) deadgraveacute - Dead grave acute + German (dead grave acute) nodeadkeys - Eliminate dead keys + German (eliminate dead keys) ro - Romanian keyboard with German letters + Romanian (Germany) + rum ro_nodeadkeys - Romanian keyboard with German letters, eliminate dead keys + Romanian (Germany, eliminate dead keys) + rum dvorak - Dvorak + German (Dvorak) sundeadkeys - Sun dead keys + German (Sun dead keys) neo - Neo 2 + German (Neo 2) mac - Macintosh + German (Macintosh) mac_nodeadkeys - Macintosh, eliminate dead keys + German (Macintosh, eliminate dead keys) dsb Lower Sorbian - dsb + + dsb + dsb_qwertz Lower Sorbian (qwertz) - dsb + + dsb + - qwerty - qwerty + ru + Russian (Germany, phonetic) + + rus + @@ -2631,33 +3160,36 @@ gr - Grc - Greece - gre + + gr + Greek + + gre + simple - Simple + Greek (simple) extended - Extended + Greek (extended) nodeadkeys - Eliminate dead keys + Greek (eliminate dead keys) polytonic - Polytonic + Greek (polytonic) @@ -2665,128 +3197,126 @@ hu - Hun - Hungary - hun + + hu + Hungarian + + hun + standard - Standard + Hungarian (standard) nodeadkeys - Eliminate dead keys + Hungarian (eliminate dead keys) qwerty - qwerty + Hungarian (qwerty) - - 101_qwertz_comma_dead - 101/qwertz/comma/Dead keys + Hungarian (101/qwertz/comma/dead keys) 101_qwertz_comma_nodead - 101/qwertz/comma/Eliminate dead keys + Hungarian (101/qwertz/comma/eliminate dead keys) 101_qwertz_dot_dead - 101/qwertz/dot/Dead keys + Hungarian (101/qwertz/dot/dead keys) 101_qwertz_dot_nodead - 101/qwertz/dot/Eliminate dead keys + Hungarian (101/qwertz/dot/eliminate dead keys) 101_qwerty_comma_dead - 101/qwerty/comma/Dead keys + Hungarian (101/qwerty/comma/dead keys) 101_qwerty_comma_nodead - 101/qwerty/comma/Eliminate dead keys + Hungarian (101/qwerty/comma/eliminate dead keys) 101_qwerty_dot_dead - 101/qwerty/dot/Dead keys + Hungarian (101/qwerty/dot/dead keys) 101_qwerty_dot_nodead - 101/qwerty/dot/Eliminate dead keys + Hungarian (101/qwerty/dot/eliminate dead keys) - - - 102_qwertz_comma_dead - 102/qwertz/comma/Dead keys + Hungarian (102/qwertz/comma/dead keys) 102_qwertz_comma_nodead - 102/qwertz/comma/Eliminate dead keys + Hungarian (102/qwertz/comma/eliminate dead keys) 102_qwertz_dot_dead - 102/qwertz/dot/Dead keys + Hungarian (102/qwertz/dot/dead keys) 102_qwertz_dot_nodead - 102/qwertz/dot/Eliminate dead keys + Hungarian (102/qwertz/dot/eliminate dead keys) 102_qwerty_comma_dead - 102/qwerty/comma/Dead keys + Hungarian (102/qwerty/comma/dead keys) 102_qwerty_comma_nodead - 102/qwerty/comma/Eliminate dead keys + Hungarian (102/qwerty/comma/eliminate dead keys) 102_qwerty_dot_dead - 102/qwerty/dot/Dead keys + Hungarian (102/qwerty/dot/dead keys) 102_qwerty_dot_nodead - 102/qwerty/dot/Eliminate dead keys + Hungarian (102/qwerty/dot/eliminate dead keys) @@ -2794,33 +3324,36 @@ is - Isl - Iceland - ice + + is + Icelandic + + ice + Sundeadkeys - Sun dead keys + Icelandic (Sun dead keys) nodeadkeys - Eliminate dead keys + Icelandic (eliminate dead keys) mac - Macintosh + Icelandic (Macintosh) dvorak - Dvorak + Icelandic (Dvorak) @@ -2828,27 +3361,30 @@ il - Isr - Israel - heb + + he + Hebrew + + heb + lyx - lyx + Hebrew (lyx) phonetic - Phonetic + Hebrew (phonetic) biblical - Biblical Hebrew (Tiro) + Hebrew (Biblical, Tiro) @@ -2856,34 +3392,39 @@ it - Ita - Italy - ita + + it + Italian + + ita + nodeadkeys - Eliminate dead keys + Italian (eliminate dead keys) mac - Macintosh + Italian (Macintosh) us - US keyboard with Italian letters + Italian (US keyboard with Italian letters) geo - Georgian - geo + Georgian (Italy) + + geo + @@ -2891,27 +3432,36 @@ jp - Jpn - Japan - jpn + + ja + Japanese + + jpn + kana - Kana + Japanese (Kana) + + + + + kana86 + Japanese (Kana 86) - + OADG109A - OADG 109A + Japanese (OADG 109A) - + mac - Macintosh + Japanese (Macintosh) @@ -2919,15 +3469,18 @@ kg - Kgz - Kyrgyzstan - kir + + ki + Kyrgyz + + kir + - + phonetic - Phonetic + Kyrgyz (phonetic) @@ -2935,52 +3488,73 @@ kh - Khm - Cambodia - khm + + km + Khmer (Cambodia) + + khm + kz - Kaz - Kazakhstan - kaz + + kk + Kazakh + + kaz + - - - ruskaz - Russian with Kazakh - kaz + + + ruskaz + + ru + Russian (Kazakhstan, with Kazakh) + kaz rus - - - - - kazrus - Kazakh with Russian + + + + + kazrus + Kazakh (with Russian) kaz rus - - + + la - Lao - Laos - lao + + lo + Lao + + lao + - + + + + stea + Lao (STEA proposed standard layout) + lao + + + + latam - LAm - Latin American + + es + Spanish (Latin American) AR BO @@ -3004,25 +3578,27 @@ UY VE - spa + + spa + nodeadkeys - Eliminate dead keys + Spanish (Latin American, eliminate dead keys) deadtilde - Include dead tilde + Spanish (Latin American, include dead tilde) sundeadkeys - Sun dead keys + Spanish (Latin American, Sun dead keys) @@ -3030,39 +3606,42 @@ lt - Ltu - Lithuania - lit + + lt + Lithuanian + + lit + std - Standard + Lithuanian (standard) us - US keyboard with Lithuanian letters + Lithuanian (US keyboard with Lithuanian letters) ibm - IBM (LST 1205-92) + Lithuanian (IBM LST 1205-92) lekp - LEKP + Lithuanian (LEKP) lekpa - LEKPa + Lithuanian (LEKPa) @@ -3070,27 +3649,48 @@ lv - Lva - Latvia - lav + + lv + Latvian + + lav + apostrophe - Apostrophe (') variant + Latvian (apostrophe variant) tilde - Tilde (~) variant + Latvian (tilde variant) fkey - F-letter (F) variant + Latvian (F variant) + + + + + modern + Latvian (modern) + + + + + ergonomic + Latvian (ergonomic, ŪGJRMV) + + + + + adapted + Latvian (adapted) @@ -3098,60 +3698,66 @@ mao - Mao + + mi Maori - mao + + mao + me - MNE - Montenegro - srp + + sr + Montenegrin + + srp + cyrillic - Cyrillic + Montenegrin (Cyrillic) cyrillicyz - Cyrillic, Z and ZHE swapped + Montenegrin (Cyrillic, Z and ZHE swapped) latinunicode - Latin unicode + Montenegrin (Latin Unicode) latinyz - Latin qwerty + Montenegrin (Latin qwerty) latinunicodeyz - Latin unicode qwerty + Montenegrin (Latin Unicode qwerty) cyrillicalternatequotes - Cyrillic with guillemets + Montenegrin (Cyrillic with guillemets) latinalternatequotes - Latin with guillemets + Montenegrin (Latin with guillemets) @@ -3159,15 +3765,18 @@ mk - Mkd - Macedonia - mkd + + mk + Macedonian + + mkd + nodeadkeys - Eliminate dead keys + Macedonian (eliminate dead keys) @@ -3175,15 +3784,18 @@ mt - Mlt - Malta - mlt + + mt + Maltese + + mlt + us - Maltese keyboard with US layout + Maltese (with US layout) @@ -3191,56 +3803,66 @@ mn - Mng - Mongolia - mng + + mn + Mongolian + + mng + no - Nor - Norway - nor + + no + Norwegian + + nor + nodeadkeys - Eliminate dead keys + Norwegian (eliminate dead keys) dvorak - Dvorak + Norwegian (Dvorak) smi - Northern Saami - sme + Northern Saami (Norway) + + sme + smi_nodeadkeys - Northern Saami, eliminate dead keys - sme + Northern Saami (Norway, eliminate dead keys) + + sme + mac - Macintosh + Norwegian (Macintosh) mac_nodeadkeys - Macintosh, eliminate dead keys + Norwegian (Macintosh, eliminate dead keys) @@ -3248,53 +3870,62 @@ pl - Pol - Poland - pol + + pl + Polish + + pol + qwertz - qwertz + Polish (qwertz) dvorak - Dvorak + Polish (Dvorak) dvorak_quotes - Dvorak, Polish quotes on quotemark key + Polish (Dvorak, Polish quotes on quotemark key) dvorak_altquotes - Dvorak, Polish quotes on key 1 + Polish (Dvorak, Polish quotes on key 1) csb Kashubian - csb + + csb + ru_phonetic_dvorak - Russian phonetic Dvorak - rus + + ru + Russian (Poland, phonetic Dvorak) + + rus + dvp - Programmer Dvorak + Polish (programmer Dvorak) @@ -3302,58 +3933,63 @@ pt - Prt - Portugal - por + + pt + Portuguese + + por + nodeadkeys - Eliminate dead keys + Portuguese (eliminate dead keys) sundeadkeys - Sun dead keys + Portuguese (Sun dead keys) mac - Macintosh + Portuguese (Macintosh) mac_nodeadkeys - Macintosh, eliminate dead keys + Portuguese (Macintosh, eliminate dead keys) mac_sundeadkeys - Macintosh, Sun dead keys + Portuguese (Macintosh, Sun dead keys) nativo - Nativo + Portuguese (Nativo) nativo-us - Nativo for USA keyboards + Portuguese (Nativo for USA keyboards) nativo-epo - Nativo for Esperanto - epo + Esperanto (Portugal, Nativo) + + epo + @@ -3361,61 +3997,36 @@ ro - Rou - Romania - rum + + ro + Romanian + + rum + cedilla - Cedilla + Romanian (cedilla) std - Standard + Romanian (standard) std_cedilla - Standard (Cedilla) + Romanian (standard cedilla) winkeys - Winkeys - - - - - crh_f - Crimean Tatar (Turkish F) - crh - - - - - crh_alt - Crimean Tatar (Turkish Alt-Q) - crh - - - - - crh_dobruca1 - Crimean Tatar (Dobruca-1 Q) - crh - - - - - crh_dobruca2 - Crimean Tatar (Dobruca-2 Q) - crh + Romanian (WinKeys) @@ -3423,114 +4034,135 @@ ru - Rus - Russia - rus + + ru + Russian + + rus + phonetic - Phonetic + Russian (phonetic) phonetic_winkeys - Phonetic Winkeys + Russian (phonetic WinKeys) typewriter - Typewriter + Russian (typewriter) legacy - Legacy + Russian (legacy) typewriter-legacy - Typewriter, legacy + Russian (typewriter, legacy) tt Tatar - tat + + tat + os_legacy - Ossetian, legacy - oss + Ossetian (legacy) + + oss + os_winkeys - Ossetian, Winkeys - oss + Ossetian (WinKeys) + + oss + cv Chuvash - chv + + chv + cv_latin - Chuvash Latin - chv + Chuvash (Latin) + + chv + udm Udmurt - udm + + udm + kom Komi - kom + + kom + - + sah Yakut - sah + + sah + xal Kalmyk - xal + + xal + dos - DOS + Russian (DOS) srp - Serbian + Serbian (Russia) rus srp @@ -3539,7 +4171,18 @@ bak Bashkirian - bak + + bak + + + + + + chm + Mari + + chm + @@ -3547,51 +4190,63 @@ rs - SRB - Serbia - srp + + sr + Serbian (Cyrillic) + + srp + yz - Z and ZHE swapped + Serbian (Cyrillic, Z and ZHE swapped) latin - Latin + Serbian (Latin) latinunicode - Latin Unicode + Serbian (Latin Unicode) latinyz - Latin qwerty + Serbian (Latin qwerty) latinunicodeyz - Latin Unicode qwerty + Serbian (Latin Unicode qwerty) alternatequotes - With guillemets + Serbian (Cyrillic with guillemets) latinalternatequotes - Latin with guillemets + Serbian (Latin with guillemets) + + + + + rue + Pannonian Rusyn (homophonic) + + rue + @@ -3599,21 +4254,24 @@ si - Svn - Slovenia - slv + + sl + Slovenian + + slv + alternatequotes - Use guillemets for quotes + Slovenian (use guillemets for quotes) us - US keyboard with Slovenian letters + Slovenian (US keyboard with Slovenian letters) @@ -3621,27 +4279,30 @@ sk - Svk - Slovakia - slo + + sk + Slovak + + slo + bksl - Extended Backslash + Slovak (extended Backslash) qwerty - qwerty + Slovak (qwerty) qwerty_bksl - qwerty, extended Backslash + Slovak (qwerty, extended Backslash) @@ -3649,53 +4310,60 @@ es - Esp - Spain - spa + + es + Spanish + + spa + nodeadkeys - Eliminate dead keys + Spanish (eliminate dead keys) deadtilde - Include dead tilde + Spanish (include dead tilde) sundeadkeys - Sun dead keys + Spanish (Sun dead keys) dvorak - Dvorak + Spanish (Dvorak) ast - Asturian variant with bottom-dot H and bottom-dot L - ast + Asturian (Spain, with bottom-dot H and bottom-dot L) + + ast + cat - Catalan variant with middle-dot L - cat + Catalan (Spain, with middle-dot L) + + cat + mac - Macintosh + Spanish (Macintosh) @@ -3703,54 +4371,74 @@ se - Swe - Sweden - swe + + sv + Swedish + + swe + nodeadkeys - Eliminate dead keys + Swedish (eliminate dead keys) dvorak - Dvorak + Swedish (Dvorak) rus - Russian phonetic - rus + + ru + Russian (Sweden, phonetic) + + rus + rus_nodeadkeys - Russian phonetic, eliminate dead keys - rus + + ru + Russian (Sweden, phonetic, eliminate dead keys) + + rus + smi - Northern Saami - sme + Northern Saami (Sweden) + + sme + mac - Macintosh + Swedish (Macintosh) svdvorak - Svdvorak + Swedish (Svdvorak) + + + + + swl + Swedish Sign Language + swl @@ -3758,8 +4446,9 @@ ch - Che - Switzerland + + de + German (Switzerland) ger gsw @@ -3767,53 +4456,75 @@ legacy - Legacy + German (Switzerland, legacy) de_nodeadkeys - German, eliminate dead keys + + de + German (Switzerland, eliminate dead keys) de_sundeadkeys - German, Sun dead keys + + de + German (Switzerland, Sun dead keys) fr - French - fra + + fr + French (Switzerland) + + fra + fr_nodeadkeys - French, eliminate dead keys - fra + + fr + French (Switzerland, eliminate dead keys) + + fra + fr_sundeadkeys - French, Sun dead keys - fra + + fr + French (Switzerland, Sun dead keys) + + fra + fr_mac - French (Macintosh) - fra + + fr + French (Switzerland, Macintosh) + + fra + de_mac - German (Macintosh) + + de + German (Switzerland, Macintosh) @@ -3821,42 +4532,61 @@ sy - Syr - Syria - syr + + ar + Arabic (Syria) + + syr + syc + + syc Syriac syc_phonetic - Syriac phonetic + + syc + Syriac (phonetic) ku - Kurdish, Latin Q - kur + + ku + Kurdish (Syria, Latin Q) + + kur + ku_f - Kurdish, (F) - kur + + ku + Kurdish (Syria, F) + + kur + ku_alt - Kurdish, Latin Alt-Q - kur + + ku + Kurdish (Syria, Latin Alt-Q) + + kur + @@ -3864,15 +4594,18 @@ tj - Tjk - Tajikistan - tgk + + tg + Tajik + + tgk + legacy - Legacy + Tajik (legacy) @@ -3880,23 +4613,32 @@ lk - Lka - Sri Lanka - sin + + si + Sinhala (phonetic) + + sin + tam_unicode - Tamil Unicode - tam + + ta + Tamil (Sri Lanka, Unicode) + + tam + tam_TAB - Tamil TAB Typewriter - tam + Tamil (Sri Lanka, TAB Typewriter) + + tam + @@ -3904,21 +4646,24 @@ th - Tha - Thailand - tha + + th + Thai + + tha + tis - TIS-820.2538 + Thai (TIS-820.2538) pat - Pattachote + Thai (Pattachote) @@ -3926,150 +4671,200 @@ tr - Tur - Turkey - tur + + tr + Turkish + + tur + f - (F) + Turkish (F) alt - Alt-Q + Turkish (Alt-Q) sundeadkeys - Sun dead keys + Turkish (Sun dead keys) ku - Kurdish, Latin Q - kur + + ku + Kurdish (Turkey, Latin Q) + + kur + ku_f - Kurdish, (F) - kur + + ku + Kurdish (Turkey, F) + + kur + ku_alt - Kurdish, Latin Alt-Q - kur + + ku + Kurdish (Turkey, Latin Alt-Q) + + kur + intl - International (with dead keys) + Turkish (international with dead keys) crh + + crh Crimean Tatar (Turkish Q) - crh + + crh + crh_f + + crh Crimean Tatar (Turkish F) - crh + + crh + crh_alt + + crh Crimean Tatar (Turkish Alt-Q) - crh + + crh + - ua - Ukr - Ukraine - ukr + tw + + zh + Taiwanese + + trv + - phonetic - Phonetic + indigenous + Taiwanese (indigenous) + + ami + tay + bnn + ckv + pwn + pyu + dru + ais + ssf + tao + tsu + - typewriter - Typewriter + saisiyat + + xsy + Saisiyat (Taiwan) + + xsy + + + + + + ua + + uk + Ukrainian + + ukr + + + - winkeys - Winkeys + phonetic + Ukrainian (phonetic) - legacy - Legacy + typewriter + Ukrainian (typewriter) - rstu - - Standard RSTU + winkeys + Ukrainian (WinKeys) - rstu_ru - - Standard RSTU on Russian layout - - - - - homophonic - Homophonic + legacy + Ukrainian (legacy) - crh - Crimean Tatar (Turkish Q) - crh + rstu + Ukrainian (standard RSTU) - crh_f - Crimean Tatar (Turkish F) - crh + rstu_ru + Russian (Ukraine, standard RSTU) - crh_alt - Crimean Tatar (Turkish Alt-Q) - crh + homophonic + Ukrainian (homophonic) @@ -4077,45 +4872,54 @@ gb - GBr - United Kingdom - eng + + en + English (UK) + + eng + extd - Extended - Winkeys + English (UK, extended WinKeys) intl - International (with dead keys) + English (UK, international with dead keys) dvorak - Dvorak + English (UK, Dvorak) dvorakukp - Dvorak (UK Punctuation) + English (UK, Dvorak with UK punctuation) mac - Macintosh + English (UK, Macintosh) + + + + + mac_intl + English (UK, Macintosh international) colemak - Colemak + English (UK, Colemak) @@ -4123,36 +4927,18 @@ uz - Uzb - Uzbekistan - uzb + + uz + Uzbek + + uzb + latin - Latin - - - - - crh - Crimean Tatar (Turkish Q) - crh - - - - - crh_f - Crimean Tatar (Turkish F) - crh - - - - - crh_alt - Crimean Tatar (Turkish Alt-Q) - crh + Uzbek (Latin) @@ -4160,71 +4946,91 @@ vn - Vnm - Vietnam - vie + + vi + Vietnamese + + vie + - + kr - Kor - Korea, Republic of - kor + + ko + Korean + + kor + - - - kr104 - 101/104 key Compatible - - + + + kr104 + Korean (101/104 key compatible) + + nec_vndr/jp - Jpn - Japan (PC-98xx Series) - JP - jpn + + ja + Japanese (PC-98xx Series) + + JP + + + jpn + ie - Irl - Ireland - eng + + ie + Irish + + eng + CloGaelach CloGaelach - gla + + gla + UnicodeExpert - UnicodeExpert + Irish (UnicodeExpert) ogam Ogham - - + + sga + + ogam_is434 - Ogham IS434 - + Ogham (IS434) + + sga + @@ -4232,30 +5038,45 @@ pk - Pak - Pakistan - urd + + ur + Urdu (Pakistan) + + urd + urd-crulp - CRULP - urd + Urdu (Pakistan, CRULP) urd-nla - NLA - urd + Urdu (Pakistan, NLA) ara - Arabic - ara + ar + Arabic (Pakistan) + + ara + + + + + + snd + + sd + Sindhi + + sd + @@ -4263,32 +5084,41 @@ mv - Mdv - Maldives - div + + dv + Dhivehi + + div + - + za - Zaf - South Africa - eng + + en + English (South Africa) + + eng + epo - Epo - Esperanto - epo + + eo + Esperanto + + epo + legacy - displaced semicolon and quote (obsolete) + Esperanto (displaced semicolon and quote, obsolete) @@ -4296,38 +5126,56 @@ np - Npl - Nepal - nep + + ne + Nepali + + nep + ng - Nga - Nigeria - eng + + en + English (Nigeria) + + eng + igbo + + ig Igbo - ibo + + ibo + yoruba + + yo Yoruba - yor + + yor + hausa + + ha Hausa - hau + + hau + @@ -4335,38 +5183,45 @@ et - Eth - Ethiopia - amh + + am + Amharic + + amh + sn - Sen - Senegal - wol + + wo + Wolof + + wol + brai - Brl + + brl Braille left_hand - Left hand + Braille (left hand) right_hand - Right hand + Braille (right hand) @@ -4374,15 +5229,18 @@ tm - Tkm - Turkmenistan - tuk + + tk + Turkmen + + tuk + alt - Alt-Q + Turkmen (Alt-Q) @@ -4390,27 +5248,39 @@ ml - Mli - Mali - bam + + bm + Bambara + + bam + fr-oss - Français (France Alternative) + + fr + French (Mali, alternative) + + fr + us-mac - English (USA Macintosh) + + en + English (Mali, US Macintosh) us-intl - English (USA International) + + en + English (Mali, US international) @@ -4418,18 +5288,173 @@ tz - Tza - Tanzania - swa + + sw + Swahili (Tanzania) + + swa + ke - Ken - Kenya - swa + + sw + Swahili (Kenya) + + swa + + + + + kik + + ki + Kikuyu + + kik + + + + + + + + bw + + tn + Tswana + + tsn + + + + + + ph + + ph + Filipino + eng + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + qwerty-bay + Filipino (QWERTY Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + capewell-dvorak + Filipino (Capewell-Dvorak Latin) + + + + + capewell-dvorak-bay + Filipino (Capewell-Dvorak Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + capewell-qwerf2k6 + Filipino (Capewell-QWERF 2006 Latin) + + + + + capewell-qwerf2k6-bay + Filipino (Capewell-QWERF 2006 Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + colemak + Filipino (Colemak Latin) + + + + + colemak-bay + Filipino (Colemak Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + + + dvorak + Filipino (Dvorak Latin) + + + + + dvorak-bay + Filipino (Dvorak Baybayin) + bik + ceb + fil + hil + ilo + pam + pag + phi + tgl + war + + + @@ -4472,7 +5497,7 @@ + @@ -4707,7 +5744,7 @@ - + ctrl @@ -4750,33 +5787,51 @@ + + + @@ -4787,19 +5842,19 @@ @@ -4836,13 +5891,13 @@ + @@ -5108,7 +6169,7 @@ @@ -5150,7 +6211,7 @@ + + eurosign - Adding EuroSign to certain keys + Adding currency signs to certain keys + @@ -5247,7 +6326,7 @@ - - - - - - - - - - + @@ -5449,6 +6469,12 @@ NICOLA-F style Backspace + diff --git a/linux/X/symbols/de b/linux/X/symbols/de index 60b53b5..c8a35a1 100644 --- a/linux/X/symbols/de +++ b/linux/X/symbols/de @@ -1,15 +1,11 @@ - // based on a keyboard map from an 'xkb/symbols/de' file -// -// $XKeyboardConfig$ -// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $ default xkb_symbols "basic" { include "latin(type4)" - name[Group1]="Germany"; + name[Group1]="German"; key { [ 2, quotedbl, twosuperior, oneeighth ] }; key { [ 3, section, threesuperior, sterling ] }; @@ -59,7 +55,7 @@ xkb_symbols "nodeadkeys" { // modify the basic German layout to not have any dead keys include "de(basic)" - name[Group1]="Germany - Eliminate dead keys"; + name[Group1]="German (eliminate dead keys)"; key { [asciicircum, degree, notsign, notsign ] }; key { [ acute, grave, cedilla, cedilla ] }; @@ -68,7 +64,6 @@ xkb_symbols "nodeadkeys" { key { [odiaeresis, Odiaeresis, doubleacute, doubleacute ] }; key { [adiaeresis, Adiaeresis, asciicircum, asciicircum ] }; key { [numbersign, apostrophe, grave, grave ] }; - key { [ minus, underscore, dead_belowdot, abovedot ] }; }; partial alphanumeric_keys @@ -78,7 +73,7 @@ xkb_symbols "deadgraveacute" { // in many programming languages) include "de(basic)" - name[Group1]="Germany - Dead grave acute"; + name[Group1]="German (dead grave acute)"; key { [asciicircum, degree, notsign, notsign ] }; key { [ plus, asterisk, asciitilde, dead_macron ] }; @@ -93,7 +88,7 @@ xkb_symbols "deadacute" { include "de(deadgraveacute)" - name[Group1]="Germany - Dead acute"; + name[Group1]="German (dead acute)"; key { [dead_acute, grave, dead_cedilla, dead_ogonek ] }; key { [numbersign, apostrophe, dead_grave, dead_grave ] }; @@ -109,7 +104,7 @@ xkb_symbols "ro" { include "de(basic)" - name[Group1]="Germany - Romanian keyboard with German letters"; + name[Group1]="Romanian (Germany)"; key { [ t, T, tcedilla, Tcedilla ] }; key { [ i, I, icircumflex, Icircumflex ] }; @@ -124,7 +119,7 @@ xkb_symbols "ro_nodeadkeys" { // Read the comment for de_ro ! include "de(nodeadkeys)" - name[Group1]="Germany - Romanian keyboard with German letters, eliminate dead keys"; + name[Group1]="Romanian (Germany, eliminate dead keys)"; key { [ t, T, tcedilla, Tcedilla ] }; key { [ i, I, icircumflex, Icircumflex ] }; @@ -142,7 +137,7 @@ partial alphanumeric_keys xkb_symbols "dvorak" { include "us(dvorak)" - name[Group1]="Germany - Dvorak"; + name[Group1]="German (Dvorak)"; key { [ asciicircum, degree ] }; @@ -208,7 +203,7 @@ xkb_symbols "sundeadkeys" { include "de(Sundeadkeys)" - name[Group1]="Germany - Sun dead keys"; + name[Group1]="German (Sun dead keys)"; }; @@ -230,8 +225,6 @@ xkb_symbols "sundeadkeys" { partial alphanumeric_keys modifier_keys keypad_keys xkb_symbols "neo_base" { - name[Group1]= "Germany - Neo 2"; - // Levels in Neo jargon // -------------------------------------------------------------- // Ebene 1: normal @@ -386,6 +379,8 @@ xkb_symbols "neo" { include "de(neo_base)" + name[Group1]= "German (Neo 2)"; + include "shift(both_capslock)" include "level3(caps_switch)" include "level3(bksl_switch)" @@ -400,7 +395,7 @@ partial alphanumeric_keys xkb_symbols "mac" { include "de" - name[Group1]= "Germany - Macintosh"; + name[Group1]= "German (Macintosh)"; // Alphanumeric section key { [ 1, exclam, exclamdown, at ] }; @@ -428,7 +423,7 @@ partial alphanumeric_keys xkb_symbols "mac_nodeadkeys" { // modify the standard German mac layout to not have any dead keys include "de(mac)" - name[Group1]= "Germany - Macintosh, eliminate dead keys"; + name[Group1]= "German (Macintosh, eliminate dead keys)"; key { [ 4, dollar, onequarter, currency ] }; key { [ asciicircum, degree, notsign ] }; @@ -444,7 +439,7 @@ xkb_symbols "mac_nodeadkeys" { partial alphanumeric_keys xkb_symbols "dsb" { - name[Group1] = "Germany - Lower Sorbian"; + name[Group1] = "Lower Sorbian"; include "latin(basic)" include "level3(ralt_switch)" include "kpdl(comma)" @@ -467,7 +462,7 @@ xkb_symbols "dsb" partial alphanumeric_keys xkb_symbols "dsb_qwertz" { - name[Group1] = "Germany - Lower Sorbian (qwertz)"; + name[Group1] = "Lower Sorbian (qwertz)"; include "latin(basic)" include "level3(ralt_switch)" include "kpdl(comma)" @@ -489,17 +484,144 @@ xkb_symbols "dsb_qwertz" key { [ o, O, oacute, Oacute ] }; }; -partial alphanumeric_keys -xkb_symbols "qwerty" { - - // This layout should work exactly as a de with the exception - // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped). - // 2008 by Matej Košík - +// layout for Russian letters on an german keyboard +// based on US-RU layout by Ivan Popov 2005-07-17 +// adopted for german layout by Alexey Fisher 2010-08-19 + +partial alphanumeric_keys +xkb_symbols "ru" { + include "de(basic)" + + name[Group1]= "Russian (Germany, phonetic)"; + +key.type[group1]="FOUR_LEVEL_ALPHABETIC"; + + key { [ Cyrillic_a, Cyrillic_A ] }; + key { [ Cyrillic_be, Cyrillic_BE ] }; + key { [ Cyrillic_ve, Cyrillic_VE ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key { [ Cyrillic_de, Cyrillic_DE ] }; + key { [ Cyrillic_ie, Cyrillic_IE ] }; + key { [ Cyrillic_io, Cyrillic_IO, asciitilde ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key { [ Cyrillic_ze, Cyrillic_ZE ] }; + key { [ Cyrillic_i, Cyrillic_I ] }; + key { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; + key { [ Cyrillic_ka, Cyrillic_KA ] }; + key { [ Cyrillic_el, Cyrillic_EL ] }; + key { [ Cyrillic_em, Cyrillic_EM ] }; + key { [ Cyrillic_en, Cyrillic_EN ] }; + key { [ Cyrillic_o, Cyrillic_O ] }; + key { [ Cyrillic_pe, Cyrillic_PE ] }; + key { [ Cyrillic_er, Cyrillic_ER ] }; + key { [ Cyrillic_es, Cyrillic_ES ] }; + key { [ Cyrillic_te, Cyrillic_TE ] }; + key { [ Cyrillic_u, Cyrillic_U ] }; + key { [ Cyrillic_ef, Cyrillic_EF ] }; + key { [ Cyrillic_ha, Cyrillic_HA ] }; + key { [ Cyrillic_tse, Cyrillic_TSE ] }; + key { [ Cyrillic_che, Cyrillic_CHE ] }; + key { [ Cyrillic_sha, Cyrillic_SHA ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA, plus, asterisk ] }; + key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; + key { [ Cyrillic_e, Cyrillic_E ] }; + key { [ Cyrillic_yu, Cyrillic_YU, numbersign, apostrophe ] }; + key { [ Cyrillic_ya, Cyrillic_YA ] }; + + include "level3(ralt_switch)" +}; - name[Group1] = "Germany - qwerty"; +partial alphanumeric_keys +xkb_symbols "htcdream" { + include "inet(htcdream)" + + name[Group1]= "German"; + + //second row + key { [ q, Q, Tab, Tab ] }; + key { [ w, W, grave, grave ] }; + key { [ e, E, EuroSign, EuroSign ] }; + key { [ r, R, underscore, underscore ] }; + key { [ t, T, sterling, sterling] }; + key { [ z, Z, division, division ] }; + key { [ u, U, udiaeresis, udiaeresis ] }; + key { [ i, I, minus, minus ] }; + key { [ o, O, odiaeresis, odiaeresis ] }; + key { [ p, P, equal, equal ] }; + + //third row + key { [ a, A, adiaeresis, adiaeresis ] }; + key { [ s, S, ssharp, ssharp] }; + key { [ d ,D, backslash, backslash ] }; + key { [ f, F, braceleft, braceleft ] }; + key { [ g, G, braceright, braceright ] }; + key { [ h, H, multiply, multiply ] }; + key { [ j, J, colon, colon ] }; + key { [ k, K, plus, plus ] }; + key { [ l, L, apostrophe, apostrophe ] }; + + //forth row + key { [ y, Y, bar, bar ] }; + key { [ x, X, bracketleft, bracketleft ] }; + key { [ c, C, bracketright, bracketright ] }; + key { [ v, V, less, less ] }; + key { [ b, B, greater, greater ] }; + key { [ n, N, semicolon, semicolon ] }; + key { [ m, M, quotedbl, quotedbl ] }; + key { [ comma, comma, question, question ] }; + + //fifth row + key { [ at, at, asciitilde, asciitilde ] }; + + include "level3(alt_switch)" +}; + +// EXTRAS: + +partial alphanumeric_keys +xkb_symbols "us" { + include "us" + + name[Group1]="German (US keyboard with German letters)"; + + key { [ a, A, adiaeresis, Adiaeresis ] }; + key { [ s, S, ssharp, ssharp ] }; + key { [ semicolon, colon, odiaeresis, Odiaeresis ] }; + key { [ apostrophe, quotedbl, adiaeresis, Adiaeresis ] }; + key { [ e, E, EuroSign, EuroSign ] }; + key { [ u, U, udiaeresis, Udiaeresis ] }; + key { [ o, O, odiaeresis, Odiaeresis ] }; + key { [ bracketleft, braceleft, udiaeresis, Udiaeresis ] }; + key { [ 3, numbersign, section, section ] }; + key { [ minus, underscore, ssharp, question ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "hu" { + + // modify the basic German layout to not have any dead keys and add Hungarian letters - key { [ z, Z, leftarrow, yen ] }; - key { [ y, Y, guillemotleft, less ] }; + include "de(basic)" + name[Group1]="German (with Hungarian letters and no dead keys)"; + + key { [ y, Y, guillemotleft, less ] }; + key { [odiaeresis, Odiaeresis, eacute, Eacute ] }; + key { [adiaeresis, Adiaeresis, aacute, Aacute] }; + key { [ e, E, EuroSign, EuroSign ] }; + key { [ z, Z, leftarrow, yen ] }; + key { [ u, U, uacute, Uacute ] }; + key { [ i, I, iacute, Iacute ] }; + key { [ o, O, odoubleacute,Odoubleacute ] }; + key { [udiaeresis, Udiaeresis, udoubleacute,Udoubleacute ] }; + key { [ plus, asterisk, asciitilde, macron ] }; + key { [ acute, grave, oacute, Oacute ] }; + key { [numbersign, apostrophe, grave, grave ] }; + key { [asciicircum, degree, notsign, notsign ] }; + + }; diff --git a/linux/X/symbols/level3 b/linux/X/symbols/level3 index c2c6b13..9d49555 100644 --- a/linux/X/symbols/level3 +++ b/linux/X/symbols/level3 @@ -1,10 +1,6 @@ -// $XKeyboardConfig$ - // these variants assign various XKB keycodes to ISO_Level3_Shift so that // the third shift level can be reached // -// $XFree86: xc/programs/xkbcomp/symbols/level3,v 1.7 2003/09/08 14:25:32 eich Exp $ -// // the default behavior is for the right Alt key (AltGr) to generate the // third engraved symbol diff --git a/linux/X/symbols/level5 b/linux/X/symbols/level5 index 19db36c..ce219b5 100644 --- a/linux/X/symbols/level5 +++ b/linux/X/symbols/level5 @@ -1,10 +1,6 @@ -// $XKeyboardConfig$ - // these variants assign various XKB keycodes to ISO_Level5_Shift so that // the third shift level can be reached // -// $XFree86: xc/programs/xkbcomp/symbols/level3,v 1.7 2003/09/08 14:25:32 eich Exp $ -// // using the level(switch) map, the right Control key temporarily // chooses the fifth shift level (until it is released). @@ -17,6 +13,25 @@ xkb_symbols "rctrl_switch" { modifier_map Mod3 { ISO_Level5_Shift }; }; +partial modifier_keys +xkb_symbols "lsgt_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift ] + }; + modifier_map Mod3 { ISO_Level5_Shift }; +}; + +partial modifier_keys +xkb_symbols "ralt_switch" { + key { + type[Group1]="ONE_LEVEL", + symbols[Group1] = [ ISO_Level5_Shift ] + }; + modifier_map Mod3 { ISO_Level5_Shift }; +}; + + // The following modifier keys are used to switch to the third shift and to set a // corresponding lock, implemented as NumLock. diff --git a/linux/X/symbols/shift b/linux/X/symbols/shift index 78951c1..6fbec5b 100644 --- a/linux/X/symbols/shift +++ b/linux/X/symbols/shift @@ -1,5 +1,3 @@ -// $XKeyboardConfig$ - partial modifier_keys xkb_symbols "breaks_caps" { key { diff --git a/linux/X/types/level5 b/linux/X/types/level5 index 1012d0f..e441ffa 100644 --- a/linux/X/types/level5 +++ b/linux/X/types/level5 @@ -1,6 +1,3 @@ -// $XKeyboardConfig$ -// $XFree86: xc/programs/xkbcomp/types/extra,v 1.3 2002/11/26 02:14:02 dawes Exp $ - partial default xkb_types "default" { // Definition for a key type used for the czech keymap, for instance. // Defines style a with four level shift. It is similar to three_level @@ -37,7 +34,7 @@ partial default xkb_types "default" { // map[Shift+LevelThree] = Level4; // map[Lock+LevelThree] = Level4; // map[Lock+Shift+LevelThree] = Level3; - +// // map[LevelFive] = Level5; // map[Shift+LevelFive] = Level6; // map[Lock+LevelFive] = Level6; @@ -45,7 +42,42 @@ partial default xkb_types "default" { // map[Shift+LevelThree+LevelFive] = Level8; // map[Lock+LevelThree+LevelFive] = Level8; // map[Lock+Shift+LevelThree+LevelFive] = Level7; +// +// level_name[Level1] = "Base"; +// level_name[Level2] = "Shift"; +// level_name[Level3] = "Alt Base"; +// level_name[Level4] = "Shift Alt"; +// level_name[Level5] = "X"; +// level_name[Level6] = "X Shift"; +// level_name[Level7] = "X Alt Base"; +// level_name[Level8] = "X Shift Alt"; +// }; +// type "EIGHT_LEVEL_SEMIALPHABETIC" { +// modifiers = Shift+Lock+LevelThree+LevelFive; +// map[None] = Level1; +// map[Shift] = Level2; +// map[Lock] = Level2; +// map[LevelThree] = Level3; +// map[Shift+LevelThree] = Level4; +// map[Lock+LevelThree] = Level3; +// map[Lock+Shift+LevelThree] = Level4; +// +// map[LevelFive] = Level5; +// map[Shift+LevelFive] = Level6; +// map[Lock+LevelFive] = Level6; +// map[LevelThree+LevelFive] = Level7; +// map[Shift+LevelThree+LevelFive] = Level8; +// map[Lock+LevelThree+LevelFive] = Level7; +// map[Lock+Shift+LevelThree+LevelFive] = Level8; +// +// preserve[Lock+LevelThree] = Lock; +// preserve[Lock+Shift+LevelThree] = Lock; +// preserve[Lock+LevelFive] = Lock; +// preserve[Lock+Shift+LevelFive] = Lock; +// preserve[Lock+LevelThree+LevelFive] = Lock; +// preserve[Lock+Shift+LevelThree+LevelFive] = Lock; +// // level_name[Level1] = "Base"; // level_name[Level2] = "Shift"; // level_name[Level3] = "Alt Base"; @@ -178,40 +210,4 @@ partial default xkb_types "default" { level_name[Level8] = "X Shift Alt"; }; -// type "EIGHT_LEVEL_SEMIALPHABETIC" { -// modifiers = Shift+Lock+LevelThree+LevelFive; -// map[None] = Level1; -// map[Shift] = Level2; -// map[Lock] = Level2; -// map[LevelThree] = Level3; -// map[Shift+LevelThree] = Level4; -// map[Lock+LevelThree] = Level3; -// map[Lock+Shift+LevelThree] = Level4; - -// map[LevelFive] = Level5; -// map[Shift+LevelFive] = Level6; -// map[Lock+LevelFive] = Level6; -// map[LevelThree+LevelFive] = Level7; -// map[Shift+LevelThree+LevelFive] = Level8; -// map[Lock+LevelThree+LevelFive] = Level7; -// map[Lock+Shift+LevelThree+LevelFive] = Level8; - -// preserve[Lock+LevelThree] = Lock; -// preserve[Lock+Shift+LevelThree] = Lock; -// preserve[Lock+LevelFive] = Lock; -// preserve[Lock+Shift+LevelFive] = Lock; -// preserve[Lock+LevelThree+LevelFive] = Lock; -// preserve[Lock+Shift+LevelThree+LevelFive] = Lock; - -// level_name[Level1] = "Base"; -// level_name[Level2] = "Shift"; -// level_name[Level3] = "Alt Base"; -// level_name[Level4] = "Shift Alt"; -// level_name[Level5] = "X"; -// level_name[Level6] = "X Shift"; -// level_name[Level7] = "X Alt Base"; -// level_name[Level8] = "X Shift Alt"; -// }; - }; - -- cgit v1.2.3