XKB data Migration 6811871
authorja208388
Tue, 24 Mar 2009 11:40:01 +0100
changeset 344 cd66d34584ac
parent 343 47eaba9cec1b
child 345 500827fbb1be
child 350 3109b9a128f4
XKB data Migration 6811871
pkgmaps/prototype.xorg-xkb
src/xorg/keytables/Makefile
src/xorg/keytables/sun-src/README
src/xorg/keytables/sun-src/compat/japan
src/xorg/keytables/sun-src/compat/mousekeys
src/xorg/keytables/sun-src/geometry/sun
src/xorg/keytables/sun-src/keycodes/sun
src/xorg/keytables/sun-src/keymap/sun/all
src/xorg/keytables/sun-src/rules/base
src/xorg/keytables/sun-src/rules/base.lst
src/xorg/keytables/sun-src/rules/base.xml
src/xorg/keytables/sun-src/rules/evdev
src/xorg/keytables/sun-src/rules/evdev.lst
src/xorg/keytables/sun-src/rules/evdev.xml
src/xorg/keytables/sun-src/rules/xorg
src/xorg/keytables/sun-src/rules/xorg.lst
src/xorg/keytables/sun-src/rules/xorg.xml
src/xorg/keytables/sun-src/symbols/al
src/xorg/keytables/sun-src/symbols/ar
src/xorg/keytables/sun-src/symbols/bg
src/xorg/keytables/sun-src/symbols/br
src/xorg/keytables/sun-src/symbols/by
src/xorg/keytables/sun-src/symbols/ca_bi
src/xorg/keytables/sun-src/symbols/ca_enhanced
src/xorg/keytables/sun-src/symbols/cz
src/xorg/keytables/sun-src/symbols/cz_qwerty
src/xorg/keytables/sun-src/symbols/czsk
src/xorg/keytables/sun-src/symbols/de
src/xorg/keytables/sun-src/symbols/de_CH
src/xorg/keytables/sun-src/symbols/dk
src/xorg/keytables/sun-src/symbols/dvorak
src/xorg/keytables/sun-src/symbols/ee
src/xorg/keytables/sun-src/symbols/el
src/xorg/keytables/sun-src/symbols/es
src/xorg/keytables/sun-src/symbols/fi
src/xorg/keytables/sun-src/symbols/fr
src/xorg/keytables/sun-src/symbols/fr_CH
src/xorg/keytables/sun-src/symbols/ge_la
src/xorg/keytables/sun-src/symbols/ge_ru
src/xorg/keytables/sun-src/symbols/gr
src/xorg/keytables/sun-src/symbols/hr
src/xorg/keytables/sun-src/symbols/hr_US
src/xorg/keytables/sun-src/symbols/hu_qwerty
src/xorg/keytables/sun-src/symbols/il
src/xorg/keytables/sun-src/symbols/il_phonetic
src/xorg/keytables/sun-src/symbols/is
src/xorg/keytables/sun-src/symbols/it
src/xorg/keytables/sun-src/symbols/kan
src/xorg/keytables/sun-src/symbols/kz
src/xorg/keytables/sun-src/symbols/la
src/xorg/keytables/sun-src/symbols/lt
src/xorg/keytables/sun-src/symbols/lv
src/xorg/keytables/sun-src/symbols/mk
src/xorg/keytables/sun-src/symbols/mt
src/xorg/keytables/sun-src/symbols/nl
src/xorg/keytables/sun-src/symbols/no
src/xorg/keytables/sun-src/symbols/pc
src/xorg/keytables/sun-src/symbols/pc/bg
src/xorg/keytables/sun-src/symbols/pc/by
src/xorg/keytables/sun-src/symbols/pc/ca_bi
src/xorg/keytables/sun-src/symbols/pc/ca_enhanced
src/xorg/keytables/sun-src/symbols/pc/cz
src/xorg/keytables/sun-src/symbols/pc/cz_qwerty
src/xorg/keytables/sun-src/symbols/pc/czsk
src/xorg/keytables/sun-src/symbols/pc/de_CH
src/xorg/keytables/sun-src/symbols/pc/dvorak
src/xorg/keytables/sun-src/symbols/pc/el
src/xorg/keytables/sun-src/symbols/pc/fr_CH
src/xorg/keytables/sun-src/symbols/pc/gr
src/xorg/keytables/sun-src/symbols/pc/hr_US
src/xorg/keytables/sun-src/symbols/pc/hu_qwerty
src/xorg/keytables/sun-src/symbols/pc/il_phonetic
src/xorg/keytables/sun-src/symbols/pc/kz
src/xorg/keytables/sun-src/symbols/pc/nl
src/xorg/keytables/sun-src/symbols/pc/no
src/xorg/keytables/sun-src/symbols/pc/pc
src/xorg/keytables/sun-src/symbols/pc/pl
src/xorg/keytables/sun-src/symbols/pc/pl_dev
src/xorg/keytables/sun-src/symbols/pc/ro2
src/xorg/keytables/sun-src/symbols/pc/ru
src/xorg/keytables/sun-src/symbols/pc/sk_qwerty
src/xorg/keytables/sun-src/symbols/pc/sr
src/xorg/keytables/sun-src/symbols/pc/tr_f
src/xorg/keytables/sun-src/symbols/pc/us
src/xorg/keytables/sun-src/symbols/pl
src/xorg/keytables/sun-src/symbols/pl2
src/xorg/keytables/sun-src/symbols/pl_dev
src/xorg/keytables/sun-src/symbols/ro
src/xorg/keytables/sun-src/symbols/ro2
src/xorg/keytables/sun-src/symbols/ru
src/xorg/keytables/sun-src/symbols/se
src/xorg/keytables/sun-src/symbols/si
src/xorg/keytables/sun-src/symbols/sk
src/xorg/keytables/sun-src/symbols/sk_qwerty
src/xorg/keytables/sun-src/symbols/sr
src/xorg/keytables/sun-src/symbols/sun/am
src/xorg/keytables/sun-src/symbols/sun/ar
src/xorg/keytables/sun-src/symbols/sun/az
src/xorg/keytables/sun-src/symbols/sun/be
src/xorg/keytables/sun-src/symbols/sun/br
src/xorg/keytables/sun-src/symbols/sun/ca
src/xorg/keytables/sun-src/symbols/sun/ca_bi
src/xorg/keytables/sun-src/symbols/sun/cs
src/xorg/keytables/sun-src/symbols/sun/cz
src/xorg/keytables/sun-src/symbols/sun/de
src/xorg/keytables/sun-src/symbols/sun/de_CH
src/xorg/keytables/sun-src/symbols/sun/dk
src/xorg/keytables/sun-src/symbols/sun/ee
src/xorg/keytables/sun-src/symbols/sun/es
src/xorg/keytables/sun-src/symbols/sun/fi
src/xorg/keytables/sun-src/symbols/sun/fi_bk
src/xorg/keytables/sun-src/symbols/sun/fr
src/xorg/keytables/sun-src/symbols/sun/fr_CH
src/xorg/keytables/sun-src/symbols/sun/gb
src/xorg/keytables/sun-src/symbols/sun/ge
src/xorg/keytables/sun-src/symbols/sun/gr
src/xorg/keytables/sun-src/symbols/sun/hu
src/xorg/keytables/sun-src/symbols/sun/is
src/xorg/keytables/sun-src/symbols/sun/it
src/xorg/keytables/sun-src/symbols/sun/jp
src/xorg/keytables/sun-src/symbols/sun/kg
src/xorg/keytables/sun-src/symbols/sun/ko
src/xorg/keytables/sun-src/symbols/sun/kz
src/xorg/keytables/sun-src/symbols/sun/lt
src/xorg/keytables/sun-src/symbols/sun/lv
src/xorg/keytables/sun-src/symbols/sun/nl
src/xorg/keytables/sun-src/symbols/sun/no
src/xorg/keytables/sun-src/symbols/sun/pl
src/xorg/keytables/sun-src/symbols/sun/pl_dev
src/xorg/keytables/sun-src/symbols/sun/pt
src/xorg/keytables/sun-src/symbols/sun/ru
src/xorg/keytables/sun-src/symbols/sun/se
src/xorg/keytables/sun-src/symbols/sun/sk
src/xorg/keytables/sun-src/symbols/sun/solaris
src/xorg/keytables/sun-src/symbols/sun/sw
src/xorg/keytables/sun-src/symbols/sun/tj
src/xorg/keytables/sun-src/symbols/sun/tr
src/xorg/keytables/sun-src/symbols/sun/tr_f
src/xorg/keytables/sun-src/symbols/sun/tuv
src/xorg/keytables/sun-src/symbols/sun/tw
src/xorg/keytables/sun-src/symbols/sun/ua
src/xorg/keytables/sun-src/symbols/sun/us
src/xorg/keytables/sun-src/symbols/sun/uz
src/xorg/keytables/sun-src/symbols/sun_vndr/am
src/xorg/keytables/sun-src/symbols/sun_vndr/ar
src/xorg/keytables/sun-src/symbols/sun_vndr/az
src/xorg/keytables/sun-src/symbols/sun_vndr/be
src/xorg/keytables/sun-src/symbols/sun_vndr/br
src/xorg/keytables/sun-src/symbols/sun_vndr/ca
src/xorg/keytables/sun-src/symbols/sun_vndr/ca_bi
src/xorg/keytables/sun-src/symbols/sun_vndr/cz
src/xorg/keytables/sun-src/symbols/sun_vndr/de
src/xorg/keytables/sun-src/symbols/sun_vndr/de_CH
src/xorg/keytables/sun-src/symbols/sun_vndr/dk
src/xorg/keytables/sun-src/symbols/sun_vndr/dvorak
src/xorg/keytables/sun-src/symbols/sun_vndr/es
src/xorg/keytables/sun-src/symbols/sun_vndr/fi
src/xorg/keytables/sun-src/symbols/sun_vndr/fr
src/xorg/keytables/sun-src/symbols/sun_vndr/fr_CH
src/xorg/keytables/sun-src/symbols/sun_vndr/gb
src/xorg/keytables/sun-src/symbols/sun_vndr/ge
src/xorg/keytables/sun-src/symbols/sun_vndr/gr
src/xorg/keytables/sun-src/symbols/sun_vndr/hu
src/xorg/keytables/sun-src/symbols/sun_vndr/is
src/xorg/keytables/sun-src/symbols/sun_vndr/it
src/xorg/keytables/sun-src/symbols/sun_vndr/jp
src/xorg/keytables/sun-src/symbols/sun_vndr/kg
src/xorg/keytables/sun-src/symbols/sun_vndr/ko
src/xorg/keytables/sun-src/symbols/sun_vndr/kz
src/xorg/keytables/sun-src/symbols/sun_vndr/lt
src/xorg/keytables/sun-src/symbols/sun_vndr/lv
src/xorg/keytables/sun-src/symbols/sun_vndr/nl
src/xorg/keytables/sun-src/symbols/sun_vndr/no
src/xorg/keytables/sun-src/symbols/sun_vndr/pl
src/xorg/keytables/sun-src/symbols/sun_vndr/pl_dev
src/xorg/keytables/sun-src/symbols/sun_vndr/pt
src/xorg/keytables/sun-src/symbols/sun_vndr/ru
src/xorg/keytables/sun-src/symbols/sun_vndr/se
src/xorg/keytables/sun-src/symbols/sun_vndr/sk
src/xorg/keytables/sun-src/symbols/sun_vndr/solaris
src/xorg/keytables/sun-src/symbols/sun_vndr/sw
src/xorg/keytables/sun-src/symbols/sun_vndr/tj
src/xorg/keytables/sun-src/symbols/sun_vndr/tr
src/xorg/keytables/sun-src/symbols/sun_vndr/tr_f
src/xorg/keytables/sun-src/symbols/sun_vndr/tuv
src/xorg/keytables/sun-src/symbols/sun_vndr/tw
src/xorg/keytables/sun-src/symbols/sun_vndr/ua
src/xorg/keytables/sun-src/symbols/sun_vndr/us
src/xorg/keytables/sun-src/symbols/sun_vndr/uz
src/xorg/keytables/sun-src/symbols/tr
src/xorg/keytables/sun-src/symbols/tr_f
src/xorg/keytables/sun-src/symbols/ua
src/xorg/keytables/sun-src/symbols/us
src/xorg/keytables/sun-src/xkbtable.map
--- a/pkgmaps/prototype.xorg-xkb	Mon Mar 23 17:34:01 2009 +0100
+++ b/pkgmaps/prototype.xorg-xkb	Tue Mar 24 11:40:01 2009 +0100
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -47,9 +47,11 @@
 f none X11/lib/X11/xkb/compat/ledcaps 0444 root bin
 f none X11/lib/X11/xkb/compat/lednum 0444 root bin
 f none X11/lib/X11/xkb/compat/ledscroll 0444 root bin
+f none X11/lib/X11/xkb/compat/level5 0444 root bin
 f none X11/lib/X11/xkb/compat/misc 0444 root bin
 f none X11/lib/X11/xkb/compat/mousekeys 0444 root bin
 f none X11/lib/X11/xkb/compat/norepeat 0444 root bin
+f none X11/lib/X11/xkb/compat/olpc 0444 root bin
 f none X11/lib/X11/xkb/compat/pc 0444 root bin
 f none X11/lib/X11/xkb/compat/pc98 0444 root bin
 f none X11/lib/X11/xkb/compat/xfree86 0444 root bin
@@ -67,6 +69,7 @@
 f none X11/lib/X11/xkb/geometry/dell 0444 root bin
 f none X11/lib/X11/xkb/geometry/everex 0444 root bin
 f none X11/lib/X11/xkb/geometry/fujitsu 0444 root bin
+f none X11/lib/X11/xkb/geometry/hhk 0444 root bin
 f none X11/lib/X11/xkb/geometry/hp 0444 root bin
 f none X11/lib/X11/xkb/geometry/keytronic 0444 root bin
 f none X11/lib/X11/xkb/geometry/kinesis 0444 root bin
@@ -77,20 +80,18 @@
 f none X11/lib/X11/xkb/geometry/pc 0444 root bin
 f none X11/lib/X11/xkb/geometry/sony 0444 root bin
 f none X11/lib/X11/xkb/geometry/sun 0444 root bin
+f none X11/lib/X11/xkb/geometry/thinkpad 0444 root bin
 f none X11/lib/X11/xkb/geometry/winbook 0444 root bin
 
-d none X11/lib/X11/xkb/geometry/digital 0755 root bin
-f none X11/lib/X11/xkb/geometry/digital/lk 0444 root bin
-f none X11/lib/X11/xkb/geometry/digital/pc 0444 root bin
-f none X11/lib/X11/xkb/geometry/digital/unix 0444 root bin
+d none X11/lib/X11/xkb/geometry/digital_vndr 0755 root bin
+f none X11/lib/X11/xkb/geometry/digital_vndr/lk 0444 root bin
+f none X11/lib/X11/xkb/geometry/digital_vndr/pc 0444 root bin
+f none X11/lib/X11/xkb/geometry/digital_vndr/unix 0444 root bin
 
-d none X11/lib/X11/xkb/geometry/ibm 0755 root bin
-f none X11/lib/X11/xkb/geometry/ibm/thinkpad 0444 root bin
-
-d none X11/lib/X11/xkb/geometry/sgi 0755 root bin
-f none X11/lib/X11/xkb/geometry/sgi/O2 0444 root bin
-f none X11/lib/X11/xkb/geometry/sgi/indigo 0444 root bin
-f none X11/lib/X11/xkb/geometry/sgi/indy 0444 root bin
+d none X11/lib/X11/xkb/geometry/sgi_vndr 0755 root bin
+f none X11/lib/X11/xkb/geometry/sgi_vndr/O2 0444 root bin
+f none X11/lib/X11/xkb/geometry/sgi_vndr/indigo 0444 root bin
+f none X11/lib/X11/xkb/geometry/sgi_vndr/indy 0444 root bin
 
 f none X11/lib/X11/xkb/keycodes.dir 0444 root bin
 d none X11/lib/X11/xkb/keycodes 0755 root bin
@@ -98,24 +99,24 @@
 f none X11/lib/X11/xkb/keycodes/aliases 0444 root bin
 f none X11/lib/X11/xkb/keycodes/amiga 0444 root bin
 f none X11/lib/X11/xkb/keycodes/ataritt 0444 root bin
+f none X11/lib/X11/xkb/keycodes/evdev 0444 root bin
 f none X11/lib/X11/xkb/keycodes/fujitsu 0444 root bin
 f none X11/lib/X11/xkb/keycodes/hp 0444 root bin
 f none X11/lib/X11/xkb/keycodes/ibm 0444 root bin
 f none X11/lib/X11/xkb/keycodes/macintosh 0444 root bin
-f none X11/lib/X11/xkb/keycodes/powerpcps2 0444 root bin
 f none X11/lib/X11/xkb/keycodes/sony 0444 root bin
 f none X11/lib/X11/xkb/keycodes/sun 0444 root bin
 f none X11/lib/X11/xkb/keycodes/xfree86 0444 root bin
 f none X11/lib/X11/xkb/keycodes/xfree98 0444 root bin
 
-d none X11/lib/X11/xkb/keycodes/digital 0755 root bin
-f none X11/lib/X11/xkb/keycodes/digital/lk 0444 root bin
-f none X11/lib/X11/xkb/keycodes/digital/pc 0444 root bin
+d none X11/lib/X11/xkb/keycodes/digital_vndr 0755 root bin
+f none X11/lib/X11/xkb/keycodes/digital_vndr/lk 0444 root bin
+f none X11/lib/X11/xkb/keycodes/digital_vndr/pc 0444 root bin
 
-d none X11/lib/X11/xkb/keycodes/sgi 0755 root bin
-f none X11/lib/X11/xkb/keycodes/sgi/indigo 0444 root bin
-f none X11/lib/X11/xkb/keycodes/sgi/indy 0444 root bin
-f none X11/lib/X11/xkb/keycodes/sgi/iris 0444 root bin
+d none X11/lib/X11/xkb/keycodes/sgi_vndr 0755 root bin
+f none X11/lib/X11/xkb/keycodes/sgi_vndr/indigo 0444 root bin
+f none X11/lib/X11/xkb/keycodes/sgi_vndr/indy 0444 root bin
+f none X11/lib/X11/xkb/keycodes/sgi_vndr/iris 0444 root bin
 
 f none X11/lib/X11/xkb/keymap.dir 0444 root bin
 d none X11/lib/X11/xkb/keymap 0755 root bin
@@ -127,64 +128,62 @@
 f none X11/lib/X11/xkb/keymap/xfree86 0444 root bin
 f none X11/lib/X11/xkb/keymap/xfree98 0444 root bin
 
-d none X11/lib/X11/xkb/keymap/digital 0755 root bin
-f none X11/lib/X11/xkb/keymap/digital/us 0444 root bin
+d none X11/lib/X11/xkb/keymap/digital_vndr 0755 root bin
+f none X11/lib/X11/xkb/keymap/digital_vndr/us 0444 root bin
 
-d none X11/lib/X11/xkb/keymap/sgi 0755 root bin
-f none X11/lib/X11/xkb/keymap/sgi/be 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/bg 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/ca 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/cz 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/cz_qwerty 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/de 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/de_CH 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/dk 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/dvorak 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/en_US 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/es 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/fi 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/fr 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/fr_CH 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/gb 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/hu 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/it 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/jp 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/no 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/pl 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/pt 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/ru 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/se 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/sk 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/sk_qwerty 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/th 0444 root bin
-f none X11/lib/X11/xkb/keymap/sgi/us 0444 root bin
+d none X11/lib/X11/xkb/keymap/sgi_vndr 0755 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/be 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/bg 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/ca 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/cz 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/de 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/dk 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/dvorak 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/es 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/fi 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/fr 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/gb 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/hu 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/it 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/jp 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/no 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/pl 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/pt 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/ru 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/se 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/sk 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/th 0444 root bin
+f none X11/lib/X11/xkb/keymap/sgi_vndr/us 0444 root bin
 
-d none X11/lib/X11/xkb/keymap/sun 0755 root bin
-f none X11/lib/X11/xkb/keymap/sun/all 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/de 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/es 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/fi 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/fr 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/no 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/pl 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/ru 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/se 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/uk 0444 root bin
-f none X11/lib/X11/xkb/keymap/sun/us 0444 root bin
+d none X11/lib/X11/xkb/keymap/sun_vndr 0755 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/all 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/de 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/es 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/fi 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/fr 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/no 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/pl 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/ru 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/se 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/uk 0444 root bin
+f none X11/lib/X11/xkb/keymap/sun_vndr/us 0444 root bin
 
 d none X11/lib/X11/xkb/rules 0755 root bin
 f none X11/lib/X11/xkb/rules/README 0444 root bin
-f none X11/lib/X11/xkb/rules/sgi 0444 root bin
-f none X11/lib/X11/xkb/rules/sgi.lst 0444 root bin
-f none X11/lib/X11/xkb/rules/sun 0444 root bin
-f none X11/lib/X11/xkb/rules/sun.lst 0444 root bin
-s none X11/lib/X11/xkb/rules/xfree86=xorg
-s none X11/lib/X11/xkb/rules/xfree86.lst=xorg.lst
-s none X11/lib/X11/xkb/rules/xfree86.xml=xorg.xml
-f none X11/lib/X11/xkb/rules/xorg 0444 root bin
-f none X11/lib/X11/xkb/rules/xorg-it.lst 0444 root bin
-f none X11/lib/X11/xkb/rules/xorg.lst 0444 root bin
-f none X11/lib/X11/xkb/rules/xorg.xml 0444 root bin
+s none X11/lib/X11/xkb/rules/xfree86=base
+s none X11/lib/X11/xkb/rules/xfree86.lst=base.lst
+s none X11/lib/X11/xkb/rules/xfree86.xml=base.xml
+f none X11/lib/X11/xkb/rules/base 0444 root bin
+f none X11/lib/X11/xkb/rules/base.lst 0444 root bin
+f none X11/lib/X11/xkb/rules/base.xml 0444 root bin
+f none X11/lib/X11/xkb/rules/evdev 0444 root bin
+f none X11/lib/X11/xkb/rules/evdev.lst 0444 root bin
+f none X11/lib/X11/xkb/rules/evdev.xml 0444 root bin
+s none X11/lib/X11/xkb/rules/xorg=base
+s none X11/lib/X11/xkb/rules/xorg.lst=base.lst
+s none X11/lib/X11/xkb/rules/xorg.xml=base.xml
+f none X11/lib/X11/xkb/rules/xfree98 0444 root bin
+f none X11/lib/X11/xkb/rules/xkb.dtd 0444 root bin
 
 d none X11/lib/X11/xkb/semantics 0755 root bin
 f none X11/lib/X11/xkb/semantics/basic 0444 root bin
@@ -194,303 +193,209 @@
 
 f none X11/lib/X11/xkb/symbols.dir 0444 root bin
 d none X11/lib/X11/xkb/symbols 0755 root bin
-f none X11/lib/X11/xkb/symbols/README 0444 root bin
+f none X11/lib/X11/xkb/symbols/ad 0444 root bin
+f none X11/lib/X11/xkb/symbols/af 0444 root bin
 f none X11/lib/X11/xkb/symbols/al 0444 root bin
 f none X11/lib/X11/xkb/symbols/altwin 0444 root bin
 f none X11/lib/X11/xkb/symbols/am 0444 root bin
-f none X11/lib/X11/xkb/symbols/apple 0444 root bin
-f none X11/lib/X11/xkb/symbols/ar 0444 root bin
+f none X11/lib/X11/xkb/symbols/ara 0444 root bin
 f none X11/lib/X11/xkb/symbols/az 0444 root bin
+f none X11/lib/X11/xkb/symbols/ba 0444 root bin
+f none X11/lib/X11/xkb/symbols/bd 0444 root bin
 f none X11/lib/X11/xkb/symbols/be 0444 root bin
-f none X11/lib/X11/xkb/symbols/ben 0444 root bin
 f none X11/lib/X11/xkb/symbols/bg 0444 root bin
 f none X11/lib/X11/xkb/symbols/br 0444 root bin
-f none X11/lib/X11/xkb/symbols/bs 0444 root bin
+f none X11/lib/X11/xkb/symbols/braille 0444 root bin
+f none X11/lib/X11/xkb/symbols/bt 0444 root bin
 f none X11/lib/X11/xkb/symbols/by 0444 root bin
 f none X11/lib/X11/xkb/symbols/ca 0444 root bin
-f none X11/lib/X11/xkb/symbols/ca_bi 0444 root bin
-f none X11/lib/X11/xkb/symbols/ca_enhanced 0444 root bin
 f none X11/lib/X11/xkb/symbols/capslock 0444 root bin
+f none X11/lib/X11/xkb/symbols/cd 0444 root bin
+f none X11/lib/X11/xkb/symbols/ch 0444 root bin
+f none X11/lib/X11/xkb/symbols/cn 0444 root bin
 f none X11/lib/X11/xkb/symbols/compose 0444 root bin
 f none X11/lib/X11/xkb/symbols/ctrl 0444 root bin
 f none X11/lib/X11/xkb/symbols/cz 0444 root bin
-f none X11/lib/X11/xkb/symbols/cz_qwerty 0444 root bin
-f none X11/lib/X11/xkb/symbols/czsk 0444 root bin
 f none X11/lib/X11/xkb/symbols/de 0444 root bin
-f none X11/lib/X11/xkb/symbols/de_CH 0444 root bin
-f none X11/lib/X11/xkb/symbols/dev 0444 root bin
 f none X11/lib/X11/xkb/symbols/dk 0444 root bin
-f none X11/lib/X11/xkb/symbols/dvorak 0444 root bin
 f none X11/lib/X11/xkb/symbols/ee 0444 root bin
-f none X11/lib/X11/xkb/symbols/el 0444 root bin
-f none X11/lib/X11/xkb/symbols/en_US 0444 root bin
+f none X11/lib/X11/xkb/symbols/epo 0444 root bin
 f none X11/lib/X11/xkb/symbols/es 0444 root bin
+f none X11/lib/X11/xkb/symbols/et 0444 root bin
 f none X11/lib/X11/xkb/symbols/eurosign 0444 root bin
 f none X11/lib/X11/xkb/symbols/fi 0444 root bin
 f none X11/lib/X11/xkb/symbols/fo 0444 root bin
 f none X11/lib/X11/xkb/symbols/fr 0444 root bin
-f none X11/lib/X11/xkb/symbols/fr_CH 0444 root bin
 f none X11/lib/X11/xkb/symbols/gb 0444 root bin
+f none X11/lib/X11/xkb/symbols/ge 0444 root bin
+f none X11/lib/X11/xkb/symbols/gh 0444 root bin
+f none X11/lib/X11/xkb/symbols/gn 0444 root bin
 f none X11/lib/X11/xkb/symbols/gr 0444 root bin
-f none X11/lib/X11/xkb/symbols/ge_la 0444 root bin
-f none X11/lib/X11/xkb/symbols/ge_ru 0444 root bin
 f none X11/lib/X11/xkb/symbols/group 0444 root bin
-f none X11/lib/X11/xkb/symbols/guj 0444 root bin
-f none X11/lib/X11/xkb/symbols/gur 0444 root bin
 f none X11/lib/X11/xkb/symbols/hr 0444 root bin
-f none X11/lib/X11/xkb/symbols/hr_US 0444 root bin
 f none X11/lib/X11/xkb/symbols/hu 0444 root bin
-f none X11/lib/X11/xkb/symbols/hu_US 0444 root bin
-f none X11/lib/X11/xkb/symbols/hu_qwerty 0444 root bin
 f none X11/lib/X11/xkb/symbols/ie 0444 root bin
 f none X11/lib/X11/xkb/symbols/il 0444 root bin
-f none X11/lib/X11/xkb/symbols/il_phonetic 0444 root bin
+f none X11/lib/X11/xkb/symbols/in 0444 root bin
 f none X11/lib/X11/xkb/symbols/inet 0444 root bin
+f none X11/lib/X11/xkb/symbols/iq 0444 root bin
 f none X11/lib/X11/xkb/symbols/ir 0444 root bin
 f none X11/lib/X11/xkb/symbols/is 0444 root bin
-f none X11/lib/X11/xkb/symbols/iso9995-3 0444 root bin
 f none X11/lib/X11/xkb/symbols/it 0444 root bin
-f none X11/lib/X11/xkb/symbols/iu 0444 root bin
 f none X11/lib/X11/xkb/symbols/jp 0444 root bin
-f none X11/lib/X11/xkb/symbols/kan 0444 root bin
+f none X11/lib/X11/xkb/symbols/keypad 0444 root bin
+f none X11/lib/X11/xkb/symbols/kg 0444 root bin
+f none X11/lib/X11/xkb/symbols/kh 0444 root bin
+f none X11/lib/X11/xkb/symbols/kpdl 0444 root bin
+f none X11/lib/X11/xkb/symbols/kr 0444 root bin
 f none X11/lib/X11/xkb/symbols/kz 0444 root bin
-f none X11/lib/X11/xkb/symbols/keypad 0444 root bin
 f none X11/lib/X11/xkb/symbols/la 0444 root bin
+f none X11/lib/X11/xkb/symbols/latam 0444 root bin
+f none X11/lib/X11/xkb/symbols/latin 0444 root bin
 f none X11/lib/X11/xkb/symbols/level3 0444 root bin
-f none X11/lib/X11/xkb/symbols/lo 0444 root bin
-f none X11/lib/X11/xkb/symbols/lock 0444 root bin
+f none X11/lib/X11/xkb/symbols/level5 0444 root bin
+f none X11/lib/X11/xkb/symbols/lk 0444 root bin
 f none X11/lib/X11/xkb/symbols/lt 0444 root bin
-f none X11/lib/X11/xkb/symbols/lt_std 0444 root bin
 f none X11/lib/X11/xkb/symbols/lv 0444 root bin
+f none X11/lib/X11/xkb/symbols/ma 0444 root bin
+f none X11/lib/X11/xkb/symbols/mao 0444 root bin
+f none X11/lib/X11/xkb/symbols/me 0444 root bin
 f none X11/lib/X11/xkb/symbols/mk 0444 root bin
-f none X11/lib/X11/xkb/symbols/ml 0444 root bin
 f none X11/lib/X11/xkb/symbols/mm 0444 root bin
+f none X11/lib/X11/xkb/symbols/mn 0444 root bin
 f none X11/lib/X11/xkb/symbols/mt 0444 root bin
-f none X11/lib/X11/xkb/symbols/mt_us 0444 root bin
+f none X11/lib/X11/xkb/symbols/mv 0444 root bin
+f none X11/lib/X11/xkb/symbols/nbsp 0444 root bin
+f none X11/lib/X11/xkb/symbols/ng 0444 root bin
 f none X11/lib/X11/xkb/symbols/nl 0444 root bin
 f none X11/lib/X11/xkb/symbols/no 0444 root bin
-f none X11/lib/X11/xkb/symbols/ogham 0444 root bin
-f none X11/lib/X11/xkb/symbols/ori 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc104 0444 root bin
+f none X11/lib/X11/xkb/symbols/np 0444 root bin
+f none X11/lib/X11/xkb/symbols/olpc 0444 root bin
+f none X11/lib/X11/xkb/symbols/pc 0444 root bin
+f none X11/lib/X11/xkb/symbols/pk 0444 root bin
 f none X11/lib/X11/xkb/symbols/pl 0444 root bin
-f none X11/lib/X11/xkb/symbols/pl2 0444 root bin
-f none X11/lib/X11/xkb/symbols/pl_dev 0444 root bin
 f none X11/lib/X11/xkb/symbols/pt 0444 root bin
-f none X11/lib/X11/xkb/symbols/ralt 0444 root bin
 f none X11/lib/X11/xkb/symbols/ro 0444 root bin
-f none X11/lib/X11/xkb/symbols/ro2 0444 root bin
+f none X11/lib/X11/xkb/symbols/rs 0444 root bin
 f none X11/lib/X11/xkb/symbols/ru 0444 root bin
-f none X11/lib/X11/xkb/symbols/sapmi 0444 root bin
 f none X11/lib/X11/xkb/symbols/se 0444 root bin
-f none X11/lib/X11/xkb/symbols/se_FI 0444 root bin
-f none X11/lib/X11/xkb/symbols/se_NO 0444 root bin
-f none X11/lib/X11/xkb/symbols/se_SE 0444 root bin
+f none X11/lib/X11/xkb/symbols/shift 0444 root bin
 f none X11/lib/X11/xkb/symbols/si 0444 root bin
 f none X11/lib/X11/xkb/symbols/sk 0444 root bin
-f none X11/lib/X11/xkb/symbols/sk_qwerty 0444 root bin
-f none X11/lib/X11/xkb/symbols/sr 0444 root bin
 f none X11/lib/X11/xkb/symbols/srvr_ctrl 0444 root bin
-f none X11/lib/X11/xkb/symbols/syr 0444 root bin
-f none X11/lib/X11/xkb/symbols/syr_phonetic 0444 root bin
-f none X11/lib/X11/xkb/symbols/tel 0444 root bin
+f none X11/lib/X11/xkb/symbols/sy 0444 root bin
 f none X11/lib/X11/xkb/symbols/th 0444 root bin
-f none X11/lib/X11/xkb/symbols/th_pat 0444 root bin
-f none X11/lib/X11/xkb/symbols/th_tis 0444 root bin
 f none X11/lib/X11/xkb/symbols/tj 0444 root bin
-f none X11/lib/X11/xkb/symbols/tml 0444 root bin
 f none X11/lib/X11/xkb/symbols/tr 0444 root bin
-f none X11/lib/X11/xkb/symbols/tr_f 0444 root bin
 f none X11/lib/X11/xkb/symbols/ua 0444 root bin
 f none X11/lib/X11/xkb/symbols/us 0444 root bin
-f none X11/lib/X11/xkb/symbols/us_group2 0444 root bin
-f none X11/lib/X11/xkb/symbols/us_group3 0444 root bin
-f none X11/lib/X11/xkb/symbols/us_intl 0444 root bin
 f none X11/lib/X11/xkb/symbols/uz 0444 root bin
 f none X11/lib/X11/xkb/symbols/vn 0444 root bin
-f none X11/lib/X11/xkb/symbols/yu 0444 root bin
+f none X11/lib/X11/xkb/symbols/za 0444 root bin
 
-d none X11/lib/X11/xkb/symbols/digital 0755 root bin
-f none X11/lib/X11/xkb/symbols/digital/lk 0444 root bin
-f none X11/lib/X11/xkb/symbols/digital/pc 0444 root bin
-f none X11/lib/X11/xkb/symbols/digital/us 0444 root bin
-f none X11/lib/X11/xkb/symbols/digital/vt 0444 root bin
+d none X11/lib/X11/xkb/symbols/digital_vndr 0755 root bin
+f none X11/lib/X11/xkb/symbols/digital_vndr/lk 0444 root bin
+f none X11/lib/X11/xkb/symbols/digital_vndr/pc 0444 root bin
+f none X11/lib/X11/xkb/symbols/digital_vndr/us 0444 root bin
+f none X11/lib/X11/xkb/symbols/digital_vndr/vt 0444 root bin
 
-d none X11/lib/X11/xkb/symbols/fujitsu 0755 root bin
-f none X11/lib/X11/xkb/symbols/fujitsu/jp 0444 root bin
-f none X11/lib/X11/xkb/symbols/fujitsu/us 0444 root bin
+d none X11/lib/X11/xkb/symbols/fujitsu_vndr 0755 root bin
+f none X11/lib/X11/xkb/symbols/fujitsu_vndr/jp 0444 root bin
+f none X11/lib/X11/xkb/symbols/fujitsu_vndr/us 0444 root bin
 
-d none X11/lib/X11/xkb/symbols/hp 0755 root bin
-f none X11/lib/X11/xkb/symbols/hp/us 0444 root bin
+d none X11/lib/X11/xkb/symbols/hp_vndr 0755 root bin
+f none X11/lib/X11/xkb/symbols/hp_vndr/us 0444 root bin
 
-d none X11/lib/X11/xkb/symbols/macintosh 0755 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/de 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/de_CH 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/dk 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/es 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/fi 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/fr 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/fr_CH 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/gb 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/it 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/nl 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/no 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/pt 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/se 0444 root bin
-f none X11/lib/X11/xkb/symbols/macintosh/us 0444 root bin
+d none X11/lib/X11/xkb/symbols/macintosh_vndr 0755 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/apple 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/ch 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/de 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/dk 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/es 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/fi 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/fr 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/gb 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/is 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/it 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/latam 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/nl 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/no 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/pt 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/se 0444 root bin
+f none X11/lib/X11/xkb/symbols/macintosh_vndr/us 0444 root bin
 
-d none X11/lib/X11/xkb/symbols/nec 0755 root bin
-f none X11/lib/X11/xkb/symbols/nec/jp 0444 root bin
+d none X11/lib/X11/xkb/symbols/nec_vndr 0755 root bin
+f none X11/lib/X11/xkb/symbols/nec_vndr/jp 0444 root bin
+
+d none X11/lib/X11/xkb/symbols/sgi_vndr 0755 root bin
+f none X11/lib/X11/xkb/symbols/sgi_vndr/jp 0444 root bin
+
+d none X11/lib/X11/xkb/symbols/sony_vndr 0755 root bin
+f none X11/lib/X11/xkb/symbols/sony_vndr/us 0444 root bin
 
-d none X11/lib/X11/xkb/symbols/pc 0755 root bin
-f none X11/lib/X11/xkb/symbols/pc/al 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/am 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ara 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/az 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ba 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/bd 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/be 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/bg 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/br 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/bt 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/by 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ca 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ca_bi 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ca_enhanced 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ch 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/cz 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/cz_qwerty 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/czsk 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/de 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/de_CH 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/dk 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/dvorak 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ee 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/el 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/es 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/fi 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/fo 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/fr 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/fr_CH 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/gb 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ge 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/gr 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/hr 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/hr_US 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/hu 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/hu_qwerty 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ie 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/il 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/il_phonetic 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/in 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ir 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/is 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/it 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/jp 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/kg 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/kz 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/la 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/latam 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/latin 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/lk 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/lt 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/lv 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/mao 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/mkd 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/mm 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/mn 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/mt 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/nl 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/no 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/pc 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/pk 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/pl 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/pl_dev 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/pt 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ro 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ro2 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ru 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/se 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/si 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/sk 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/sk_qwerty 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/srp 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/sy 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/th 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/tj 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/tr 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/tr_f 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/ua 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/us 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/uz 0444 root bin
-f none X11/lib/X11/xkb/symbols/pc/vn 0444 root bin
+d none X11/lib/X11/xkb/symbols/sun_vndr 0755 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/am 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/ar 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/az 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/be 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/br 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/ca 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/ca_bi 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/cz 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/de 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/de_CH 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/dk 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/es 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/fi 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/fr 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/fr_CH 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/gb 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/ge 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/gr 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/hu 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/is 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/it 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/jp 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/kg 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/ko 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/kz 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/lt 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/lv 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/nl 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/no 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/pl 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/pl_dev 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/pt 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/ru 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/se 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/sk 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/solaris 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/sw 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/tj 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/tr 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/tr_f 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/tuv 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/tw 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/ua 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/us 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/usb 0444 root bin
+f none X11/lib/X11/xkb/symbols/sun_vndr/uz 0444 root bin
 
-d none X11/lib/X11/xkb/symbols/sgi 0755 root bin
-f none X11/lib/X11/xkb/symbols/sgi/jp 0444 root bin
-
-d none X11/lib/X11/xkb/symbols/sony 0755 root bin
-f none X11/lib/X11/xkb/symbols/sony/us 0444 root bin
-
-d none X11/lib/X11/xkb/symbols/sun 0755 root bin
-f none X11/lib/X11/xkb/symbols/sun/am 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/ar 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/az 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/be 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/br 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/ca 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/ca_bi 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/cs 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/cz 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/de 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/de_CH 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/dk 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/es 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/fi 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/fr 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/fr_CH 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/gb 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/ge 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/gr 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/hu 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/it 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/jp 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/kg 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/ko 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/kz 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/lt 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/lv 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/nl 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/no 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/pl 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/pl_dev 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/pt 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/ru 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/se 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/sk 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/solaris 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/sw 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/tj 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/tr 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/tr_f 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/tuv 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/tw 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/ua 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/us 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/usb 0444 root bin
-f none X11/lib/X11/xkb/symbols/sun/uz 0444 root bin
-
-d none X11/lib/X11/xkb/symbols/xfree68 0755 root bin
-f none X11/lib/X11/xkb/symbols/xfree68/amiga 0444 root bin
-f none X11/lib/X11/xkb/symbols/xfree68/ataritt 0444 root bin
+d none X11/lib/X11/xkb/symbols/xfree68_vndr 0755 root bin
+f none X11/lib/X11/xkb/symbols/xfree68_vndr/amiga 0444 root bin
+f none X11/lib/X11/xkb/symbols/xfree68_vndr/ataritt 0444 root bin
 
 f none X11/lib/X11/xkb/types.dir 0444 root bin
 d none X11/lib/X11/xkb/types 0755 root bin
 f none X11/lib/X11/xkb/types/README 0444 root bin
 f none X11/lib/X11/xkb/types/basic 0444 root bin
+f none X11/lib/X11/xkb/types/cancel 0444 root bin
 f none X11/lib/X11/xkb/types/caps 0444 root bin
 f none X11/lib/X11/xkb/types/complete 0444 root bin
 f none X11/lib/X11/xkb/types/default 0444 root bin
 f none X11/lib/X11/xkb/types/extra 0444 root bin
 f none X11/lib/X11/xkb/types/iso9995 0444 root bin
+f none X11/lib/X11/xkb/types/level5 0444 root bin
 f none X11/lib/X11/xkb/types/mousekeys 0444 root bin
 f none X11/lib/X11/xkb/types/numpad 0444 root bin
 f none X11/lib/X11/xkb/types/pc 0444 root bin
--- a/src/xorg/keytables/Makefile	Mon Mar 23 17:34:01 2009 +0100
+++ b/src/xorg/keytables/Makefile	Tue Mar 24 11:40:01 2009 +0100
@@ -23,12 +23,13 @@
 
 TARGETDIR = $(FILEROOT)/X11/lib/X11/xkb
 
-XKB_DIRFILES = compat.dir geometry.dir keycodes.dir keymap.dir symbols.dir types.dir
+XKB_DIRFILES = compat.dir geometry.dir keycodes.dir keymap.dir semantics.dir symbols.dir types.dir
 SUBDIRS = compat compiled geometry keycodes keymap rules semantics symbols types
 
-XKBDATA_SOURCE = xkbdata-1.0.1.tar.gz
-XKBDATA_SITE = http://ftp.x.org/pub/individual/data
-XKBDATA_DIR = xkbdata-1.0.1
+XKBDATA_SOURCE = xkeyboard-config-1.4.tar.gz
+# XKBDATA_SITE = http://ftp.x.org/pub/individual/data
+XKBDATA_SITE = http://xlibs.freedesktop.org/xkbdesc
+XKBDATA_DIR = xkeyboard-config-1.4
 
 
 all:=           TARGET= all
--- a/src/xorg/keytables/sun-src/README	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-X Keyboard Extension
---------------------
-
-The X Keyboard Extension essentially replaces the core protocol definition of
-keyboard. The extension makes possible to clearly and explicitly specify most
-aspects of keyboard behaviour on per-key basis and to more closely track the
-logical and physical state of the keyboard. It also includes a number of
-keyboard controls designed to make keyboards more accessible to people with
-physical impairments.
-
-There are five types of components in the server database corresponing to five
-xkb symbolic names: symbols, geometry, keycodes, compat and types which
-determine the keyboard behaviour. These five components can combined together
-into a resulting keyboard mapping using the 'rules' component.
-
-The complete specification can be found on
-http://www.x-docs.org/XKB/XKBproto.pdf
-
-For XKB configuration information see 'README.config' file.
-
-For information how to further enhance XKB configuration see 'README.enhancing'
-file.
-
-
-$XFree86$
--- a/src/xorg/keytables/sun-src/compat/japan	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-// $Xorg: japan,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Japanese keyboards need Eisu and Kana shift and 
-// lock keys, which are typically bound to the
-// second shift level for some other modifier key.
-// These interpretations disable the default
-// interpretation (which would have these keys set
-// the same modifier as the level one symbol).
-
-default partial xkb_compatibility "japan"  {
-
-    interpret.repeat= False;
-
-    interpret Eisu_Shift+Lock {
-	action= NoAction();
-    };
-
-    interpret Eisu_toggle+Lock {
-	action= NoAction();
-    };
-
-    interpret Kana_Shift+Lock {
-	action= NoAction();
-    };
-
-    interpret Kana_Lock+Lock {
-	action= NoAction();
-    };
-};
-
-// Some Japanese keyboards have an explict Kana Lock key & matching LED
-
-partial xkb_compatibility "kana_lock"  {
-
-    virtual_modifiers Kana_Lock;
-
-    interpret Kana_Lock+AnyOfOrNone(all) {
-        virtualModifier= Kana_Lock;
-        useModMapMods=level1;
-        action= LockGroup(group=+1);
-    };
-
-    indicator "Kana" {
-        !allowExplicit;
-	groups= All-Group1;
-    };
-};
--- a/src/xorg/keytables/sun-src/compat/mousekeys	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,225 +0,0 @@
-// $Xorg: mousekeys,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Interpretations for arrow keys and a bunch of other 
-// common keysyms which make it possible to bind "mouse" 
-// keys using xmodmap and activate or deactivate them 
-// from the keyboard.
-
-default partial xkb_compatibility "mousekeys" {
-
-    // Keypad actions.
-    //
-    interpret.repeat= True;
-
-    interpret KP_1 { 
-	action = MovePtr(x=-1,y= +1); 
-    };
-    interpret KP_End { 
-	action = MovePtr(x=-1,y= +1); 
-    };
-
-    interpret KP_2 { 
-	action = MovePtr(x=+0,y= +1); 
-    };
-    interpret KP_Down { 
-	action = MovePtr(x=+0,y= +1); 
-    };
-
-    interpret KP_3 { 
-	action = MovePtr(x=+1,y=+1); 
-    };
-    interpret KP_Next { 
- 	action = MovePtr(x=+1,y=+1); 
-    };
-
-    interpret KP_4 { 
-	action = MovePtr(x=-1,y=+0); 
-    };
-    interpret KP_Left { 
-	action = MovePtr(x=-1,y=+0); 
-    };
-
-    interpret KP_6 { 
-	action = MovePtr(x=+1,y=+0); 
-    };
-    interpret KP_Right { 
- 	action = MovePtr(x=+1,y=+0); 
-    };
-
-    interpret KP_7 { 
-	action = MovePtr(x=-1,y=-1); 
-    };
-    interpret KP_Home { 
-	action = MovePtr(x=-1,y=-1); 
-    };
-
-    interpret KP_8 { 
-	action = MovePtr(x=+0,y=-1); 
-    };
-    interpret KP_Up { 
-	action = MovePtr(x=+0,y=-1); 
-    };
-
-    interpret KP_9 { 
-	action = MovePtr(x=+1,y=-1); 
-    };
-    interpret KP_Prior { 
-	action = MovePtr(x=+1,y=-1); 
-    };
-
-    interpret KP_5 { 
-	action = PointerButton(button=default); 
-    };
-    interpret KP_Begin { 
-	action = PointerButton(button=default); 
-    };
-
-    interpret KP_F2 { 
-	action = SetPtrDflt(affect=defaultButton,button=1); 
-    };
-    interpret KP_Divide { 
-	action = SetPtrDflt(affect=defaultButton,button=1); 
-    };
-
-    interpret KP_F3 { 
-	action = SetPtrDflt(affect=defaultButton,button=2); 
-    };
-    interpret KP_Multiply { 
-	action = SetPtrDflt(affect=defaultButton,button=2); 
-    };
-
-    interpret KP_F4 { 
-	action = SetPtrDflt(affect=defaultButton,button=3); 
-    };
-    interpret KP_Subtract { 
-	action = SetPtrDflt(affect=defaultButton,button=3); 
-    };
-
-    interpret KP_Separator { 
-	action = PointerButton(button=default,count=2); 
-    };
-    interpret KP_Add { 
-	action = PointerButton(button=default,count=2);
-    };
-
-    interpret KP_0 { 
-	action = LockPointerButton(button=default,affect=lock); 
-    };
-    interpret KP_Insert { 
-	action = LockPointerButton(button=default,affect=lock); 
-    };
-
-    interpret KP_Decimal { 
-	action = LockPointerButton(button=default,affect=unlock); 
-    };
-    interpret KP_Delete { 
-	action = LockPointerButton(button=default,affect=unlock); 
-    };
-
-    // Additional mappings for Solaris keypad compatibility
-    interpret F25 { // aka KP_Divide
-	action = SetPtrDflt(affect=defaultButton,button=1); 
-    };
-    interpret F26 { // aka KP_Multiply
-	action = SetPtrDflt(affect=defaultButton,button=2); 
-    };
-    interpret F27 { // aka KP_Home
-	action = MovePtr(x=-1,y=-1); 
-    };
-    interpret F29 { // aka KP_Prior
-	action = MovePtr(x=+1,y=-1); 
-    };
-    interpret F31 { // aka KP_Begin
-	action = PointerButton(button=default); 
-    };
-    interpret F33 { // aka KP_End
-	action = MovePtr(x=-1,y= +1); 
-    };
-    interpret F35 { // aka KP_Next
- 	action = MovePtr(x=+1,y=+1); 
-    };
-
-    interpret.repeat= False;
-
-
-    // New Keysym Actions.
-    //
-    interpret Pointer_Button_Dflt {
-	action= PointerButton(button=default);
-    };
-    interpret Pointer_Button1 {
-	action= PointerButton(button=1);
-    };
-    interpret Pointer_Button2 {
-	action= PointerButton(button=2);
-    };
-    interpret Pointer_Button3 {
-	action= PointerButton(button=3);
-    };
-    interpret Pointer_DblClick_Dflt {
-	action= PointerButton(button=default,count=2);
-    };
-    interpret Pointer_DblClick1 {
-	action= PointerButton(button=1,count=2);
-    };
-    interpret Pointer_DblClick2 {
-	action= PointerButton(button=2,count=2);
-    };
-    interpret Pointer_DblClick3 {
-	action= PointerButton(button=3,count=2);
-    };
-    interpret Pointer_Drag_Dflt	{
-	action= LockPointerButton(button=default);
-    };
-    interpret Pointer_Drag1 {
-	action= LockPointerButton(button=1);
-    };
-    interpret Pointer_Drag2 {
-	action= LockPointerButton(button=2);
-    };
-    interpret Pointer_Drag3 {
-	action= LockPointerButton(button=3);
-    };
-
-    interpret Pointer_EnableKeys {
-	action= LockControls(controls=MouseKeys);
-    };
-    interpret Pointer_Accelerate {
-	action= LockControls(controls=MouseKeysAccel);
-    };
-    interpret Pointer_DfltBtnNext {
-	action= SetPtrDflt(affect=defaultButton,button= +1);
-    };
-    interpret Pointer_DfltBtnPrev {
-	action= SetPtrDflt(affect=defaultButton,button= -1);
-    };
-
-
-    // Allow an indicator for MouseKeys.
-    indicator "Mouse Keys" {
-//	!allowExplicit;
-	indicatorDrivesKeyboard;
-	controls= MouseKeys;
-    };
-};
--- a/src/xorg/keytables/sun-src/geometry/sun	Mon Mar 23 17:34:01 2009 +0100
+++ b/src/xorg/keytables/sun-src/geometry/sun	Tue Mar 24 11:40:01 2009 +0100
@@ -26,7 +26,7 @@
 //from The Open Group.
 //
 // ---------------------------------------------------------------------------
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -3062,6 +3062,26 @@
     description= "Sun Type6 Unix keyboard";
 };
 
+default xkb_geometry "type7" {
+    include "sun(t6)"
+    description= "Sun Type7 keyboard (US, Korea, Taiwan)";
+};
+
+xkb_geometry "type7jp" {
+    include "sun(t6jp)"
+    description= "Sun Type7 Japanese keyboard";
+};
+
+xkb_geometry "type7tuv" {
+    include "sun(t6tuv)"
+    description= "Sun Type7 TUV keyboard";
+};
+
+xkb_geometry "type7unix" {
+    include "sun(t6unix)"
+    description= "Sun Type7 Unix keyboard";
+};
+
 xkb_geometry "x86" {
     include "pc(pc101)"
     description= "x86 Style Keyboard";
--- a/src/xorg/keytables/sun-src/keycodes/sun	Mon Mar 23 17:34:01 2009 +0100
+++ b/src/xorg/keytables/sun-src/keycodes/sun	Tue Mar 24 11:40:01 2009 +0100
@@ -26,7 +26,7 @@
 //from The Open Group.
 //
 // ---------------------------------------------------------------------------
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -55,25 +55,6 @@
 //
 // ---------------------------------------------------------------------------
 //
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
 // $XFree86: xc/programs/xkbcomp/keycodes/sun,v 3.6 2003/08/09 14:30:48 pascal Exp $
 //
 
@@ -573,8 +554,37 @@
     include "sun(type5_euro)"
 };
 
+// Even though this is labeled as _usb, I verified these keycodes as accurate
+// on my type5 serial and type6 serial keyboards as well on linux-2.6 boxes.
+// I'm not sure where the "type5" keycodes above are coming from...
 xkb_keycodes "type6_usb" {
     include "xfree86"
+
+//    <STOP> = 232;
+//    <AGAI> = 133;
+//    <PROP> = 134;
+//    <UNDO> = 135;
+//    <FRNT> = 140;
+//    <COPY> = 248;
+//    <OPEN> = 191;
+//    <PAST> = 192;
+//    <FIND> = 122;
+//    <CUT>  = 188;
+
+ //   <HELP> = 245;
+
+    // The blank has keycode 239 on my type6 serial kb, but 134 on
+    // my type6 usb keyboard (same as <PROP>)
+//    <BLNK> = 239;
+
+    // AltGr + PrScr actually sends a different keycode
+//    <SYRQ> = 92;
+
+//    <MUTE> = 160;
+//    <VOL-> = 174;
+//    <VOL+> = 176;
+//    <POWR> = 222;
+
     indicator 4 = "Compose";
 };
 
--- a/src/xorg/keytables/sun-src/keymap/sun/all	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1113 +0,0 @@
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-//  x86 KEYBOARDS
-// 
-//  Generally, x86 keyboards fall into either pc101 (101-key) or pc102
-//  (102-key European) categories.  Symbol tables are typically formed by
-//  augmenting sun/us(pc101) or sun/us(pc102) with the "extra" symbols
-//  from the type5 definition.  Geometries and keycodes for many of
-//  these fall under sun(x86) or sun(x86tuv).
-// 
-//  USB KEYBOARDS
-//  
-//  Only the keycodes (scancodes) change in the Universal Serial Bus
-//  keyboard definitions.  Symbols are kept the same as in the type5
-//  case.  The USB HID spec is confusing on this point, but the
-//  scancodes described in it relate to physical keys, not symbols, as
-//  it might lead one to believe.
-//
-//  HOBO KEYBOARDS
-//
-//  Hobo keyboards are derived from type5 keyboards, which in turn,
-//  are all derived from the type5 US keyboard.  Use the
-//  appropriate set of keycodes and geometry (either type5hobo or
-//  type5tuvhobo) and select the symbol set sun/us(type5hobo) to
-//  replace sun/us(type5).  For example, Sweden5_Hobo:
-// 
-// xkb_keymap "Sweden5_Hobo" {
-//     xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-//     xkb_types		{ include "default"		};
-//     xkb_compatibility	{ include "default"		};
-//     xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
-//     xkb_geometry	{ include "sun(type5tuvhobo)"	};
-// };
-// 
-//  Doing it this way allows all the symbol changes for a particular
-//  type5 keyboard to hold for a Hobo keyboard; both keyboards, in
-//  this case, would use sun/se(type5) to augment the symbols in the
-//  US keboard definition.
-
-xkb_keymap "Belgian6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+be"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Belgian6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+be"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Canada4" {
-    xkb_keycodes	{ include "sun(type4_ca)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/ca(type4)"	};
-    xkb_geometry	{ include "sun(type4_ca)"	};
-};
-
-xkb_keymap "Canada_Fr5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Canada_Fr5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/ca(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Canada_Fr5_TBITS5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5tbits5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Canada_Fr_x86" {
-    xkb_keycodes	{ include "sun(x86ca)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/ca(x86)"};
-    xkb_geometry	{ include "sun(x86ca)"		};
-};
-
-xkb_keymap "Switzer_Fr4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/sw(type4fr)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Switzer_Fr6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Fr_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5fr)"};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Switzer_Ge4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/sw(type4de)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Switzer_Ge6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Switzer_Ge_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5de)"};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Czech5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/cz(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Germany4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/de(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Germany5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+de"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Germany5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+de"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Germany6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+de"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Germany6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+de"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Germany_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+de"};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Denmark4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/dk(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Denmark5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Denmark5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Denmark6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Denmark6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Denmark_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/dk(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "SpainLatAm4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/es(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Spain5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Spain5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/es(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Spain6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Spain6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Spain_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/es(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-
-xkb_keymap "Finnish6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Finnish6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fi"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-
-xkb_keymap "FranceBelg4" {
-    xkb_keycodes	{ include "sun(type4tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/fr(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "France5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)" };
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "France5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/fr(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "France6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "France6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "France_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/fr(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Greece5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/gr(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Hungary5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5basic)+sun/hu(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Italy4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/it(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Italy5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Italy5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/it(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Italy6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Italy6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Italy_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/it(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Japan4" {
-    xkb_keycodes	{ include "sun(type4_jp)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(type4)"	};
-    xkb_geometry	{ include "sun(type4jp)"	};
-};
-
-xkb_keymap "Japan5" {
-    xkb_keycodes	{ include "sun(type5_jp)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(type5)"	};
-    xkb_geometry	{ include "sun(type5jp)"	};
-};
-
-xkb_keymap "Japan5_Hobo" {
-    xkb_keycodes	{ include "sun(type5_jphobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(type5hobo)"	};
-    xkb_geometry	{ include "sun(type5jphobo)"	};
-};
-
-xkb_keymap "Japan6" {
-    xkb_keycodes	{ include "sun(type6_jp)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default+japan(kana_lock)"	};
-    xkb_symbols		{ include "sun/jp(type6)"	};
-    xkb_geometry	{ include "sun(type6jp)"	};
-};
-
-xkb_keymap "Japan6_usb" {
-    xkb_keycodes	{ include "sun(type6_jp_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default+japan(kana_lock)"	};
-    xkb_symbols		{ include "sun/jp(type6)"	};
-    xkb_geometry	{ include "sun(type6jp)"	};
-};
-
-xkb_keymap "Japan_x86" {
-    xkb_keycodes	{ include "sun(x86jp)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(x86)"		};
-    xkb_geometry	{ include "sun(x86jp)"		};
-};
-
-xkb_keymap "J3100" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(J3100)"		};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Japan_Muhenkan_x86" {
-    xkb_keycodes	{ include "sun(x86jp)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/jp(Muhenkan_x86)"		};
-    xkb_geometry	{ include "sun(x86jp)"		};
-};
-
-xkb_keymap "Korea4" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/ko(type4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-
-xkb_keymap "Korea5" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-
-xkb_keymap "Korea5_Hobo" {
-    xkb_keycodes	{ include "sun(type5hobo)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/ko(type5)"};
-    xkb_geometry	{ include "sun(type5hobo)"		};
-};
-
-xkb_keymap "Korea6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "Korea6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "Korea_x86" {
-    xkb_keycodes	{ include "sun(x86ko)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/ko(type5)"	};
-    xkb_geometry	{ include "sun(x86ko)"		};
-};
-
-xkb_keymap "Lithuania5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5basic)+sun/lt(type5)" };
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-
-xkb_keymap "Latvia5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5basic)+sun/lv(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "MS_US101A_x86" {
-    xkb_keycodes	{ include "sun(MS_x86)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc104)"		};
-    xkb_geometry	{ include "sun(MS_x86)"		};
-};
-
-xkb_keymap "Netherland4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/nl(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Netherland5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+nl"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Netherland5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+nl"	};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Netherland6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+nl"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Netherland6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+nl"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Netherland_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+nl"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Norway4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/no(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Norway5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Norway5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/no(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Norway6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Norway6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Norway_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/no(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Poland5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/pl"		};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Portugal4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/pt(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Portugal5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Portugal5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/pt(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Portugal6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Portugal6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Portugal_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/pt(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-// xkb_keymap "Russia4" {
-//     xkb_keycodes	{ include "sun(type4)"		};
-//     xkb_types		{ include "default"		};
-//     xkb_compatibility	{ include "default"		};
-//     xkb_symbols		{ include "sun/ru"		};
-//     xkb_geometry	{ include "sun(type4)"		};
-// };
-
-xkb_keymap "Russia5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Russia6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Russia6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "SwedenFin4" {
-    xkb_keycodes	{ include "sun(type4tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/se(type4)"	};
-    xkb_geometry	{ include "sun(type4tuv)"	};
-};
-
-xkb_keymap "Sweden5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Sweden5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "Sweden6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Sweden6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Sweden_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+sun/se(type5)"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "Turkey5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "Turkey6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "Turkey6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "TurkeyQ6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "TurkeyQ6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "TurkeyF6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "TurkeyF6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "Taiwan4" {
-    xkb_keycodes	{ include "sun(type4)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/tw(type4)"	};
-    xkb_geometry	{ include "sun(type4)"	};
-};
-
-xkb_keymap "Taiwan5" {
-    xkb_keycodes	{ include "sun(type5)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type5)"	};
-};
-
-xkb_keymap "Taiwan5_Hobo" {
-    xkb_keycodes	{ include "sun(type5hobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type5hobo)"	};
-};
-
-xkb_keymap "Taiwan6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "Taiwan6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};
-    xkb_geometry	{ include "sun(type6)"	};
-};
-
-xkb_keymap "Taiwan_x86" {
-    xkb_keycodes	{ include "sun(x86)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc101)"	};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "UK4" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/gb(type4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-
-xkb_keymap "UK5" {
-    xkb_keycodes	{ include "sun(type5tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type5tuv)"	};
-};
-
-xkb_keymap "UK5_Hobo" {
-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type5hobo)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type5tuvhobo)"	};
-};
-
-xkb_keymap "UK6" {
-    xkb_keycodes	{ include "sun(type6tuv)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "UK6_usb" {
-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};
-    xkb_geometry	{ include "sun(type6tuv)"	};
-};
-
-xkb_keymap "UK_x86" {
-    xkb_keycodes	{ include "sun(x86tuv)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc102)+gb"	};
-    xkb_geometry	{ include "sun(x86tuv)"		};
-};
-
-xkb_keymap "US101A_PC" {
-    xkb_keycodes	{ include "sun(type5x86)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/us(pc101currency)"};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "US101A_Sun" {
-    xkb_keycodes	{ include "sun(type5x86)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "sun/us(pc101)+sun/us(US101A_Sun)"	};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "US101A_x86" {
-    xkb_keycodes	{ include "sun(x86)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc101)"		};
-    xkb_geometry	{ include "sun(x86)"		};
-};
-
-xkb_keymap "US4" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-
-xkb_keymap "US5" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-
-xkb_keymap "US5_Hobo" {
-    xkb_keycodes	{ include "sun(type5hobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5hobo)"	};
-    xkb_geometry	{ include "sun(type5hobo)"	};
-};
-
-xkb_keymap "US_UNIX5" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5)"	};
-    xkb_geometry	{ include "sun(type5unix)"	};
-};
-
-xkb_keymap "US_UNIX5_Hobo" {
-    // Same as US5_Hobo
-    xkb_keycodes	{ include "sun(type5hobo)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type5hobo)"	};
-    xkb_geometry	{ include "sun(type5hobo)"	};
-};
-
-xkb_keymap "US6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "US6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6)"		};
-};
-
-xkb_keymap "US_UNIX6" {
-    xkb_keycodes	{ include "sun(type6)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6unix)"	};
-};
-
-xkb_keymap "US_UNIX6_usb" {
-    xkb_keycodes	{ include "sun(type6_usb)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun/us(type6)"	};
-    xkb_geometry	{ include "sun(type6unix)"	};
-};
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/rules/base	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,1052 @@
+// 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
+// uncomment lines below
+//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
+//              in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
+//              ru scc sy syr tel th tj tam ua uz
+
+// PC models
+! $pcmodels = pc101 pc102 pc104 pc105
+
+// Microsoft models (using MS geometry)
+! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
+
+// PC geometries - they have special geometry but symbols are mostly pc105
+! $pcgeometries = abnt2 latitude jp106 kr106
+
+// Layouts that provide further specializations for the OLPC
+! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us 
+
+! $macbooks = macbook78 macbook79
+! $maclaptop = ibook powerbook macbook78 macbook79
+! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
+
+! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us
+
+! $azerty = be fr
+! $qwertz = al cz de hr hu ro si sk 
+
+! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
+              acer_c300 acer_ferrari4k acer_laptop \
+              acpi airkey \
+              apple armada asus_laptop azonaRF2300 \
+              benqx brother \
+              btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+              cherryblue cherrybluea cherryblueb cherrycyboard \
+              chicony chicony0108 chicony9885 \
+              compaqeak8 compaqik7 compaqik13 compaqik18 \
+              cymotionlinux \
+              dell dellm65 inspiron precision_m dellusbmm dtk2000 \
+              emachines ennyah_dkb1008 evdev fscaa1667g \
+              genius geniuscomfy geniuscomfy2 geniuskb19e \
+              gyration honeywell_euroboard \
+              hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
+              ibm_spacesaver ipaq inspiron intel latitude \
+              logiaccess logicda logicink \
+              logiex110 logiclx300 \
+              logiinkse logiinkseusb logiitc logiik \
+              logitech_base itouch logiultrax \
+              logitech_g15 \
+	      logidinovo logidinovoedge \
+              microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
+              microsoftoffice microsoftmult \
+              mx1998 mx2500 mx2750 \
+              oretec \
+              presario propeller \
+              qtronix \
+              rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
+              samsung4500 samsung4510 \
+              scorpius silvercrest \
+              sk1300 sk2500 sk6200 sk7100 sp_inet \
+              sven sven303 symplon \
+              toshiba_s3000 trust trustda \
+              yahoo
+
+// all layouts with 3rd and 4th groups
+! $threelevellayouts = al az \
+              be br bt \
+              ca ch cs cz \
+              de dk \
+              ee es \
+              fi fo fr \
+              gb gr \
+              hu \
+              ie ir is it \
+              kg \
+              latam \
+              lk lt \
+              mn mt \
+              nl no \
+              pl pt \
+              ro \
+              se sk \
+              tr \
+              us \
+              vn \
+              za
+
+
+! $dvoraklayouts = br ca de ee es fr gb no pl se us
+
+! $sun = sun_type4 sun_type4_ca sun_type4_jp sun_type4_euro sun_type5 sun_type5_euro sun_type5_jp sun_type5_unix sun_type5_hobo sun_type5_euro_hobo sun_type5_jp_hobo sun_type5_unix_hobo sun_type6 sun_type6_euro sun_type6_jp sun_type6_unix sun_type6_usb sun_type6_euro_usb sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb sun_type7 sun_type7_euro sun_type7_unix sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb
+! $sun_type4 = sun_type4 sun_type4_ca sun_type4_jp sun_type4_euro
+! $sun_type5 = sun_type5 sun_type5_euro sun_type5_jp sun_type5_unix
+! $sun_hobo = sun_type5_hobo sun_type5_euro_hobo sun_type5_jp_hobo sun_type5_unix_hobo
+! $sun_type6 = sun_type6 sun_type6_euro sun_type6_jp sun_type6_unix sun_type6_usb sun_type6_euro_usb sun_type6_jp_usb sun_type6_unix_usb
+! $sun_type7 = sun_type7_jp_usb sun_type7 sun_type7_euro sun_type7_unix sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb
+! $sun_jp = sun_type4_jp sun_type5_jp sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
+
+// Sun Type 6 keyboards with custom/non-standard layouts
+! $sun_t6_custom = am ar az be br ca_bi cz de de_CH \
+                   dk dvorak es fi fr fr_CH gb ge gr \
+                   it jp kg ko kz nl no pl_dev \
+                   pt ru se sk tj tr tr_f tw \
+                   ua uz
+// Sun Type 7 Keyboards with custom/non-standard layouts
+! $sun_t7_custom = am ar az be br ca_bi cz de de_CH \
+                   dk dvorak es fi fr fr_CH gb ge gr \
+                   it jp kg ko kz nl no pl_dev \
+                   pt ru se sk tj tr tr_f tw \
+                   ua uz
+
+
+! model		=	keycodes
+  amiga		=	amiga(de)
+  ataritt	=	ataritt(de)
+ $sun_jp        =       sun(type6_jp_usb)
+ $sun           =       sun(type6_usb)
+  pc98		=	xfree98(pc98)
+  abnt2		=	xfree86(abnt2)
+  jp106		=	sun(type6_jp_usb)
+  evdev		=	evdev
+  olpc		=	evdev
+  macintosh_hhk	=	macintosh(hhk)
+  macintosh_old	=	macintosh(old)
+ $macbooks	=	macintosh+macintosh(goodmap)
+ $macs   	=	macintosh
+  thinkpadz60	=	xfree86(thinkpadz60)
+  *		=	xfree86
+
+! layout[1]	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! layout	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! option	=	keycodes
+  apple:badmap		=	+macintosh(badmap)
+  apple:goodmap		=	+macintosh(goodmap)
+
+! model		layout	=	geometry
+  thinkpad     us              =       thinkpad(us)
+
+! model		=	geometry
+  microsoftelite	=	microsoft(elite)
+ $msmodels	=	microsoft(natural)
+  dell101	=	dell(dell101)
+  dellm65	=	dell(dellm65)
+  flexpro	=	keytronic(FlexPro)
+  hp6000	=	hp(omnibook)
+  omnikey101	=	northgate(omnikey101)
+ $pcmodels	=	pc(%m)
+ $pcgeometries	=	pc(%m)
+  everex	=	everex(STEPnote)
+  thinkpad	=	thinkpad(intl)
+  thinkpad60	=	thinkpad(60)
+  thinkpadz60	=	thinkpad(60)
+  winbook	=	winbook(XP5)
+  pc98		=	nec(pc98)
+ $macbooks      =       macintosh(%m)
+ $macs		=	macintosh(macintosh)
+  hhk		=	hhk(basic)
+  kinesis	=	kinesis(model100)
+  sun_type4             =    sun(type4)
+  sun_type4_ca          =    sun(type4_ca)
+  sun_type4_jp          =    sun(type4jp)
+  sun_type4_euro        =    sun(type4tuv)
+  sun_type5             =    sun(type5)
+  sun_type5_euro        =    sun(type5tuv)
+  sun_type5_jp          =    sun(type5jp)
+  sun_type5_unix        =    sun(type5unix)
+  sun_type5_hobo        =    sun(type5hobo)
+  sun_type5_euro_hobo   =    sun(type5tuvhobo)
+  sun_type5_jp_hobo     =    sun(type5jphobo)
+  sun_type5_unix_hobo   =    sun(type5hobo)
+  sun_type6             =    sun(type6)
+  sun_type6_euro        =    sun(type6tuv)
+  sun_type6_jp          =    sun(type6jp)
+  sun_type6_unix        =    sun(type6unix)
+  sun_type6_usb         =    sun(type6)
+  sun_type6_euro_usb    =    sun(type6tuv)
+  sun_type6_jp_usb      =    sun(type6jp)
+  sun_type6_unix_usb    =    sun(type6unix)
+  sun_type7_jp_usb      =    sun(type6jp)
+  sun_type7             =    sun(type7)
+  sun_type7_euro        =    sun(type7tuv)
+  sun_type7_unix        =    sun(type7unix)
+  sun_type7_usb         =    sun(type7)
+  sun_type7_euro_usb    =    sun(type7tuv)
+  sun_type7_unix_usb    =    sun(type7unix)
+  *		=       pc(pc104)
+
+! model		layout		variant		=	symbols
+  *		ben		basic		=	pc+in(ben)
+  *		ben		probhat		=	pc+in(ben_probhat)
+  *		dev		basic		=	pc+in(deva)
+  *		dvorak		$dvoraklayouts		=	pc+%v(dvorak)
+  *		dvorak		basic		=	pc+us(dvorak)
+  *		dvorak		pl_basic		=	pc+pl(dvorak)
+  *		dvorak		pl		=	pc+pl(dvorak_quotes)
+  *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
+  *		dzdwi		basic		=	pc+bt(basic)
+  *		fi		basic		=	pc+fi(classic)
+  *		ge		azerty_tskapo		=	pc+fr(geo)
+  *		guj		basic		=	pc+in(guj)
+  *		gur		basic		=	pc+in(guru)
+  *		ie		laptop		=	pc+ie(basic)
+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
+  *		il		si1452		=	pc+ie(basic)
+  *		iu		basic		=	pc+ca(ike)
+  *		lo		basic		=	pc+la(basic)
+  *		kan		basic		=	pc+in(kan)
+  *		mal		basic		=	pc+in(mal)
+  *		mal		mlplusnum		=	pc+in(mal)
+  *		ogham		basic		=	pc+ie(ogam)
+  *		ogham		laptop		=	pc+ie(ogam)
+  *		ogham		is434		=	pc+ie(ogam_is434)
+  *		ogham		is434laptop		=	pc+ie(ogam_is434)
+  *		ori		basic		=	pc+in(ori)
+  *		ro		de		=	pc+ro(winkeys)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma		=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
+  *		ru		os		=	pc+ru(os_legacy)
+  *		sapmi		basic		=	pc+no(smi)
+  *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
+  *		sapmi		sefi		=	pc+fi(smi)
+  *		sin		phonetic-static		=	pc+in(sin_phonetic)
+  *		syr		basic		=	pc+sy(syc)
+  *		syr		phonetic		=	pc+sy(syc_phonetic)
+  *		tam		INSCRIPT		=	pc+in(tam)
+  *		tam		UNI		=	pc+in(tam_unicode)
+  *		tam		TAB		=	pc+in(tam_TAB)
+  *		tam		TSCII		=	pc+in(tam_TSCII)
+  *		tel		basic		=	pc+in(tel)
+  *		yu		basic		=	pc+srp(latin)
+  *		yu		unicode		=	pc+srp(latinunicode)
+  *		yu		yz		=	pc+srp(latinyz)
+  *		yu		unicodeyz		=	pc+srp(latinunicodeyz)
+  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)
+
+! model		layout				=	symbols
+  *		ar			=	pc+ara
+  *		ben			=	pc+in(ben)
+  *		bs			=	pc+ba
+  *		cs			=	pc+rs
+  *		cz_qwerty			=	pc+cz(qwerty)
+  *		dev			=	pc+in(deva)
+  *		dvorak			=	pc+us(dvorak)
+  *		dzdwi			=	pc+bt
+  *		el			=	pc+gr
+  *		en_US			=	pc+latin
+  *		guj			=	pc+in(guj)
+  *		gur			=	pc+in(guru)
+  *		iu			=	pc+ca(ike)
+  *		lo			=	pc+la
+  *		kan			=	pc+in(kan)
+  *		mi			=	pc+mao
+  *		ml			=	pc+in(mal)
+  *		ogham			=	pc+ie(ogam)
+  *		ori			=	pc+ie(ori)
+  *		sapmi			=	pc+no(smi)
+  *		sr			=	pc+srp
+  *		syr			=	pc+sy(syc)
+  *		tel			=	pc+in(tel)
+  *		tml			=	pc+in(tam)
+  *		yu			=	pc+srp
+  *		fr-latin9			=	pc+fr(latin9)
+  *		us_intl			=	pc+us(alt-intl)
+  *		ben(basic)			=	pc+in(ben)
+  *		ben(probhat)			=	pc+in(ben_probhat)
+  *		dev(basic)			=	pc+in(deva)
+  *		dvorak($dvoraklayouts)			=	pc+%v(dvorak)
+  *		dvorak(basic)			=	pc+us(dvorak)
+  *		dvorak(pl_basic)			=	pc+pl(dvorak)
+  *		dvorak(pl)			=	pc+pl(dvorak_quotes)
+  *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
+  *		dzdwi(basic)			=	pc+bt(basic)
+  *		fi(basic)			=	pc+fi(classic)
+  *		ge(azerty_tskapo)			=	pc+fr(geo)
+  *		guj(basic)			=	pc+in(guj)
+  *		gur(basic)			=	pc+in(guru)
+  *		ie(laptop)			=	pc+ie(basic)
+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
+  *		il(si1452)			=	pc+ie(basic)
+  *		iu(basic)			=	pc+ca(ike)
+  *		lo(basic)			=	pc+la(basic)
+  *		kan(basic)			=	pc+in(kan)
+  *		mal(basic)			=	pc+in(mal)
+  *		mal(mlplusnum)			=	pc+in(mal)
+  *		ogham(basic)			=	pc+ie(ogam)
+  *		ogham(laptop)			=	pc+ie(ogam)
+  *		ogham(is434)			=	pc+ie(ogam_is434)
+  *		ogham(is434laptop)			=	pc+ie(ogam_is434)
+  *		ori(basic)			=	pc+in(ori)
+  *		ro(de)			=	pc+ro(winkeys)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)			=	pc+ro(std)
+  *		ro(comma)			=	pc+ro(basic)
+  *		ru(os)			=	pc+ru(os_legacy)
+  *		sapmi(basic)			=	pc+no(smi)
+  *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
+  *		sapmi(sefi)			=	pc+fi(smi)
+  *		sin(phonetic-static)			=	pc+in(sin_phonetic)
+  *		syr(basic)			=	pc+sy(syc)
+  *		syr(phonetic)			=	pc+sy(syc_phonetic)
+  *		tam(INSCRIPT)			=	pc+in(tam)
+  *		tam(UNI)			=	pc+in(tam_unicode)
+  *		tam(TAB)			=	pc+in(tam_TAB)
+  *		tam(TSCII)			=	pc+in(tam_TSCII)
+  *		tel(basic)			=	pc+in(tel)
+  *		yu(basic)			=	pc+srp(latin)
+  *		yu(unicode)			=	pc+srp(latinunicode)
+  *		yu(yz)			=	pc+srp(latinyz)
+  *		yu(unicodeyz)			=	pc+srp(latinunicodeyz)
+  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
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l%(v)
+  classmate	us			=	pc+%l(classmate)
+ $sun_type4     *       =       sun_vndr/us(type4)+sun_vndr/%l(type4)
+ $sun_type5     *       =       sun_vndr/us(type5)+sun_vndr/%l(type5)
+ $sun_hobo      *       =       sun_vndr/us(type5hobo)+sun_vndr/%l(type5hobo)
+ $sun_type6     us      =       sun_vndr/us(type6)+sun_vndr/solaris(defaults)
+ $sun_type6     jp      =       sun_vndr/us(type6)+sun_vndr/jp(type6)
+ $sun_type7     jp      =       sun_vndr/us(type6)+sun_vndr/jp(type7)
+  jp106         jp      =       sun_vndr/us(type6)+sun_vndr/jp(type7)
+ $sun_type6    $sun_t6_custom  =       sun_vndr/us(type6)+sun_vndr/%l(type6)
+ $sun_type6     *       =       pc+sun_vndr/us(type6)+%l%(v)
+ $sun_type7     us      =       sun_vndr/us(type6)+sun_vndr/solaris(defaults)
+ $sun_type7    $sun_t7_custom  =       sun_vndr/us(type6)+sun_vndr/%l(type6)
+ $sun_type7     *       =       pc+sun_vndr/us(type6)+%l%(v)            
+  pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
+  macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
+ $macs		en_US			=	pc+macintosh_vndr/us(extended)
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+  olpc		$olpclayouts		=	olpc+%l%(m)
+  olpc		*			=	olpc+%l%(v)
+  thinkpad   	br			=	pc+br(thinkpad)
+  *	   	$nonlatin		=	pc+us+%l%(v):2
+  *		*			=	pc+%l%(v)
+
+! model		layout[1]			=	symbols
+  *		ar			=	pc+ara%(v[1])
+  *		ben			=	pc+in(ben)%(v[1])
+  *		bs			=	pc+ba%(v[1])
+  *		cs			=	pc+rs%(v[1])
+  *		cz_qwerty			=	pc+cz(qwerty)%(v[1])
+  *		dev			=	pc+in(deva)%(v[1])
+  *		dvorak			=	pc+us(dvorak)%(v[1])
+  *		dzdwi			=	pc+bt%(v[1])
+  *		el			=	pc+gr%(v[1])
+  *		en_US			=	pc+latin%(v[1])
+  *		guj			=	pc+in(guj)%(v[1])
+  *		gur			=	pc+in(guru)%(v[1])
+  *		iu			=	pc+ca(ike)%(v[1])
+  *		lo			=	pc+la%(v[1])
+  *		kan			=	pc+in(kan)%(v[1])
+  *		mi			=	pc+mao%(v[1])
+  *		ml			=	pc+in(mal)%(v[1])
+  *		ogham			=	pc+ie(ogam)%(v[1])
+  *		ori			=	pc+ie(ori)%(v[1])
+  *		sapmi			=	pc+no(smi)%(v[1])
+  *		sr			=	pc+srp%(v[1])
+  *		syr			=	pc+sy(syc)%(v[1])
+  *		tel			=	pc+in(tel)%(v[1])
+  *		tml			=	pc+in(tam)%(v[1])
+  *		yu			=	pc+srp%(v[1])
+  *		fr-latin9			=	pc+fr(latin9)%(v[1])
+  *		us_intl			=	pc+us(alt-intl)%(v[1])
+  *		ben(basic)			=	pc+in(ben)
+  *		ben(probhat)			=	pc+in(ben_probhat)
+  *		dev(basic)			=	pc+in(deva)
+  *		dvorak($dvoraklayouts)			=	pc+%v(dvorak)
+  *		dvorak(basic)			=	pc+us(dvorak)
+  *		dvorak(pl_basic)			=	pc+pl(dvorak)
+  *		dvorak(pl)			=	pc+pl(dvorak_quotes)
+  *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
+  *		dzdwi(basic)			=	pc+bt(basic)
+  *		fi(basic)			=	pc+fi(classic)
+  *		ge(azerty_tskapo)			=	pc+fr(geo)
+  *		guj(basic)			=	pc+in(guj)
+  *		gur(basic)			=	pc+in(guru)
+  *		ie(laptop)			=	pc+ie(basic)
+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
+  *		il(si1452)			=	pc+ie(basic)
+  *		iu(basic)			=	pc+ca(ike)
+  *		lo(basic)			=	pc+la(basic)
+  *		kan(basic)			=	pc+in(kan)
+  *		mal(basic)			=	pc+in(mal)
+  *		mal(mlplusnum)			=	pc+in(mal)
+  *		ogham(basic)			=	pc+ie(ogam)
+  *		ogham(laptop)			=	pc+ie(ogam)
+  *		ogham(is434)			=	pc+ie(ogam_is434)
+  *		ogham(is434laptop)			=	pc+ie(ogam_is434)
+  *		ori(basic)			=	pc+in(ori)
+  *		ro(de)			=	pc+ro(winkeys)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)			=	pc+ro(std)
+  *		ro(comma)			=	pc+ro(basic)
+  *		ru(os)			=	pc+ru(os_legacy)
+  *		sapmi(basic)			=	pc+no(smi)
+  *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
+  *		sapmi(sefi)			=	pc+fi(smi)
+  *		sin(phonetic-static)			=	pc+in(sin_phonetic)
+  *		syr(basic)			=	pc+sy(syc)
+  *		syr(phonetic)			=	pc+sy(syc_phonetic)
+  *		tam(INSCRIPT)			=	pc+in(tam)
+  *		tam(UNI)			=	pc+in(tam_unicode)
+  *		tam(TAB)			=	pc+in(tam_TAB)
+  *		tam(TSCII)			=	pc+in(tam_TSCII)
+  *		tel(basic)			=	pc+in(tel)
+  *		yu(basic)			=	pc+srp(latin)
+  *		yu(unicode)			=	pc+srp(latinunicode)
+  *		yu(yz)			=	pc+srp(latinyz)
+  *		yu(unicodeyz)			=	pc+srp(latinunicodeyz)
+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
+  thinkpad	br			=	pc+%l[1](thinkpad)
+  *		*			=	pc+%l[1]%(v[1])
+
+! model		layout[1]	variant[1]	=	symbols
+  *		ben		basic		=	pc+in(ben)
+  *		ben		probhat		=	pc+in(ben_probhat)
+  *		dev		basic		=	pc+in(deva)
+  *		dvorak		$dvoraklayouts		=	pc+%v(dvorak)
+  *		dvorak		basic		=	pc+us(dvorak)
+  *		dvorak		pl_basic		=	pc+pl(dvorak)
+  *		dvorak		pl		=	pc+pl(dvorak_quotes)
+  *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
+  *		dzdwi		basic		=	pc+bt(basic)
+  *		fi		basic		=	pc+fi(classic)
+  *		ge		azerty_tskapo		=	pc+fr(geo)
+  *		guj		basic		=	pc+in(guj)
+  *		gur		basic		=	pc+in(guru)
+  *		ie		laptop		=	pc+ie(basic)
+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
+  *		il		si1452		=	pc+ie(basic)
+  *		iu		basic		=	pc+ca(ike)
+  *		lo		basic		=	pc+la(basic)
+  *		kan		basic		=	pc+in(kan)
+  *		mal		basic		=	pc+in(mal)
+  *		mal		mlplusnum		=	pc+in(mal)
+  *		ogham		basic		=	pc+ie(ogam)
+  *		ogham		laptop		=	pc+ie(ogam)
+  *		ogham		is434		=	pc+ie(ogam_is434)
+  *		ogham		is434laptop		=	pc+ie(ogam_is434)
+  *		ori		basic		=	pc+in(ori)
+  *		ro		de		=	pc+ro(winkeys)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma		=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
+  *		ru		os		=	pc+ru(os_legacy)
+  *		sapmi		basic		=	pc+no(smi)
+  *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
+  *		sapmi		sefi		=	pc+fi(smi)
+  *		sin		phonetic-static		=	pc+in(sin_phonetic)
+  *		syr		basic		=	pc+sy(syc)
+  *		syr		phonetic		=	pc+sy(syc_phonetic)
+  *		tam		INSCRIPT		=	pc+in(tam)
+  *		tam		UNI		=	pc+in(tam_unicode)
+  *		tam		TAB		=	pc+in(tam_TAB)
+  *		tam		TSCII		=	pc+in(tam_TSCII)
+  *		tel		basic		=	pc+in(tel)
+  *		yu		basic		=	pc+srp(latin)
+  *		yu		unicode		=	pc+srp(latinunicode)
+  *		yu		yz		=	pc+srp(latinyz)
+  *		yu		unicodeyz		=	pc+srp(latinunicodeyz)
+
+! model         layout  =       symbols
+ $sun_type7     jp      =       +sun_vndr/solaris(defaults_type7jp)
+  jp106         jp      =       +sun_vndr/solaris(defaults_type7jp)
+ $sun           *       =       +sun_vndr/solaris(defaults)
+
+
+! layout[2]	=	symbols
+  ar		=	+ara%(v[2]):2
+  ben		=	+in(ben)%(v[2]):2
+  bs		=	+ba%(v[2]):2
+  cs		=	+rs%(v[2]):2
+  cz_qwerty		=	+cz(qwerty)%(v[2]):2
+  dev		=	+in(deva)%(v[2]):2
+  dvorak		=	+us(dvorak)%(v[2]):2
+  dzdwi		=	+bt%(v[2]):2
+  el		=	+gr%(v[2]):2
+  en_US		=	+latin%(v[2]):2
+  guj		=	+in(guj)%(v[2]):2
+  gur		=	+in(guru)%(v[2]):2
+  iu		=	+ca(ike)%(v[2]):2
+  lo		=	+la%(v[2]):2
+  kan		=	+in(kan)%(v[2]):2
+  mi		=	+mao%(v[2]):2
+  ml		=	+in(mal)%(v[2]):2
+  ogham		=	+ie(ogam)%(v[2]):2
+  ori		=	+ie(ori)%(v[2]):2
+  sapmi		=	+no(smi)%(v[2]):2
+  sr		=	+srp%(v[2]):2
+  syr		=	+sy(syc)%(v[2]):2
+  tel		=	+in(tel)%(v[2]):2
+  tml		=	+in(tam)%(v[2]):2
+  yu		=	+srp%(v[2]):2
+  fr-latin9		=	+fr(latin9)%(v[2]):2
+  us_intl		=	+us(alt-intl)%(v[2]):2
+  ben(basic)	=	+in(ben):2
+  ben(probhat)	=	+in(ben_probhat):2
+  dev(basic)	=	+in(deva):2
+  dvorak($dvoraklayouts)	=	+%v(dvorak):2
+  dvorak(basic)	=	+us(dvorak):2
+  dvorak(pl_basic)	=	+pl(dvorak):2
+  dvorak(pl)	=	+pl(dvorak_quotes):2
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):2
+  dzdwi(basic)	=	+bt(basic):2
+  fi(basic)	=	+fi(classic):2
+  ge(azerty_tskapo)	=	+fr(geo):2
+  guj(basic)	=	+in(guj):2
+  gur(basic)	=	+in(guru):2
+  ie(laptop)	=	+ie(basic):2
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):2
+  il(si1452)	=	+ie(basic):2
+  iu(basic)	=	+ca(ike):2
+  lo(basic)	=	+la(basic):2
+  kan(basic)	=	+in(kan):2
+  mal(basic)	=	+in(mal):2
+  mal(mlplusnum)	=	+in(mal):2
+  ogham(basic)	=	+ie(ogam):2
+  ogham(laptop)	=	+ie(ogam):2
+  ogham(is434)	=	+ie(ogam_is434):2
+  ogham(is434laptop)	=	+ie(ogam_is434):2
+  ori(basic)	=	+in(ori):2
+  ro(de)	=	+ro(winkeys):2
+  ro(us)	=	+ro(std):2
+  ro(academic)	=	+ro(std):2
+  ro(std_comma)	=	+ro(std):2
+  ro(comma)	=	+ro(basic):2
+  ru(os)	=	+ru(os_legacy):2
+  sapmi(basic)	=	+no(smi):2
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
+  sapmi(sefi)	=	+fi(smi):2
+  sin(phonetic-static)	=	+in(sin_phonetic):2
+  syr(basic)	=	+sy(syc):2
+  syr(phonetic)	=	+sy(syc_phonetic):2
+  tam(INSCRIPT)	=	+in(tam):2
+  tam(UNI)	=	+in(tam_unicode):2
+  tam(TAB)	=	+in(tam_TAB):2
+  tam(TSCII)	=	+in(tam_TSCII):2
+  tel(basic)	=	+in(tel):2
+  yu(basic)	=	+srp(latin):2
+  yu(unicode)	=	+srp(latinunicode):2
+  yu(yz)	=	+srp(latinyz):2
+  yu(unicodeyz)	=	+srp(latinunicodeyz):2
+  *		=	+%l[2]%(v[2]):2
+
+! layout[3]	=	symbols
+  ar		=	+ara%(v[3]):3
+  ben		=	+in(ben)%(v[3]):3
+  bs		=	+ba%(v[3]):3
+  cs		=	+rs%(v[3]):3
+  cz_qwerty		=	+cz(qwerty)%(v[3]):3
+  dev		=	+in(deva)%(v[3]):3
+  dvorak		=	+us(dvorak)%(v[3]):3
+  dzdwi		=	+bt%(v[3]):3
+  el		=	+gr%(v[3]):3
+  en_US		=	+latin%(v[3]):3
+  guj		=	+in(guj)%(v[3]):3
+  gur		=	+in(guru)%(v[3]):3
+  iu		=	+ca(ike)%(v[3]):3
+  lo		=	+la%(v[3]):3
+  kan		=	+in(kan)%(v[3]):3
+  mi		=	+mao%(v[3]):3
+  ml		=	+in(mal)%(v[3]):3
+  ogham		=	+ie(ogam)%(v[3]):3
+  ori		=	+ie(ori)%(v[3]):3
+  sapmi		=	+no(smi)%(v[3]):3
+  sr		=	+srp%(v[3]):3
+  syr		=	+sy(syc)%(v[3]):3
+  tel		=	+in(tel)%(v[3]):3
+  tml		=	+in(tam)%(v[3]):3
+  yu		=	+srp%(v[3]):3
+  fr-latin9		=	+fr(latin9)%(v[3]):3
+  us_intl		=	+us(alt-intl)%(v[3]):3
+  ben(basic)	=	+in(ben):3
+  ben(probhat)	=	+in(ben_probhat):3
+  dev(basic)	=	+in(deva):3
+  dvorak($dvoraklayouts)	=	+%v(dvorak):3
+  dvorak(basic)	=	+us(dvorak):3
+  dvorak(pl_basic)	=	+pl(dvorak):3
+  dvorak(pl)	=	+pl(dvorak_quotes):3
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):3
+  dzdwi(basic)	=	+bt(basic):3
+  fi(basic)	=	+fi(classic):3
+  ge(azerty_tskapo)	=	+fr(geo):3
+  guj(basic)	=	+in(guj):3
+  gur(basic)	=	+in(guru):3
+  ie(laptop)	=	+ie(basic):3
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):3
+  il(si1452)	=	+ie(basic):3
+  iu(basic)	=	+ca(ike):3
+  lo(basic)	=	+la(basic):3
+  kan(basic)	=	+in(kan):3
+  mal(basic)	=	+in(mal):3
+  mal(mlplusnum)	=	+in(mal):3
+  ogham(basic)	=	+ie(ogam):3
+  ogham(laptop)	=	+ie(ogam):3
+  ogham(is434)	=	+ie(ogam_is434):3
+  ogham(is434laptop)	=	+ie(ogam_is434):3
+  ori(basic)	=	+in(ori):3
+  ro(de)	=	+ro(winkeys):3
+  ro(us)	=	+ro(std):3
+  ro(academic)	=	+ro(std):3
+  ro(std_comma)	=	+ro(std):3
+  ro(comma)	=	+ro(basic):3
+  ru(os)	=	+ru(os_legacy):3
+  sapmi(basic)	=	+no(smi):3
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
+  sapmi(sefi)	=	+fi(smi):3
+  sin(phonetic-static)	=	+in(sin_phonetic):3
+  syr(basic)	=	+sy(syc):3
+  syr(phonetic)	=	+sy(syc_phonetic):3
+  tam(INSCRIPT)	=	+in(tam):3
+  tam(UNI)	=	+in(tam_unicode):3
+  tam(TAB)	=	+in(tam_TAB):3
+  tam(TSCII)	=	+in(tam_TSCII):3
+  tel(basic)	=	+in(tel):3
+  yu(basic)	=	+srp(latin):3
+  yu(unicode)	=	+srp(latinunicode):3
+  yu(yz)	=	+srp(latinyz):3
+  yu(unicodeyz)	=	+srp(latinunicodeyz):3
+  *		=	+%l[3]%(v[3]):3
+
+! layout[4]	=	symbols
+  ar		=	+ara%(v[4]):4
+  ben		=	+in(ben)%(v[4]):4
+  bs		=	+ba%(v[4]):4
+  cs		=	+rs%(v[4]):4
+  cz_qwerty		=	+cz(qwerty)%(v[4]):4
+  dev		=	+in(deva)%(v[4]):4
+  dvorak		=	+us(dvorak)%(v[4]):4
+  dzdwi		=	+bt%(v[4]):4
+  el		=	+gr%(v[4]):4
+  en_US		=	+latin%(v[4]):4
+  guj		=	+in(guj)%(v[4]):4
+  gur		=	+in(guru)%(v[4]):4
+  iu		=	+ca(ike)%(v[4]):4
+  lo		=	+la%(v[4]):4
+  kan		=	+in(kan)%(v[4]):4
+  mi		=	+mao%(v[4]):4
+  ml		=	+in(mal)%(v[4]):4
+  ogham		=	+ie(ogam)%(v[4]):4
+  ori		=	+ie(ori)%(v[4]):4
+  sapmi		=	+no(smi)%(v[4]):4
+  sr		=	+srp%(v[4]):4
+  syr		=	+sy(syc)%(v[4]):4
+  tel		=	+in(tel)%(v[4]):4
+  tml		=	+in(tam)%(v[4]):4
+  yu		=	+srp%(v[4]):4
+  fr-latin9		=	+fr(latin9)%(v[4]):4
+  us_intl		=	+us(alt-intl)%(v[4]):4
+  ben(basic)	=	+in(ben):4
+  ben(probhat)	=	+in(ben_probhat):4
+  dev(basic)	=	+in(deva):4
+  dvorak($dvoraklayouts)	=	+%v(dvorak):4
+  dvorak(basic)	=	+us(dvorak):4
+  dvorak(pl_basic)	=	+pl(dvorak):4
+  dvorak(pl)	=	+pl(dvorak_quotes):4
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):4
+  dzdwi(basic)	=	+bt(basic):4
+  fi(basic)	=	+fi(classic):4
+  ge(azerty_tskapo)	=	+fr(geo):4
+  guj(basic)	=	+in(guj):4
+  gur(basic)	=	+in(guru):4
+  ie(laptop)	=	+ie(basic):4
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):4
+  il(si1452)	=	+ie(basic):4
+  iu(basic)	=	+ca(ike):4
+  lo(basic)	=	+la(basic):4
+  kan(basic)	=	+in(kan):4
+  mal(basic)	=	+in(mal):4
+  mal(mlplusnum)	=	+in(mal):4
+  ogham(basic)	=	+ie(ogam):4
+  ogham(laptop)	=	+ie(ogam):4
+  ogham(is434)	=	+ie(ogam_is434):4
+  ogham(is434laptop)	=	+ie(ogam_is434):4
+  ori(basic)	=	+in(ori):4
+  ro(de)	=	+ro(winkeys):4
+  ro(us)	=	+ro(std):4
+  ro(academic)	=	+ro(std):4
+  ro(std_comma)	=	+ro(std):4
+  ro(comma)	=	+ro(basic):4
+  ru(os)	=	+ru(os_legacy):4
+  sapmi(basic)	=	+no(smi):4
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
+  sapmi(sefi)	=	+fi(smi):4
+  sin(phonetic-static)	=	+in(sin_phonetic):4
+  syr(basic)	=	+sy(syc):4
+  syr(phonetic)	=	+sy(syc_phonetic):4
+  tam(INSCRIPT)	=	+in(tam):4
+  tam(UNI)	=	+in(tam_unicode):4
+  tam(TAB)	=	+in(tam_TAB):4
+  tam(TSCII)	=	+in(tam_TSCII):4
+  tel(basic)	=	+in(tel):4
+  yu(basic)	=	+srp(latin):4
+  yu(unicode)	=	+srp(latinunicode):4
+  yu(yz)	=	+srp(latinyz):4
+  yu(unicodeyz)	=	+srp(latinunicodeyz):4
+  *		=	+%l[4]%(v[4]):4
+
+! layout[2]	variant[2]	=	symbols
+  ben		basic	=	+in(ben):2
+  ben		probhat	=	+in(ben_probhat):2
+  dev		basic	=	+in(deva):2
+  dvorak		$dvoraklayouts	=	+%v(dvorak):2
+  dvorak		basic	=	+us(dvorak):2
+  dvorak		pl_basic	=	+pl(dvorak):2
+  dvorak		pl	=	+pl(dvorak_quotes):2
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):2
+  dzdwi		basic	=	+bt(basic):2
+  fi		basic	=	+fi(classic):2
+  ge		azerty_tskapo	=	+fr(geo):2
+  guj		basic	=	+in(guj):2
+  gur		basic	=	+in(guru):2
+  ie		laptop	=	+ie(basic):2
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):2
+  il		si1452	=	+ie(basic):2
+  iu		basic	=	+ca(ike):2
+  lo		basic	=	+la(basic):2
+  kan		basic	=	+in(kan):2
+  mal		basic	=	+in(mal):2
+  mal		mlplusnum	=	+in(mal):2
+  ogham		basic	=	+ie(ogam):2
+  ogham		laptop	=	+ie(ogam):2
+  ogham		is434	=	+ie(ogam_is434):2
+  ogham		is434laptop	=	+ie(ogam_is434):2
+  ori		basic	=	+in(ori):2
+  ro		de	=	+ro(winkeys):2
+  ro		us	=	+ro(std):2
+  ro		academic	=	+ro(std):2
+  ro		std_comma	=	+ro(std):2
+  ro		comma	=	+ro(basic):2
+  ru		os	=	+ru(os_legacy):2
+  sapmi		basic	=	+no(smi):2
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
+  sapmi		sefi	=	+fi(smi):2
+  sin		phonetic-static	=	+in(sin_phonetic):2
+  syr		basic	=	+sy(syc):2
+  syr		phonetic	=	+sy(syc_phonetic):2
+  tam		INSCRIPT	=	+in(tam):2
+  tam		UNI	=	+in(tam_unicode):2
+  tam		TAB	=	+in(tam_TAB):2
+  tam		TSCII	=	+in(tam_TSCII):2
+  tel		basic	=	+in(tel):2
+  yu		basic	=	+srp(latin):2
+  yu		unicode	=	+srp(latinunicode):2
+  yu		yz	=	+srp(latinyz):2
+  yu		unicodeyz	=	+srp(latinunicodeyz):2
+
+! layout[3]	variant[3]	=	symbols
+  ben		basic	=	+in(ben):3
+  ben		probhat	=	+in(ben_probhat):3
+  dev		basic	=	+in(deva):3
+  dvorak		$dvoraklayouts	=	+%v(dvorak):3
+  dvorak		basic	=	+us(dvorak):3
+  dvorak		pl_basic	=	+pl(dvorak):3
+  dvorak		pl	=	+pl(dvorak_quotes):3
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):3
+  dzdwi		basic	=	+bt(basic):3
+  fi		basic	=	+fi(classic):3
+  ge		azerty_tskapo	=	+fr(geo):3
+  guj		basic	=	+in(guj):3
+  gur		basic	=	+in(guru):3
+  ie		laptop	=	+ie(basic):3
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):3
+  il		si1452	=	+ie(basic):3
+  iu		basic	=	+ca(ike):3
+  lo		basic	=	+la(basic):3
+  kan		basic	=	+in(kan):3
+  mal		basic	=	+in(mal):3
+  mal		mlplusnum	=	+in(mal):3
+  ogham		basic	=	+ie(ogam):3
+  ogham		laptop	=	+ie(ogam):3
+  ogham		is434	=	+ie(ogam_is434):3
+  ogham		is434laptop	=	+ie(ogam_is434):3
+  ori		basic	=	+in(ori):3
+  ro		de	=	+ro(winkeys):3
+  ro		us	=	+ro(std):3
+  ro		academic	=	+ro(std):3
+  ro		std_comma	=	+ro(std):3
+  ro		comma	=	+ro(basic):3
+  ru		os	=	+ru(os_legacy):3
+  sapmi		basic	=	+no(smi):3
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
+  sapmi		sefi	=	+fi(smi):3
+  sin		phonetic-static	=	+in(sin_phonetic):3
+  syr		basic	=	+sy(syc):3
+  syr		phonetic	=	+sy(syc_phonetic):3
+  tam		INSCRIPT	=	+in(tam):3
+  tam		UNI	=	+in(tam_unicode):3
+  tam		TAB	=	+in(tam_TAB):3
+  tam		TSCII	=	+in(tam_TSCII):3
+  tel		basic	=	+in(tel):3
+  yu		basic	=	+srp(latin):3
+  yu		unicode	=	+srp(latinunicode):3
+  yu		yz	=	+srp(latinyz):3
+  yu		unicodeyz	=	+srp(latinunicodeyz):3
+
+! layout[4]	variant[4]	=	symbols
+  ben		basic	=	+in(ben):4
+  ben		probhat	=	+in(ben_probhat):4
+  dev		basic	=	+in(deva):4
+  dvorak		$dvoraklayouts	=	+%v(dvorak):4
+  dvorak		basic	=	+us(dvorak):4
+  dvorak		pl_basic	=	+pl(dvorak):4
+  dvorak		pl	=	+pl(dvorak_quotes):4
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):4
+  dzdwi		basic	=	+bt(basic):4
+  fi		basic	=	+fi(classic):4
+  ge		azerty_tskapo	=	+fr(geo):4
+  guj		basic	=	+in(guj):4
+  gur		basic	=	+in(guru):4
+  ie		laptop	=	+ie(basic):4
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):4
+  il		si1452	=	+ie(basic):4
+  iu		basic	=	+ca(ike):4
+  lo		basic	=	+la(basic):4
+  kan		basic	=	+in(kan):4
+  mal		basic	=	+in(mal):4
+  mal		mlplusnum	=	+in(mal):4
+  ogham		basic	=	+ie(ogam):4
+  ogham		laptop	=	+ie(ogam):4
+  ogham		is434	=	+ie(ogam_is434):4
+  ogham		is434laptop	=	+ie(ogam_is434):4
+  ori		basic	=	+in(ori):4
+  ro		de	=	+ro(winkeys):4
+  ro		us	=	+ro(std):4
+  ro		academic	=	+ro(std):4
+  ro		std_comma	=	+ro(std):4
+  ro		comma	=	+ro(basic):4
+  ru		os	=	+ru(os_legacy):4
+  sapmi		basic	=	+no(smi):4
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4
+  sapmi		sefi	=	+fi(smi):4
+  sin		phonetic-static	=	+in(sin_phonetic):4
+  syr		basic	=	+sy(syc):4
+  syr		phonetic	=	+sy(syc_phonetic):4
+  tam		INSCRIPT	=	+in(tam):4
+  tam		UNI	=	+in(tam_unicode):4
+  tam		TAB	=	+in(tam_TAB):4
+  tam		TSCII	=	+in(tam_TSCII):4
+  tel		basic	=	+in(tel):4
+  yu		basic	=	+srp(latin):4
+  yu		unicode	=	+srp(latinunicode):4
+  yu		yz	=	+srp(latinyz):4
+  yu		unicodeyz	=	+srp(latinunicodeyz):4
+
+! model		=	symbols
+  benqx730      =       +inet(benqx)
+  benqx800      =       +inet(benqx)
+  dellsk8125    =       +inet(dell)
+  dellsk8135    =       +inet(dell)
+  hpnx9020      =       +inet(hp5185)
+  logicd        =       +inet(logitech_base)
+  logicd_it     =       +inet(logitech_base)
+  logicd_nav    =       +inet(logitech_base)
+  logicd_opt    =       +inet(logitech_base)
+  logiultrax    =       +inet(logitech_base)
+  logiclx300    =       +inet(logiex110)
+  logii350      =       +inet(logiex110)
+  logimel       =       +inet(logiex110)
+  vsonku306     =       +inet(microsoftprooem)
+  $inetkbds     =       +inet(%m)
+  acer_tm_800   =       +inet(acer_laptop)
+  benqx730      =       +inet(benqx)
+  benqx800      =       +inet(benqx)
+  dell8125      =       +inet(dellusbmm)
+  dell8135      =       +inet(dellusbmm)
+  ltcd          =       +inet(logicda)
+  logicdit      =       +inet(logicd)
+  logicdo       =       +inet(logicd)
+  logicdp       =       +inet(logicd)
+  logicdpa      =       +inet(logicda)
+  logiciink     =       +inet(logicink)
+  $maclaptop    =       +inet(apple)+level3(enter_switch)
+  $macs	        =       +inet(apple)
+  thinkpadz60   =       +inet(thinkpad60)
+
+! model		layout		=	compat
+ $sun_jp        jp              =       complete+japan(kana_lock)
+  jp106         jp              =       complete+japan(kana_lock)
+  pc98		nec_vndr/jp	=	pc98(basic)
+  *		jp		=	complete+japan
+  olpc          *               =       olpc
+  *		*		=	complete
+
+! model		layout[1]	=	compat
+  *		*		=	complete
+
+! model		=	types
+  $macs		=	complete+numpad(mac)
+  *		=	complete
+
+! layout	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
+
+! layout[1]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
+
+! layout[2]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
+
+! layout[3]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
+
+! layout[4]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
+
+! option	=	symbols
+  grp:shift_toggle	=	+group(shifts_toggle)
+  altwin:menu		=	+altwin(menu)
+  altwin:meta_alt	=	+altwin(meta_alt)
+  altwin:ctrl_win	=	+altwin(ctrl_win)
+  altwin:meta_win	=	+altwin(meta_win)
+  altwin:left_meta_win	=	+altwin(left_meta_win)
+  altwin:super_win	=	+altwin(super_win)
+  altwin:hyper_win	=	+altwin(hyper_win)
+  altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)
+  grp:switch		=	+group(switch)
+  grp:lswitch		=	+group(lswitch)
+  grp:win_switch	=	+group(win_switch)
+  grp:lwin_switch	=	+group(lwin_switch)
+  grp:rwin_switch	=	+group(rwin_switch)
+  grp:toggle		=	+group(toggle)
+  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: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:alt_caps_toggle   =       +group(alt_caps_toggle)
+  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
+  grp:alt_shift_toggle	=	+group(alt_shift_toggle)
+  grp:menu_toggle	=	+group(menu_toggle)
+  grp:lwin_toggle	=	+group(lwin_toggle)
+  grp:rwin_toggle	=	+group(rwin_toggle)
+  grp:lshift_toggle	=	+group(lshift_toggle)
+  grp:rshift_toggle	=	+group(rshift_toggle)
+  grp:rctrl_switch	=	+group(rctrl_switch)
+  grp:lctrl_toggle	=	+group(lctrl_toggle)
+  grp:rctrl_toggle	=	+group(rctrl_toggle)
+  grp:lalt_toggle	=	+group(lalt_toggle)
+  lv3:switch		=	+level3(switch)
+  lv3:ralt_switch	=	+level3(ralt_switch)
+  lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
+  lv3:ralt_alt		=	+level3(ralt_alt)
+  lv3:lalt_switch	=	+level3(lalt_switch)
+  lv3:alt_switch	=	+level3(alt_switch)
+  lv3:menu_switch	=	+level3(menu_switch)
+  lv3:win_switch	=	+level3(win_switch)
+  lv3:lwin_switch	=	+level3(lwin_switch)
+  lv3:rwin_switch	=	+level3(rwin_switch)
+  caps:capslock		=	+capslock(capslock)
+  caps:shiftlock	=	+capslock(shiftlock)
+  caps:swapescape	=	+capslock(swapescape)
+  ctrl:nocaps		=	+ctrl(nocaps)
+  ctrl:swapcaps		=	+ctrl(swapcaps)
+  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
+  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
+  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
+  compose:ralt		=	+compose(ralt)
+  compose:lwin		=	+compose(lwin)
+  compose:rwin		=	+compose(rwin)
+  compose:menu		=	+compose(menu)
+  compose:rctrl		=	+compose(rctrl)
+  compose:caps		=	+compose(caps)
+  compose:102		=	+compose(102)
+  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
+  eurosign:e		=	+eurosign(e)
+  eurosign:2		=	+eurosign(2)
+  eurosign:4		=	+eurosign(4)
+  eurosign:5		=	+eurosign(5)
+  keypad:oss            =       +keypad(oss)
+  keypad:legacy         =	+keypad(legacy)
+  keypad:legacy_wang    =	+keypad(legacy_wang)
+  keypad:oss_wang       =	+keypad(oss_wang)
+  keypad:future         =	+keypad(future)
+  keypad:future_wang    =	+keypad(future_wang)
+  keypad:phone_hex      =	+keypad(phone_hex)
+  nbsp:none             =	+nbsp(none)
+  nbsp:level2           =	+nbsp(level2)
+  nbsp:level3           =	+nbsp(level3)
+  nbsp:level3s          =	+nbsp(level3s)
+  nbsp:level3n          =	+nbsp(level3n)
+  nbsp:level4           =	+nbsp(level4)
+  nbsp:level4n          =	+nbsp(level4n)
+  nbsp:level4nl         =	+nbsp(level4nl)
+  japan:nicola_f_bs     =	+jp(nicola_f_bs)
+  kpdl:dot              =	+kpdl(dot)
+  kpdl:comma            =	+kpdl(comma)
+  kpdl:dotoss           =	+kpdl(dotoss)
+  kpdl:dotoss_latin9    =	+kpdl(dotoss_latin9)
+  kpdl:commaoss         =	+kpdl(commaoss)
+  kpdl:momayyezoss      =	+kpdl(momayyezoss)
+  kpdl:kposs            =	+kpdl(kposs)
+  shift:breaks_caps     =	+shift(breaks_caps)
+
+
+! option	=	compat
+  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)
+
+
+! option	=	types
+  caps:internal			=	+caps(internal)
+  caps:internal_nocancel	=	+caps(internal_nocancel)
+  caps:shift			=	+caps(shift)
+  caps:shift_nocancel		=	+caps(shift_nocancel)
+  numpad:pc			=	+numpad(pc)
+  numpad:mac			=	+numpad(mac)
+  numpad:microsoft		=	+numpad(microsoft)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/rules/base.lst	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,710 @@
+! model
+  sun_type7_usb         Sun Type 7 USB 
+  sun_type7_euro_usb    Sun Type 7 USB (European layout)
+  sun_type7_unix_usb    Sun Type 7 USB (Unix layout)
+  sun_type7_jp_usb      Sun Type 7 USB (Japanese layout) / Japanese 106-key
+  pc101           Generic 101-key PC
+  pc102           Generic 102-key (Intl) PC
+  pc104           Generic 104-key PC
+  pc105           Generic 105-key (Intl) PC
+  dell101         Dell 101-key PC
+  latitude        Dell Latitude series laptop
+  dellm65         Dell Precision M65
+  everex          Everex STEPnote
+  flexpro         Keytronic FlexPro
+  microsoft       Microsoft Natural
+  omnikey101      Northgate OmniKey 101
+  winbook         Winbook Model XP5
+  jp106           Japanese 106-key
+  pc98            PC-98xx Series
+  a4techKB21      A4Tech KB-21
+  a4techKBS8      A4Tech KBS-8
+  a4_rfkb23       A4Tech Wireless Desktop RFKB-23
+  abnt2           Brazilian ABNT2
+  airkey          Acer AirKey V
+  acpi            ACPI Standard
+  azonaRF2300     Azona RF2300 wireless Internet Keyboard
+  scorpius        Advance Scorpius KI
+  brother         Brother Internet Keyboard
+  btc5113rf       BTC 5113RF Multimedia
+  btc5126t        BTC 5126T
+  btc6301urf      BTC 6301URF
+  btc9000         BTC 9000
+  btc9000a        BTC 9000A
+  btc9001ah       BTC 9001AH
+  btc5090         BTC 5090
+  btc9019u        BTC 9019U
+  cherryblue      Cherry Blue Line CyBo@rd
+  cherryblueb     Cherry CyMotion Master XPress
+  cherrybluea     Cherry Blue Line CyBo@rd (alternate option)
+  cherrycyboard   Cherry CyBo@rd USB-Hub
+  chicony         Chicony Internet Keyboard
+  chicony0108     Chicony KU-0108
+  chicony9885     Chicony KB-9885
+  compaqeak8      Compaq Easy Access Keyboard
+  compaqik7       Compaq Internet Keyboard (7 keys)
+  compaqik13      Compaq Internet Keyboard (13 keys)
+  compaqik18      Compaq Internet Keyboard (18 keys)
+  cymotionlinux   Cherry CyMotion Master Linux
+  armada          Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
+  presario        Laptop/notebook Compaq (eg. Presario) Internet Keyboard
+  ipaq            Compaq iPaq Keyboard
+  dell            Dell
+  dellsk8125      Dell SK-8125
+  dellsk8135      Dell SK-8135
+  dellusbmm       Dell USB Multimedia Keyboard
+  inspiron        Dell Laptop/notebook Inspiron 6xxx/8xxx
+  precision_m     Dell Laptop/notebook Precision M series
+  dexxa           Dexxa Wireless Desktop Keyboard
+  diamond         Diamond 9801 / 9802 series
+  dtk2000         DTK2000
+  ennyah_dkb1008  Ennyah DKB-1008
+  fscaa1667g      Fujitsu-Siemens Computers AMILO A1667G laptop
+  genius          Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+  geniuscomfy     Genius Comfy KB-12e
+  geniuscomfy2    Genius Comfy KB-21e-Scroll
+  geniuskb19e     Genius KB-19e NB
+  gyration        Gyration
+  logitech_base   Logitech Generic Keyboard
+  logitech_g15    Logitech G15 extra keys via G15daemon
+  hpi6            Hewlett-Packard Internet Keyboard
+  hp2501          Hewlett-Packard SK-2501 Multimedia Keyboard
+  hp2505          Hewlett-Packard SK-2505 Internet Keyboard
+  hpxe3gc         Hewlett-Packard Omnibook XE3 GC
+  hpxe3gf         Hewlett-Packard Omnibook XE3 GF
+  hpxt1000        Hewlett-Packard Omnibook XT1000
+  hpzt11xx        Hewlett-Packard Pavilion ZT11xx
+  hp500fa         Hewlett-Packard Omnibook 500 FA
+  hp5xx           Hewlett-Packard Omnibook 5xx
+  hp5181          Hewlett-Packard Internet Keyboard 5181
+  hp5185          Hewlett-Packard Internet Keyboard 5185
+  hpnx9020        Hewlett-Packard nx9020
+  hp6000          Hewlett-Packard Omnibook 6000/6100
+  honeywell_euroboard Honeywell Euroboard
+  rapidaccess     IBM Rapid Access
+  rapidaccess2    IBM Rapid Access II
+  rapidaccess2a   IBM Rapid Access II (alternate option)
+  thinkpad        IBM ThinkPad 560Z/600/600E/A22E
+  thinkpadintl    IBM ThinkPad 560Z/600/600E/A22E, Intl
+  thinkpad60      IBM ThinkPad R60/T60/R61/T61
+  thinkpadz60     IBM ThinkPad Z60m/Z60t/Z61m/Z61t
+  ibm_spacesaver  IBM Space Saver
+  logiaccess      Logitech Access Keyboard
+  logiclx300      Logitech Cordless Desktop LX-300
+  logii350        Logitech Internet 350 Keyboard
+  logimel         Logitech Media Elite Keyboard
+  logicd          Logitech Cordless Desktop
+  logicd_it       Logitech Cordless Desktop iTouch
+  logicd_nav      Logitech Cordless Desktop Navigator
+  logicd_opt      Logitech Cordless Desktop Optical
+  logicda         Logitech Cordless Desktop (alternate option)
+  logicdpa2       Logitech Cordless Desktop Pro (alternate option2)
+  logicfn         Logitech Cordless Freedom/Desktop Navigator
+  logicdn         Logitech Cordless Desktop Navigator
+  logiitc         Logitech iTouch Cordless Keyboard (model Y-RB6)
+  logiik          Logitech Internet Keyboard
+  itouch          Logitech iTouch
+  logicink        Logitech Internet Navigator Keyboard
+  logiex110       Logitech Cordless Desktop EX110
+  logiinkse       Logitech iTouch Internet Navigator Keyboard SE
+  logiinkseusb    Logitech iTouch Internet Navigator Keyboard SE (USB)
+  logiultrax      Logitech Ultra-X Keyboard
+  logiultraxc     Logitech Ultra-X Cordless Media Desktop Keyboard
+  logidinovo      Logitech diNovo Keyboard
+  logidinovoedge  Logitech diNovo Edge Keyboard
+  mx1998          Memorex MX1998
+  mx2500          Memorex MX2500 EZ-Access Keyboard
+  mx2750          Memorex MX2750
+  microsoft7000   Microsoft Natural Wireless Ergonomic Keyboard 7000
+  microsoftinet   Microsoft Internet Keyboard
+  microsoftpro    Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
+  microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
+  microsoftprooem Microsoft Natural Keyboard Pro OEM
+  vsonku306       ViewSonic KU-306 Internet Keyboard
+  microsoftprose  Microsoft Internet Keyboard Pro, Swedish
+  microsoftoffice Microsoft Office Keyboard
+  microsoftmult   Microsoft Wireless Multimedia Keyboard 1.0A
+  microsoftelite  Microsoft Natural Keyboard Elite
+  oretec          Ortek MCK-800 MM/Internet keyboard
+  propeller       Propeller Voyager (KTEZ-1000)
+  qtronix         QTronix Scorpius 98N+
+  samsung4500     Samsung SDM 4500P
+  samsung4510     Samsung SDM 4510P
+  sk1300          SK-1300
+  sk2500          SK-2500
+  sk6200          SK-6200
+  sk7100          SK-7100
+  sp_inet         Super Power Multimedia Keyboard
+  sun_type7             Sun Type 7 
+  sun_type7_euro        Sun Type 7 (European layout)
+  sun_type7_unix        Sun Type 7 (Unix layout)
+  sun_type6_usb         Sun Type 6 USB
+  sun_type6_euro_usb    Sun Type 6 USB (European layout)
+  sun_type6_unix_usb    Sun Type 6 USB (Unix layout)
+  sun_type6_jp_usb      Sun Type 6 USB (Japanese layout)
+  sun_type6             Sun Type 6 
+  sun_type6_euro        Sun Type 6 (European layout)
+  sun_type6_jp          Sun Type 6 (Japanese layout)
+  sun_type6_unix        Sun Type 6 (Unix layout)
+  sun_type5             Sun Type 5 
+  sun_type5_euro        Sun Type 5 (European layout)
+  sun_type5_jp          Sun Type 5 (Japanese layout)
+  sun_type5_unix        Sun Type 5 (Unix layout)
+  sun_type5_hobo        Sun Type 5 Compact 
+  sun_type5_euro_hobo   Sun Type 5 Compact (European layout)
+  sun_type5_jp_hobo     Sun Type 5 Compact (Japanese layout)
+  sun_type4             Sun Type 4
+  sun_type4_ca          Sun Type 4 (Canadian  layout)
+  sun_type4_jp          Sun Type 4 (Japanese layout)
+  sun_type4_euro        Sun Type 4 (European layout)
+  sven            SVEN Ergonomic 2500
+  sven303         SVEN Slim 303
+  symplon         Symplon PaceBook (tablet PC)
+  toshiba_s3000   Toshiba Satellite S3000
+  trust           Trust Wireless Keyboard Classic
+  trustda         Trust Direct Access Keyboard
+  yahoo           Yahoo! Internet Keyboard
+  macbook78       MacBook/MacBook Pro
+  macbook79       MacBook/MacBook Pro (Intl)
+  macintosh       Macintosh
+  macintosh_old   Macintosh Old
+  macintosh_hhk   Happy Hacking Keyboard for Mac
+  acer_c300       Acer C300
+  acer_ferrari4k  Acer Ferrari 4000
+  acer_laptop     Acer Laptop
+  asus_laptop     Asus Laptop
+  apple           Apple
+  apple_laptop    Apple Laptop
+  silvercrest     SILVERCREST Multimedia Wireless Keyboard
+  emachines       Laptop/notebook eMachines m68xx
+  kr106           Korean 106-key
+  evdev           Evdev-managed keyboard
+  benqx           BenQ X-Touch
+  benqx730        BenQ X-Touch 730
+  benqx800        BenQ X-Touch 800
+  hhk             Happy Hacking Keyboard
+  classmate       Classmate PC
+  olpc            OLPC
+
+
+! layout
+  us              USA
+  ad              Andorra
+  af              Afghanistan
+  ara             Arabic
+  al              Albania
+  am              Armenia
+  az              Azerbaijan
+  by              Belarus
+  be              Belgium
+  bd              Bangladesh
+  in              India
+  ba              Bosnia and Herzegovina
+  br              Brazil
+  bg              Bulgaria
+  ma              Morocco
+  mm              Myanmar
+  ca              Canada
+  cd              Congo, Democratic Republic of the
+  cn              China
+  hr              Croatia
+  cz              Czechia
+  dk              Denmark
+  dvorak	  Dvorak
+  nl              Netherlands
+  bt              Bhutan
+  ee              Estonia
+  ir              Iran
+  iq              Iraq
+  fo              Faroe Islands
+  fi              Finland
+  fr              France
+  gh              Ghana
+  gn              Guinea
+  ge              Georgia
+  de              Germany
+  gr              Greece
+  hu              Hungary
+  is              Iceland
+  il              Israel
+  it              Italy
+  jp              Japan
+  kg              Kyrgyzstan
+  kh              Cambodia
+  kz              Kazakhstan
+  la              Laos
+  latam           Latin American
+  lt              Lithuania
+  lv              Latvia
+  mao             Maori
+  me              Montenegro
+  mk              Macedonia
+  mt              Malta
+  mn              Mongolia
+  no              Norway
+  pl              Poland
+  pt              Portugal
+  ro              Romania
+  ru              Russia
+  rs              Serbia
+  si              Slovenia
+  sk              Slovakia
+  es              Spain
+  se              Sweden
+  ch              Switzerland
+  sy              Syria
+  tj              Tajikistan
+  lk              Sri Lanka
+  th              Thailand
+  tr              Turkey
+  ua              Ukraine
+  gb              United Kingdom
+  uz              Uzbekistan
+  vn              Vietnam
+  kr              Korea, Republic of
+  nec_vndr/jp     Japan (PC-98xx Series)
+  ie              Ireland
+  pk              Pakistan
+  mv              Maldives
+  za              South Africa
+  epo             Esperanto
+  np              Nepal
+  ng              Nigeria
+  et              Ethiopia
+  braille         Braille
+
+! variant
+  chr             us: Cherokee
+  euro            us: With EuroSign on 5
+  intl            us: International (with dead keys)
+  alt-intl        us: Alternative international (former us_intl)
+  colemak         us: Colemak
+  dvorak          us: Dvorak
+  dvorak-intl     us: Dvorak international
+  dvorak-l        us: Left handed Dvorak
+  dvorak-r        us: Right handed Dvorak
+  dvorak-classic  us: Classic Dvorak
+  dvp             us: Programmer Dvorak
+  rus             us: Russian phonetic
+  mac             us: Macintosh
+  altgr-intl      us: International (AltGr dead keys)
+  olpc2           us: Group toggle on multiply/divide key
+  ps              af: Pashto
+  uz              af: Southern Uzbek
+  olpc-ps         af: OLPC Pashto
+  olpc-fa         af: OLPC Dari
+  olpc-uz         af: OLPC Southern Uzbek
+  azerty          ara: azerty
+  azerty_digits   ara: azerty/digits
+  digits          ara: digits
+  qwerty          ara: qwerty
+  qwerty_digits   ara: qwerty/digits
+  buckwalter      ara: Buckwalter
+  phonetic        am: Phonetic
+  phonetic-alt    am: Alternative Phonetic
+  eastern         am: Eastern
+  western         am: Western
+  eastern-alt     am: Alternative Eastern
+  cyrillic        az: Cyrillic
+  winkeys         by: Winkeys
+  latin           by: Latin
+  iso-alternate   be: ISO Alternate
+  nodeadkeys      be: Eliminate dead keys
+  sundeadkeys     be: Sun dead keys
+  wang            be: Wang model 724 azerty
+  probhat         bd: Probhat
+  ben             in: Bengali
+  ben_probhat     in: Bengali Probhat
+  guj             in: Gujarati
+  guru            in: Gurmukhi
+  jhelum          in: Gurmukhi Jhelum
+  kan             in: Kannada
+  mal             in: Malayalam
+  mal_lalitha     in: Malayalam Lalitha
+  ori             in: Oriya
+  tam_unicode     in: Tamil Unicode
+  tam_TAB         in: Tamil TAB Typewriter
+  tam_TSCII       in: Tamil TSCII Typewriter
+  tam             in: Tamil
+  tel             in: Telugu
+  urd             in: Urdu
+  bolnagri        in: Hindi Bolnagri
+  alternatequotes ba: Use guillemets for quotes
+  unicode         ba: Use Bosnian digraphs
+  unicodeus       ba: US keyboard with Bosnian digraphs
+  us              ba: US keyboard with Bosnian letters
+  nodeadkeys      br: Eliminate dead keys
+  dvorak          br: Dvorak
+  nativo          br: Nativo
+  nativo-us       br: Nativo for USA keyboards
+  nativo-epo      br: Nativo for Esperanto
+  phonetic        bg: Phonetic
+  french          ma: French
+  tifinagh        ma: Tifinagh
+  tifinagh-alt    ma: Tifinagh Alternative
+  tifinagh-alt-phonetic ma: Tifinagh Alternative Phonetic
+  tifinagh-extended ma: Tifinagh Extended
+  tifinagh-phonetic ma: Tifinagh Phonetic
+  tifinagh-extended-phonetic ma: Tifinagh Extended Phonetic
+  fr-dvorak       ca: French Dvorak
+  fr-legacy       ca: French (legacy)
+  multix          ca: Multilingual
+  multi           ca: Multilingual, first part
+  multi-2gr       ca: Multilingual, second part
+  ike             ca: Inuktitut
+  shs             ca: Secwepemctsin
+  kut             ca: Ktunaxa
+  tib             cn: Tibetan
+  tib_asciinum    cn: Tibetan (with ASCII numerals)
+  alternatequotes hr: Use guillemets for quotes
+  unicode         hr: Use Croatian digraphs
+  unicodeus       hr: US keyboard with Croatian digraphs
+  us              hr: US keyboard with Croatian letters
+  bksl            cz: With &lt;\|&gt; key
+  qwerty          cz: qwerty
+  qwerty_bksl     cz: qwerty, extended Backslash
+  ucw             cz: UCW layout (accented letters only)
+  nodeadkeys      dk: Eliminate dead keys
+  mac             dk: Macintosh
+  mac_nodeadkeys  dk: Macintosh, eliminate dead keys
+  dvorak          dk: Dvorak
+  sundeadkeys     nl: Sun dead keys
+  mac             nl: Macintosh
+  std             nl: Standard
+  nodeadkeys      ee: Eliminate dead keys
+  dvorak          ee: Dvorak
+  us              ee: US keyboard with Estonian letters
+  pro             ir: Pro
+  keypad          ir: Keypad
+  pro_keypad      ir: Pro Keypad
+  ku              ir: Kurdish, Latin Q
+  ku_f            ir: Kurdish, (F)
+  ku_alt          ir: Kurdish, Latin Alt-Q
+  ku_ara          ir: Kurdish, Arabic-Latin
+  ku              iq: Kurdish, Latin Q
+  ku_f            iq: Kurdish, (F)
+  ku_alt          iq: Kurdish, Latin Alt-Q
+  ku_ara          iq: Kurdish, Arabic-Latin
+  nodeadkeys      fo: Eliminate dead keys
+  nodeadkeys      fi: Eliminate dead keys
+  smi             fi: Northern Saami
+  classic         fi: Classic
+  mac             fi: Macintosh
+  nodeadkeys      fr: Eliminate dead keys
+  sundeadkeys     fr: Sun dead keys
+  oss             fr: Alternative
+  oss_latin9      fr: Alternative, latin-9 only
+  oss_nodeadkeys  fr: Alternative, eliminate dead keys
+  oss_sundeadkeys fr: Alternative, Sun dead keys
+  latin9          fr: (Legacy) Alternative
+  latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys
+  latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys
+  bepo            fr: Bepo, ergonomic, Dvorak way
+  bepo_latin9     fr: Bepo, ergonomic, Dvorak way, latin-9 only
+  dvorak          fr: Dvorak
+  mac             fr: Macintosh
+  geo             fr: Georgian AZERTY Tskapo
+  generic         gh: Multilingual
+  akan            gh: Akan
+  ewe             gh: Ewe
+  fula            gh: Fula
+  ga              gh: Ga
+  hausa           gh: Hausa
+  ergonomic       ge: Ergonomic
+  mess            ge: MESS
+  ru              ge: Russian
+  os              ge: Ossetian
+  deadacute       de: Dead acute
+  deadgraveacute  de: Dead grave acute
+  nodeadkeys      de: Eliminate dead keys
+  ro              de: Romanian keyboard with German letters
+  ro_nodeadkeys   de: Romanian keyboard with German letters, eliminate dead keys
+  dvorak          de: Dvorak
+  sundeadkeys     de: Sun dead keys
+  neo             de: Neostyle
+  mac             de: Macintosh
+  mac_nodeadkeys  de: Macintosh, eliminate dead keys
+  simple          gr: Simple
+  extended        gr: Extended
+  nodeadkeys      gr: Eliminate dead keys
+  polytonic       gr: Polytonic
+  standard        hu: Standard
+  nodeadkeys      hu: Eliminate dead keys
+  qwerty          hu: qwerty
+  101_qwertz_comma_dead hu: 101/qwertz/comma/Dead keys
+  101_qwertz_comma_nodead hu: 101/qwertz/comma/Eliminate dead keys
+  101_qwertz_dot_dead hu: 101/qwertz/dot/Dead keys
+  101_qwertz_dot_nodead hu: 101/qwertz/dot/Eliminate dead keys
+  101_qwerty_comma_dead hu: 101/qwerty/comma/Dead keys
+  101_qwerty_comma_nodead hu: 101/qwerty/comma/Eliminate dead keys
+  101_qwerty_dot_dead hu: 101/qwerty/dot/Dead keys
+  101_qwerty_dot_nodead hu: 101/qwerty/dot/Eliminate dead keys
+  102_qwertz_comma_dead hu: 102/qwertz/comma/Dead keys
+  102_qwertz_comma_nodead hu: 102/qwertz/comma/Eliminate dead keys
+  102_qwertz_dot_dead hu: 102/qwertz/dot/Dead keys
+  102_qwertz_dot_nodead hu: 102/qwertz/dot/Eliminate dead keys
+  102_qwerty_comma_dead hu: 102/qwerty/comma/Dead keys
+  102_qwerty_comma_nodead hu: 102/qwerty/comma/Eliminate dead keys
+  102_qwerty_dot_dead hu: 102/qwerty/dot/Dead keys
+  102_qwerty_dot_nodead hu: 102/qwerty/dot/Eliminate dead keys
+  Sundeadkeys     is: Sun dead keys
+  nodeadkeys      is: Eliminate dead keys
+  mac             is: Macintosh
+  dvorak          is: Dvorak
+  lyx             il: lyx
+  phonetic        il: Phonetic
+  biblical        il: Biblical Hebrew (Tiro)
+  nodeadkeys      it: Eliminate dead keys
+  mac             it: Macintosh
+  geo             it: Georgian
+  kana            jp: Kana
+  OADG109A        jp: OADG 109A
+  ruskaz          kz: Russian with Kazakh
+  kazrus          kz: Kazakh with Russian
+  nodeadkeys      latam: Eliminate dead keys
+  sundeadkeys     latam: Sun dead keys
+  std             lt: Standard
+  us              lt: US keyboard with Lithuanian letters
+  ibm             lt: IBM (LST 1205-92)
+  lekp            lt: LEKP
+  lekpa           lt: LEKPa
+  balticplus      lt: Baltic+
+  apostrophe      lv: Apostrophe (') variant
+  tilde           lv: Tilde (~) variant
+  fkey            lv: F-letter (F) variant
+  cyrillic        me: Cyrillic
+  cyrillicyz      me: Cyrillic, Z and ZHE swapped
+  latinunicode    me: Latin unicode
+  latinyz         me: Latin qwerty
+  latinunicodeyz  me: Latin unicode qwerty
+  cyrillicalternatequotes me: Cyrillic with guillemets
+  latinalternatequotes me: Latin with guillemets
+  nodeadkeys      mk: Eliminate dead keys
+  us              mt: Maltese keyboard with US layout
+  nodeadkeys      no: Eliminate dead keys
+  dvorak          no: Dvorak
+  smi             no: Northern Saami
+  smi_nodeadkeys  no: Northern Saami, eliminate dead keys
+  mac             no: Macintosh
+  mac_nodeadkeys  no: Macintosh, eliminate dead keys
+  qwertz          pl: qwertz
+  dvorak          pl: Dvorak
+  dvorak_quotes   pl: Dvorak, Polish quotes on quotemark key
+  dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!"
+  csb             pl: Kashubian
+  ru_phonetic_dvorak pl: Russian phonetic Dvorak
+  nodeadkeys      pt: Eliminate dead keys
+  sundeadkeys     pt: Sun dead keys
+  mac             pt: Macintosh
+  mac_nodeadkeys  pt: Macintosh, eliminate dead keys
+  mac_sundeadkeys pt: Macintosh, Sun dead keys
+  nativo          pt: Nativo
+  nativo-us       pt: Nativo for USA keyboards
+  nativo-epo      pt: Nativo for Esperanto
+  cedilla         ro: Cedilla
+  std             ro: Standard
+  std_cedilla     ro: Standard (Cedilla)
+  winkeys         ro: Winkeys
+  phonetic        ru: Phonetic
+  typewriter      ru: Typewriter
+  legacy          ru: Legacy
+  tt              ru: Tatar
+  os_legacy       ru: Ossetian, legacy
+  os_winkeys      ru: Ossetian, Winkeys
+  cv              ru: Chuvash
+  cv_latin        ru: Chuvash Latin
+  udm             ru: Udmurt
+  kom             ru: Komi
+  sah             ru: Yakut
+  yz              rs: Z and ZHE swapped
+  latin           rs: Latin
+  latinunicode    rs: Latin Unicode
+  latinyz         rs: Latin qwerty
+  latinunicodeyz  rs: Latin Unicode qwerty
+  alternatequotes rs: With guillemets
+  latinalternatequotes rs: Latin with guillemets
+  alternatequotes si: Use guillemets for quotes
+  unicode         si: Use Slovenian digraphs
+  unicodeus       si: US keyboard with Slovenian digraphs
+  us              si: US keyboard with Slovenian letters
+  bksl            sk: Extended Backslash
+  qwerty          sk: qwerty
+  qwerty_bksl     sk: qwerty, extended Backslash
+  nodeadkeys      es: Eliminate dead keys
+  sundeadkeys     es: Sun dead keys
+  dvorak          es: Dvorak
+  ast             es: Asturian variant with bottom-dot H and bottom-dot L
+  cat             es: Catalan variant with middle-dot L
+  mac             es: Macintosh
+  nodeadkeys      se: Eliminate dead keys
+  dvorak          se: Dvorak
+  rus             se: Russian phonetic
+  rus_nodeadkeys  se: Russian phonetic, eliminate dead keys
+  smi             se: Northern Saami
+  mac             se: Macintosh
+  svdvorak        se: Svdvorak
+  de_nodeadkeys   ch: German, eliminate dead keys
+  de_sundeadkeys  ch: German, Sun dead keys
+  fr              ch: French
+  fr_nodeadkeys   ch: French, eliminate dead keys
+  fr_sundeadkeys  ch: French, Sun dead keys
+  fr_mac          ch: French (Macintosh)
+  de_mac          ch: German (Macintosh)
+  syc             sy: Syriac
+  syc_phonetic    sy: Syriac phonetic
+  ku              sy: Kurdish, Latin Q
+  ku_f            sy: Kurdish, (F)
+  ku_alt          sy: Kurdish, Latin Alt-Q
+  tam_unicode     lk: Tamil Unicode
+  tam_TAB         lk: Tamil TAB Typewriter
+  tis             th: TIS-820.2538
+  pat             th: Pattachote
+  f               tr: (F)
+  alt             tr: Alt-Q
+  sundeadkeys     tr: Sun dead keys
+  ku              tr: Kurdish, Latin Q
+  ku_f            tr: Kurdish, (F)
+  ku_alt          tr: Kurdish, Latin Alt-Q
+  intl            tr: International (with dead keys)
+  phonetic        ua: Phonetic
+  typewriter      ua: Typewriter
+  winkeys         ua: Winkeys
+  unicode         ua: Unicode
+  rstu            ua: Standard RSTU
+  rstu_ru         ua: Standard RSTU on Russian layout
+  homophonic      ua: Homophonic
+  intl            gb: International (with dead keys)
+  dvorak          gb: Dvorak
+  dvorakukp       gb: Dvorak (UK Punctuation)
+  mac             gb: Macintosh
+  colemak         gb: Colemak
+  latin           uz: Latin
+  kr104           kr: 101/104 key Compatible
+  CloGaelach      ie: CloGaelach
+  UnicodeExpert   ie: UnicodeExpert
+  ogam            ie: Ogham
+  ogam_is434      ie: Ogham IS434
+  ara             pk: Arabic
+  legacy          epo: displaced semicolon and quote (obsolete)
+  igbo            ng: Igbo
+  yoruba          ng: Yoruba
+  hausa           ng: Hausa
+  left_hand       braille: Left hand
+  right_hand      braille: Right hand
+
+! option
+  grp                  Layout switching
+  grp:switch           R-Alt switches layout while pressed.
+  grp:lswitch          Left Alt key switches layout while pressed.
+  grp:lwin_switch      Left Win-key switches layout while pressed.
+  grp:rwin_switch      Right Win-key switches layout while pressed.
+  grp:win_switch       Both Win-keys switch layout while pressed.
+  grp:caps_switch      CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.
+  grp:rctrl_switch     Right Ctrl key switches layout while pressed.
+  grp:toggle           Right Alt key changes layout.
+  grp:lalt_toggle      Left Alt key changes layout.
+  grp:caps_toggle      CapsLock key changes layout.
+  grp:shift_caps_toggle Shift+CapsLock changes layout.
+  grp:shift_caps_switch CapsLock switch to first layout, Shift+CapsLock switch to last layout.
+  grp:alt_caps_toggle  Alt+CapsLock changes layout.
+  grp:shifts_toggle    Both Shift keys together change layout.
+  grp:alts_toggle      Both Alt keys together change layout.
+  grp:ctrls_toggle     Both Ctrl keys together change layout.
+  grp:ctrl_shift_toggle Ctrl+Shift change layout.
+  grp:lctrl_lshift_toggle LCtrl+LShift change layout.
+  grp:ctrl_alt_toggle  Alt+Ctrl change layout.
+  grp:alt_shift_toggle Alt+Shift change layout.
+  grp:menu_toggle      Menu key changes layout.
+  grp:lwin_toggle      Left Win-key changes layout.
+  grp:rwin_toggle      Right Win-key changes layout.
+  grp:lshift_toggle    Left Shift key changes layout.
+  grp:rshift_toggle    Right Shift key changes layout.
+  grp:lctrl_toggle     Left Ctrl key changes layout.
+  grp:rctrl_toggle     Right Ctrl key changes layout.
+  lv3                  Third level choosers
+  lv3:switch           Press Right Ctrl to choose 3rd level.
+  lv3:menu_switch      Press Menu key to choose 3rd level.
+  lv3:win_switch       Press any of Win-keys to choose 3rd level.
+  lv3:lwin_switch      Press Left Win-key to choose 3rd level.
+  lv3:rwin_switch      Press Right Win-key to choose 3rd level.
+  lv3:alt_switch       Press any of Alt keys to choose 3rd level.
+  lv3:lalt_switch      Press Left Alt key to choose 3rd level.
+  lv3:ralt_switch      Press Right Alt key to choose 3rd level.
+  lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.
+  lv3:ralt_alt         Right Alt key never chooses 3rd level.
+  ctrl                 Ctrl key position
+  ctrl:nocaps          Make CapsLock an additional Ctrl.
+  ctrl:swapcaps        Swap Ctrl and CapsLock.
+  ctrl:ctrl_ac         Ctrl key at left of 'A'
+  ctrl:ctrl_aa         Ctrl key at bottom left
+  ctrl:ctrl_ra         Right Ctrl key works as Right Alt.
+  grp_led              Use keyboard LED to show alternative layout.
+  grp_led:num          NumLock LED shows alternative layout.
+  grp_led:caps         CapsLock LED shows alternative layout.
+  grp_led:scroll       ScrollLock LED shows alternative layout.
+  keypad               Numeric keypad layout selection
+  keypad:legacy        Legacy keypad
+  keypad:oss           Keypad with unicode additions (arrows and math operators)
+  keypad:future        Keypad with unicode additions (arrows and math operators). Math operators on default level.
+  keypad:legacy_wang   Legacy Wang 724 keypad
+  keypad:oss_wang      Wang 724 keypad with unicode additions (arrows and math operators)
+  keypad:future_wang   Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.
+  keypad:phone_hex     ATM/phone-style hexadecimal keypad
+  kpdl                 Numeric keypad delete key behaviour
+  kpdl:dot             Legacy key with dot
+  kpdl:comma           Legacy key with comma
+  kpdl:dotoss          Four-level key with dot
+  kpdl:dotoss_latin9   Four-level key with dot, latin-9 restriction
+  kpdl:commaoss        Four-level key with comma
+  kpdl:momayyezoss     Four-level key with momayyez
+  kpdl:kposs           Four-level key with abstract separators
+  caps                 CapsLock key behavior
+  caps:internal        CapsLock uses internal capitalization. Shift "pauses" CapsLock.
+  caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock.
+  caps:shift           CapsLock acts as Shift with locking. Shift "pauses" CapsLock.
+  caps:shift_nocancel  CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.
+  caps:capslock        CapsLock toggles normal capitalization of alphabetic characters.
+  caps:swapescape      Swap ESC and CapsLock.
+  caps:shiftlock       CapsLock toggles Shift so all keys are affected.
+  altwin               Alt/Win key behavior
+  altwin:menu          Add the standard behavior to Menu key.
+  altwin:meta_alt      Alt and Meta are on the Alt keys.
+  altwin:ctrl_win      Control is mapped to the Win-keys (and the usual Ctrl keys).
+  altwin:meta_win      Meta is mapped to the Win-keys.
+  altwin:left_meta_win Meta is mapped to the left Win-key.
+  altwin:super_win     Super is mapped to the Win-keys.
+  altwin:hyper_win     Hyper is mapped to the Win-keys.
+  altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.
+  altwin:swap_lalt_lwin Left Alt is swapped with left Win-key.
+  Compose key          Compose key position
+  compose:ralt         Right Alt is Compose.
+  compose:lwin         Left Win-key is Compose.
+  compose:rwin         Right Win-key is Compose.
+  compose:menu         Menu is Compose.
+  compose:rctrl        Right Ctrl is Compose.
+  compose:caps         Caps Lock is Compose.
+  compose:102          Less-than/Greater-than is Compose.
+  compat               Miscellaneous compatibility options
+  numpad:pc            Default numeric keypad keys.
+  numpad:mac           Numeric keypad keys work as with Mac.
+  numpad:microsoft     Shift with numeric keypad keys works as in MS Windows.
+  srvrkeys:none        Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.
+  apple:badmap         Swap keycodes of two keys when Mac keyboards are misdetected by kernel.
+  shift:breaks_caps    Shift cancels CapsLock.
+  eurosign             Adding the EuroSign to certain keys
+  eurosign:e           Add the EuroSign to the E key.
+  eurosign:2           Add the EuroSign to the 2 key.
+  eurosign:4           Add the EuroSign to the 4 key.
+  eurosign:5           Add the EuroSign to the 5 key.
+  nbsp                 Using space key to input non-breakable space character
+  nbsp:none            Space key outputs usual space at any level.
+  nbsp:level2          Space key outputs non-breakable space character at second level.
+  nbsp:level3          Space key outputs non-breakable space character at third level.
+  nbsp:level3s         Space key outputs non-breakable space character at third level, nothing at fourth level.
+  nbsp:level3n         Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level
+  nbsp:level4          Space key outputs non-breakable space character at fourth level.
+  nbsp:level4n         Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level
+  nbsp:level4nl        Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)
+  japan                Japanese keyboard options
+  japan:kana_lock      Kana Lock key is locking
+  japan:nicola_f_bs    NICOLA-F style Backspace
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/rules/base.xml	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,4881 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+  <modelList>
+    <model>
+      <configItem>
+        <name>pc101</name>
+        <_description>Generic 101-key PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc102</name>
+        <_description>Generic 102-key (Intl) PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc104</name>
+        <_description>Generic 104-key PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc105</name>
+        <_description>Generic 105-key (Intl) PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dell101</name>
+        <_description>Dell 101-key PC</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>latitude</name>
+        <_description>Dell Latitude series laptop</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellm65</name>
+        <_description>Dell Precision M65</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>everex</name>
+        <_description>Everex STEPnote</_description>
+        <vendor>Everex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>flexpro</name>
+        <_description>Keytronic FlexPro</_description>
+        <vendor>Keytronic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoft</name>
+        <_description>Microsoft Natural</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>omnikey101</name>
+        <_description>Northgate OmniKey 101</_description>
+        <vendor>Northgate</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>winbook</name>
+        <_description>Winbook Model XP5</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>jp106</name>
+        <_description>Japanese 106-key</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc98</name>
+        <_description>PC-98xx Series</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4techKB21</name>
+        <_description>A4Tech KB-21</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4techKBS8</name>
+        <_description>A4Tech KBS-8</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4_rfkb23</name>
+        <_description>A4Tech Wireless Desktop RFKB-23</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>abnt2</name>
+        <_description>Brazilian ABNT2</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>airkey</name>
+        <_description>Acer AirKey V</_description>
+        <vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acpi</name>
+        <_description>ACPI Standard</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>azonaRF2300</name>
+        <_description>Azona RF2300 wireless Internet Keyboard</_description>
+        <vendor>Azona</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>scorpius</name>
+        <_description>Advance Scorpius KI</_description>
+        <vendor>Scorpius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>brother</name>
+        <_description>Brother Internet Keyboard</_description>
+        <vendor>Brother</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5113rf</name>
+        <_description>BTC 5113RF Multimedia</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5126t</name>
+        <_description>BTC 5126T</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc6301urf</name>
+        <_description>BTC 6301URF</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9000</name>
+        <_description>BTC 9000</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9000a</name>
+        <_description>BTC 9000A</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9001ah</name>
+        <_description>BTC 9001AH</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5090</name>
+        <_description>BTC 5090</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9019u</name>
+	<_description>BTC 9019U</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherryblue</name>
+        <_description>Cherry Blue Line CyBo@rd</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherryblueb</name>
+        <_description>Cherry CyMotion Master XPress</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherrybluea</name>
+        <_description>Cherry Blue Line CyBo@rd (alternate option)</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherrycyboard</name>
+        <_description>Cherry CyBo@rd USB-Hub</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony</name>
+        <_description>Chicony Internet Keyboard</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony0108</name>
+        <_description>Chicony KU-0108</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony9885</name>
+        <_description>Chicony KB-9885</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqeak8</name>
+        <_description>Compaq Easy Access Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik7</name>
+        <_description>Compaq Internet Keyboard (7 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik13</name>
+        <_description>Compaq Internet Keyboard (13 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik18</name>
+        <_description>Compaq Internet Keyboard (18 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cymotionlinux</name>
+        <_description>Cherry CyMotion Master Linux</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>armada</name>
+        <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>presario</name>
+        <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ipaq</name>
+        <_description>Compaq iPaq Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dell</name>
+        <_description>Dell</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellsk8125</name>
+        <_description>Dell SK-8125</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellsk8135</name>
+        <_description>Dell SK-8135</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellusbmm</name>
+        <_description>Dell USB Multimedia Keyboard</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>inspiron</name>
+        <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>precision_m</name>
+        <_description>Dell Laptop/notebook Precision M series</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dexxa</name>
+        <_description>Dexxa Wireless Desktop Keyboard</_description>
+        <vendor>Dexxa</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>diamond</name>
+        <_description>Diamond 9801 / 9802 series</_description>
+        <vendor>Diamond</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dtk2000</name>
+        <_description>DTK2000</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ennyah_dkb1008</name>
+        <_description>Ennyah DKB-1008</_description>
+        <vendor>Ennyah</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>fscaa1667g</name>
+        <_description>Fujitsu-Siemens Computers AMILO A1667G laptop</_description>
+        <vendor>Fujitsu-Siemens</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>genius</name>
+        <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuscomfy</name>
+        <_description>Genius Comfy KB-12e</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuscomfy2</name>
+        <_description>Genius Comfy KB-21e-Scroll</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuskb19e</name>
+        <_description>Genius KB-19e NB</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>gyration</name>
+        <_description>Gyration</_description>
+        <vendor>Gyration</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logitech_base</name>
+        <_description>Logitech Generic Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logitech_g15</name>
+        <_description>Logitech G15 extra keys via G15daemon</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpi6</name>
+        <_description>Hewlett-Packard Internet Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp2501</name>
+        <_description>Hewlett-Packard SK-2501 Multimedia Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp2505</name>
+        <_description>Hewlett-Packard SK-2505 Internet Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxe3gc</name>
+        <_description>Hewlett-Packard Omnibook XE3 GC</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxe3gf</name>
+        <_description>Hewlett-Packard Omnibook XE3 GF</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxt1000</name>
+        <_description>Hewlett-Packard Omnibook XT1000</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpzt11xx</name>
+        <_description>Hewlett-Packard Pavilion ZT11xx</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp500fa</name>
+        <_description>Hewlett-Packard Omnibook 500 FA</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5xx</name>
+        <_description>Hewlett-Packard Omnibook 5xx</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5181</name>
+        <_description>Hewlett-Packard Internet Keyboard 5181</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5185</name>
+        <_description>Hewlett-Packard Internet Keyboard 5185</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpnx9020</name>
+        <_description>Hewlett-Packard nx9020</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp6000</name>
+        <_description>Hewlett-Packard Omnibook 6000/6100</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>honeywell_euroboard</name>
+        <_description>Honeywell Euroboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess</name>
+        <_description>IBM Rapid Access</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess2</name>
+        <_description>IBM Rapid Access II</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess2a</name>
+        <_description>IBM Rapid Access II (alternate option)</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpad</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpadintl</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpad60</name>
+        <_description>IBM ThinkPad R60/T60/R61/T61</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpadz60</name>
+        <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ibm_spacesaver</name>
+        <_description>IBM Space Saver</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiaccess</name>
+        <_description>Logitech Access Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiclx300</name>
+        <_description>Logitech Cordless Desktop LX-300</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logii350</name>
+        <_description>Logitech Internet 350 Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logimel</name>
+        <_description>Logitech Media Elite Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd</name>
+        <_description>Logitech Cordless Desktop</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_it</name>
+        <_description>Logitech Cordless Desktop iTouch</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_nav</name>
+        <_description>Logitech Cordless Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_opt</name>
+        <_description>Logitech Cordless Desktop Optical</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicda</name>
+        <_description>Logitech Cordless Desktop (alternate option)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicdpa2</name>
+        <_description>Logitech Cordless Desktop Pro (alternate option2)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicfn</name>
+        <_description>Logitech Cordless Freedom/Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicdn</name>
+        <_description>Logitech Cordless Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiitc</name>
+        <_description>Logitech iTouch Cordless Keyboard (model Y-RB6)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiik</name>
+        <_description>Logitech Internet Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>itouch</name>
+        <_description>Logitech iTouch</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicink</name>
+        <_description>Logitech Internet Navigator Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiex110</name>
+        <_description>Logitech Cordless Desktop EX110</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiinkse</name>
+        <_description>Logitech iTouch Internet Navigator Keyboard SE</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiinkseusb</name>
+        <_description>Logitech iTouch Internet Navigator Keyboard SE (USB)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiultrax</name>
+        <_description>Logitech Ultra-X Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiultraxc</name>
+        <_description>Logitech Ultra-X Cordless Media Desktop Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logidinovo</name>
+        <_description>Logitech diNovo Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logidinovoedge</name>
+        <_description>Logitech diNovo Edge Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx1998</name>
+        <_description>Memorex MX1998</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx2500</name>
+        <_description>Memorex MX2500 EZ-Access Keyboard</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx2750</name>
+        <_description>Memorex MX2750</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoft7000</name>
+        <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftinet</name>
+        <_description>Microsoft Internet Keyboard</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftpro</name>
+        <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprousb</name>
+        <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprooem</name>
+        <_description>Microsoft Natural Keyboard Pro OEM</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>vsonku306</name>
+        <_description>ViewSonic KU-306 Internet Keyboard</_description>
+        <vendor>ViewSonic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprose</name>
+        <_description>Microsoft Internet Keyboard Pro, Swedish</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftoffice</name>
+        <_description>Microsoft Office Keyboard</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftmult</name> 
+        <_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftelite</name> 
+        <_description>Microsoft Natural Keyboard Elite</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>oretec</name>
+        <_description>Ortek MCK-800 MM/Internet keyboard</_description>
+        <vendor>Ortek</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>propeller</name>
+        <_description>Propeller Voyager (KTEZ-1000)</_description>
+        <vendor>KeyTronic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>qtronix</name>
+        <_description>QTronix Scorpius 98N+</_description>
+        <vendor>QTronix</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>samsung4500</name>
+        <_description>Samsung SDM 4500P</_description>
+        <vendor>Samsung</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>samsung4510</name>
+        <_description>Samsung SDM 4510P</_description>
+        <vendor>Samsung</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk1300</name>
+        <_description>SK-1300</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk2500</name>
+        <_description>SK-2500</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk6200</name>
+        <_description>SK-6200</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk7100</name>
+        <_description>SK-7100</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sp_inet</name>
+        <_description>Super Power Multimedia Keyboard</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sven</name>
+        <_description>SVEN Ergonomic 2500</_description>
+	<vendor>SVEN</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sven303</name>
+        <_description>SVEN Slim 303</_description>
+	<vendor>SVEN</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>symplon</name>
+        <_description>Symplon PaceBook (tablet PC)</_description>
+	<vendor>Symplon</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>toshiba_s3000</name>
+        <_description>Toshiba Satellite S3000</_description>
+	<vendor>Toshiba</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>trust</name>
+        <_description>Trust Wireless Keyboard Classic</_description>
+	<vendor>Trust</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>trustda</name>
+        <_description>Trust Direct Access Keyboard</_description>
+	<vendor>Trust</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>yahoo</name>
+        <_description>Yahoo! Internet Keyboard</_description>
+	<vendor>Yahoo!</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook78</name>
+        <_description>MacBook/MacBook Pro</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook79</name>
+        <_description>MacBook/MacBook Pro (Intl)</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh</name>
+        <_description>Macintosh</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh_old</name>
+        <_description>Macintosh Old</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh_hhk</name>
+        <_description>Happy Hacking Keyboard for Mac</_description>
+	<vendor>Fujitsu</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_c300</name>
+        <_description>Acer C300</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_ferrari4k</name>
+        <_description>Acer Ferrari 4000</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_laptop</name>
+        <_description>Acer Laptop</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>asus_laptop</name>
+        <_description>Asus Laptop</_description>
+	<vendor>Asus</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>apple</name>
+        <_description>Apple</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>apple_laptop</name>
+        <_description>Apple Laptop</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>silvercrest</name>
+        <_description>SILVERCREST Multimedia Wireless Keyboard</_description>
+	<vendor>Silvercrest</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>emachines</name>
+        <_description>Laptop/notebook eMachines m68xx</_description>
+	<vendor>eMachines</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>kr106</name>
+	<_description>Korean 106-key</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>evdev</name>
+	<_description>Evdev-managed keyboard</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx</name>
+	<_description>BenQ X-Touch</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx730</name>
+	<_description>BenQ X-Touch 730</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx800</name>
+	<_description>BenQ X-Touch 800</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>hhk</name>
+	<_description>Happy Hacking Keyboard</_description>
+	<vendor>Fujitsu</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>classmate</name>
+	<_description>Classmate PC</_description>
+	<vendor>Intel</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>olpc</name>
+	<_description>OLPC</_description>
+	<vendor>OLPC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_usb</name>
+        <_description>Sun Type 7 USB</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_euro_usb</name>
+        <_description>Sun Type 7 USB (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_unix_usb</name>
+        <_description>Sun Type 7 USB (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_jp_usb</name>
+        <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7</name>
+        <_description>Sun Type 7</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_euro</name>
+        <_description>Sun Type 7 (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_unix</name>
+        <_description>Sun Type 7 (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_usb</name>
+        <_description>Sun Type 6 USB</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_euro_usb</name>
+        <_description>Sun Type 6 USB (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_unix_usb</name>
+        <_description>Sun Type 6 USB (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_jp_usb</name>
+        <_description>Sun Type 6 USB (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_jp_usb</name>
+        <_description>Sun Type 6 USB (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6</name>
+        <_description>Sun Type 6</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_euro</name>
+        <_description>Sun Type 6 (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_jp</name>
+        <_description>Sun Type 6 (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_unix</name>
+        <_description>Sun Type 6 (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5</name>
+        <_description>Sun Type 5</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_euro</name>
+        <_description>Sun Type 5 (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_jp</name>
+        <_description>Sun Type 5 (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_unix</name>
+        <_description>Sun Type 5 (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_hobo</name>
+        <_description>Sun Type 5 Compact</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_euro_hobo</name>
+        <_description>Sun Type 5 Compact (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_jp_hobo</name>
+        <_description>Sun Type 5 Compact (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type4</name>
+        <_description>Sun Type 4</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type4_ca</name>
+        <_description>Sun Type 4 (Canadian  layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type4_jp</name>
+        <_description>Sun Type 4 (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type4_euro</name>
+        <_description>Sun Type 4 (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+  </modelList>
+  <layoutList>
+    <layout>
+      <configItem>
+        <name>us</name>
+        <_shortDescription>USA</_shortDescription>
+        <_description>USA</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>chr</name>
+            <_description>Cherokee</_description>
+            <languageList><iso639Id>chr</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>euro</name>
+            <_description>With EuroSign on 5</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alt-intl</name>
+            <_description>Alternative international (former us_intl)</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Colemak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-intl</name>
+            <_description>Dvorak international</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-l</name>
+            <_description>Left handed Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-r</name>
+            <_description>Right handed Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-classic</name>
+            <_description>Classic Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvp</name>
+            <_description>Programmer Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus</name>
+            <_description>Russian phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>altgr-intl</name>
+            <_description>International (AltGr dead keys)</_description>
+            <languageList><iso639Id>eng</iso639Id>
+                          <iso639Id>fra</iso639Id>
+                          <iso639Id>ger</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc2</name>
+            <_description>Group toggle on multiply/divide key</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ad</name>
+        <_shortDescription>And</_shortDescription>
+        <_description>Andorra</_description>
+        <languageList><iso639Id>cat</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>af</name>
+        <_shortDescription>Afg</_shortDescription>
+        <_description>Afghanistan</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ps</name>
+            <_description>Pashto</_description>
+            <languageList><iso639Id>pus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>uz</name>
+            <_description>Southern Uzbek</_description>
+            <languageList><iso639Id>uzb</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-ps</name>
+            <_description>OLPC Pashto</_description>
+            <languageList><iso639Id>pus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-fa</name>
+            <_description>OLPC Dari</_description>
+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-uz</name>
+            <_description>OLPC Southern Uzbek</_description>
+            <languageList><iso639Id>uzb</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ara</name>
+        <_shortDescription>Ara</_shortDescription>
+        <_description>Arabic</_description>
+        <countryList>
+          <iso3166Id>AE</iso3166Id>
+          <iso3166Id>BH</iso3166Id>
+          <iso3166Id>DZ</iso3166Id>
+          <iso3166Id>EG</iso3166Id>
+          <iso3166Id>EH</iso3166Id>
+          <iso3166Id>JO</iso3166Id>
+          <iso3166Id>KW</iso3166Id>
+          <iso3166Id>LB</iso3166Id>
+          <iso3166Id>LY</iso3166Id>
+          <iso3166Id>MA</iso3166Id>
+          <iso3166Id>MR</iso3166Id>
+          <iso3166Id>OM</iso3166Id>
+          <iso3166Id>PS</iso3166Id>
+          <iso3166Id>QA</iso3166Id>
+          <iso3166Id>SA</iso3166Id>
+          <iso3166Id>SD</iso3166Id>
+          <iso3166Id>SY</iso3166Id>
+          <iso3166Id>TN</iso3166Id>
+          <iso3166Id>YE</iso3166Id>
+        </countryList>
+        <languageList><iso639Id>ara</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>azerty</name>
+            <_description>azerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>azerty_digits</name>
+            <_description>azerty/digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>digits</name>
+            <_description>digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_digits</name>
+            <_description>qwerty/digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>buckwalter</name>
+            <_description>Buckwalter</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>al</name>
+        <_shortDescription>Alb</_shortDescription>
+        <_description>Albania</_description>
+        <languageList><iso639Id>alb</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>am</name>
+        <_shortDescription>Arm</_shortDescription>
+        <_description>Armenia</_description>
+        <languageList><iso639Id>hye</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>phonetic-alt</name>
+            <_description>Alternative Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eastern</name>
+            <_description>Eastern</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>western</name>
+            <_description>Western</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eastern-alt</name>
+            <_description>Alternative Eastern</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>az</name>
+        <_shortDescription>Aze</_shortDescription>
+        <_description>Azerbaijan</_description>
+        <languageList><iso639Id>aze</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cyrillic</name>
+            <_description>Cyrillic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>by</name>
+        <_shortDescription>Blr</_shortDescription>
+        <_description>Belarus</_description>
+        <languageList><iso639Id>bel</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>be</name>
+        <_shortDescription>Bel</_shortDescription>
+        <_description>Belgium</_description>
+        <languageList><iso639Id>ger</iso639Id>
+                      <iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>iso-alternate</name>
+            <_description>ISO Alternate</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>wang</name>
+            <_description>Wang model 724 azerty</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bd</name>
+        <_shortDescription>Ban</_shortDescription>
+        <_description>Bangladesh</_description>
+        <languageList><iso639Id>ben</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>probhat</name>
+            <_description>Probhat</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>in</name>
+        <_shortDescription>Ind</_shortDescription>
+        <_description>India</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ben</name>
+            <_description>Bengali</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_probhat</name>
+            <_description>Bengali Probhat</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guj</name>
+            <_description>Gujarati</_description>
+            <languageList><iso639Id>guj</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guru</name>
+            <_description>Gurmukhi</_description>
+            <languageList><iso639Id>pan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>jhelum</name>
+            <_description>Gurmukhi Jhelum</_description>
+            <languageList><iso639Id>pan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kan</name>
+            <_description>Kannada</_description>
+            <languageList><iso639Id>kan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal</name>
+            <_description>Malayalam</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
+         </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>mal_lalitha</name>
+            <_description>Malayalam Lalitha</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
+         </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ori</name>
+            <_description>Oriya</_description>
+            <languageList><iso639Id>ori</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <_description>Tamil Unicode</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <_description>Tamil TAB Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TSCII</name>
+            <_description>Tamil TSCII Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam</name>
+            <_description>Tamil</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tel</name>
+            <_description>Telugu</_description>
+            <languageList><iso639Id>tel</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>urd</name>
+            <_description>Urdu</_description>
+            <languageList><iso639Id>urd</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bolnagri</name>
+            <_description>Hindi Bolnagri</_description>
+            <languageList><iso639Id>hin</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ba</name>
+        <_shortDescription>Bih</_shortDescription>
+        <_description>Bosnia and Herzegovina</_description>
+        <languageList><iso639Id>bos</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description> Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Bosnian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Bosnian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Bosnian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>br</name>
+        <_shortDescription>Bra</_shortDescription>
+        <_description>Brazil</_description>
+        <languageList><iso639Id>por</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo</name>
+            <_description>Nativo</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-us</name>
+            <_description>Nativo for USA keyboards</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-epo</name>
+            <_description>Nativo for Esperanto</_description>
+            <languageList><iso639Id>epo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bg</name>
+        <_shortDescription>Bgr</_shortDescription>
+        <_description>Bulgaria</_description>
+        <languageList><iso639Id>bul</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ma</name>
+        <_description>Morocco</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>french</name>
+            <_description>French</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh</name>
+            <_description>Tifinagh</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-alt</name>
+            <_description>Tifinagh Alternative</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-alt-phonetic</name>
+            <_description>Tifinagh Alternative Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-extended</name>
+            <_description>Tifinagh Extended</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-phonetic</name>
+            <_description>Tifinagh Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-extended-phonetic</name>
+            <_description>Tifinagh Extended Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mm</name>
+        <_shortDescription>Mmr</_shortDescription>
+        <_description>Myanmar</_description>
+        <languageList><iso639Id>mya</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ca</name>
+        <_shortDescription>Can</_shortDescription>
+        <_description>Canada</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>fr-dvorak</name>
+            <_description>French Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr-legacy</name>
+            <_description>French (legacy)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multix</name>
+            <_description>Multilingual</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multi</name>
+            <_description>Multilingual, first part</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multi-2gr</name>
+            <_description>Multilingual, second part</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ike</name>
+            <_description>Inuktitut</_description>
+            <languageList><iso639Id>iku</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>shs</name>
+            <_description>Secwepemctsin</_description>
+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kut</name>
+            <_description>Ktunaxa</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cd</name>
+        <_shortDescription>DRC</_shortDescription>
+        <_description>Congo, Democratic Republic of the</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cn</name>
+        <_shortDescription>China</_shortDescription>
+        <_description>China</_description>
+        <languageList><iso639Id>chi</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tib</name>
+            <_description>Tibetan</_description>
+            <languageList><iso639Id>tib</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tib_asciinum</name>
+            <_description>Tibetan (with ASCII numerals)</_description>
+            <languageList><iso639Id>tib</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>hr</name>
+        <_shortDescription>Hrv</_shortDescription>
+        <_description>Croatia</_description>
+        <languageList><iso639Id>scr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Croatian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Croatian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Croatian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cz</name>
+        <_shortDescription>Cze</_shortDescription>
+        <_description>Czechia</_description>
+        <languageList><iso639Id>cze</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>bksl</name>
+            <_description>With &lt;\|&gt; key</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_bksl</name>
+            <_description>qwerty, extended Backslash</_description>
+          </configItem>
+        </variant>
+	<variant>
+	  <configItem>
+	    <name>ucw</name>
+	    <_description>UCW layout (accented letters only)</_description>
+	 </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>dk</name>
+        <_shortDescription>Dan</_shortDescription>
+        <_description>Denmark</_description>
+        <languageList><iso639Id>dan</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>nl</name>
+        <_shortDescription>Nld</_shortDescription>
+        <_description>Netherlands</_description>
+        <languageList><iso639Id>nld</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bt</name>
+        <_shortDescription>Bhu</_shortDescription>
+        <_description>Bhutan</_description>
+        <languageList><iso639Id>dzo</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ee</name>
+        <_shortDescription>Est</_shortDescription>
+        <_description>Estonia</_description>
+        <languageList><iso639Id>est</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Estonian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ir</name>
+        <_shortDescription>Irn</_shortDescription>
+        <_description>Iran</_description>
+        <languageList><iso639Id>per</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>pro</name>
+            <_description>Pro</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>keypad</name>
+            <_description>Keypad</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>pro_keypad</name>
+            <_description>Pro Keypad</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_ara</name>
+            <_description>Kurdish, Arabic-Latin</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>iq</name>
+        <_shortDescription>Irq</_shortDescription>
+        <_description>Iraq</_description>
+        <languageList><iso639Id>ara</iso639Id>
+                      <iso639Id>kur</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_ara</name>
+            <_description>Kurdish, Arabic-Latin</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fo</name>
+        <_shortDescription>Fao</_shortDescription>
+        <_description>Faroe Islands</_description>
+        <languageList><iso639Id>fao</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fi</name>
+        <_shortDescription>Fin</_shortDescription>
+        <_description>Finland</_description>
+        <languageList><iso639Id>fin</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>smi</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>classic</name>
+            <_description>Classic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fr</name>
+        <_shortDescription>Fra</_shortDescription>
+        <_description>France</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss</name>
+            <_description>Alternative</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_latin9</name>
+            <_description>Alternative, latin-9 only</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_nodeadkeys</name>
+            <_description>Alternative, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_sundeadkeys</name>
+            <_description>Alternative, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9</name>
+            <_description>(Legacy) Alternative</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_nodeadkeys</name>
+            <_description>(Legacy) Alternative, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_sundeadkeys</name>
+            <_description>(Legacy) Alternative, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bepo</name>
+            <_description>Bepo, ergonomic, Dvorak way</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bepo_latin9</name>
+            <_description>Bepo, ergonomic, Dvorak way, latin-9 only</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>geo</name>
+            <_description>Georgian AZERTY Tskapo</_description>
+            <languageList><iso639Id>geo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gh</name>
+        <_shortDescription>Gha</_shortDescription>
+        <_description>Ghana</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>generic</name>
+            <_description>Multilingual</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>akan</name>
+            <_description>Akan</_description>
+            <languageList><iso639Id>aka</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ewe</name>
+            <_description>Ewe</_description>
+            <languageList><iso639Id>ewe</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fula</name>
+            <_description>Fula</_description>
+            <languageList><iso639Id>ful</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ga</name>
+            <_description>Ga</_description>
+            <languageList><iso639Id>gaa</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hausa</name>
+            <_description>Hausa</_description>
+            <languageList><iso639Id>hau</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gn</name>
+        <_shortDescription>Gui</_shortDescription>
+        <_description>Guinea</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ge</name>
+        <_shortDescription>Geo</_shortDescription>
+        <_description>Georgia</_description>
+        <languageList><iso639Id>geo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <_description>Ergonomic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mess</name>
+            <_description>MESS</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ru</name>
+            <_description>Russian</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os</name>
+            <_description>Ossetian</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>de</name>
+        <_shortDescription>Deu</_shortDescription>
+        <_description>Germany</_description>
+        <languageList><iso639Id>ger</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>deadacute</name>
+            <_description>Dead acute</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>deadgraveacute</name>
+            <_description>Dead grave acute</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ro</name>
+            <_description>Romanian keyboard with German letters</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ro_nodeadkeys</name>
+            <_description>Romanian keyboard with German letters, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>neo</name>
+            <_description>Neostyle</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gr</name>
+        <_shortDescription>Gre</_shortDescription>
+        <_description>Greece</_description>
+        <languageList><iso639Id>gre</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>simple</name>
+            <_description>Simple</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>extended</name>
+            <_description>Extended</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>polytonic</name>
+            <_description>Polytonic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>hu</name>
+        <_shortDescription>Hun</_shortDescription>
+        <_description>Hungary</_description>
+        <languageList><iso639Id>hun</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>standard</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+
+        <!-- 101 keys -->
+        <variant>
+          <configItem>
+            <name>101_qwertz_comma_dead</name>
+            <_description>101/qwertz/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_comma_nodead</name>
+            <_description>101/qwertz/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_dot_dead</name>
+            <_description>101/qwertz/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_dot_nodead</name>
+            <_description>101/qwertz/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_comma_dead</name>
+            <_description>101/qwerty/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_comma_nodead</name>
+            <_description>101/qwerty/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_dot_dead</name>
+            <_description>101/qwerty/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_dot_nodead</name>
+            <_description>101/qwerty/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+
+
+        <!-- 102 keys -->
+        <variant>
+          <configItem>
+            <name>102_qwertz_comma_dead</name>
+            <_description>102/qwertz/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_comma_nodead</name>
+            <_description>102/qwertz/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_dot_dead</name>
+            <_description>102/qwertz/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_dot_nodead</name>
+            <_description>102/qwertz/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_comma_dead</name>
+            <_description>102/qwerty/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_comma_nodead</name>
+            <_description>102/qwerty/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_dot_dead</name>
+            <_description>102/qwerty/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_dot_nodead</name>
+            <_description>102/qwerty/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>is</name>
+        <_shortDescription>Isl</_shortDescription>
+        <_description>Iceland</_description>
+        <languageList><iso639Id>ice</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>Sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>il</name>
+        <_shortDescription>Isr</_shortDescription>
+        <_description>Israel</_description>
+        <languageList><iso639Id>heb</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>lyx</name>
+            <_description>lyx</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>biblical</name>
+            <_description>Biblical Hebrew (Tiro)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>it</name>
+        <_shortDescription>Ita</_shortDescription>
+        <_description>Italy</_description>
+        <languageList><iso639Id>ita</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>geo</name>
+            <_description>Georgian</_description>
+            <languageList><iso639Id>geo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>jp</name>
+        <_shortDescription>Jpn</_shortDescription>
+        <_description>Japan</_description>
+        <languageList><iso639Id>jpn</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>kana</name>
+            <_description>Kana</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>OADG109A</name>
+            <_description>OADG 109A</_description>
+          </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>kg</name>
+        <_shortDescription>Kir</_shortDescription>
+        <_description>Kyrgyzstan</_description>
+        <languageList><iso639Id>kir</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>kh</name>
+        <_shortDescription>Khm</_shortDescription>
+        <_description>Cambodia</_description>
+        <languageList><iso639Id>khm</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+	<name>kz</name>
+	<_shortDescription>Kaz</_shortDescription>
+	<_description>Kazakhstan</_description>
+        <languageList><iso639Id>kaz</iso639Id></languageList>
+      </configItem>
+      <variantList>
+	<variant>
+	  <configItem>
+	    <name>ruskaz</name>
+	    <_description>Russian with Kazakh</_description>
+            <languageList><iso639Id>kaz</iso639Id>
+                          <iso639Id>rus</iso639Id></languageList>
+	  </configItem>
+	</variant>
+	<variant>
+	  <configItem>
+	    <name>kazrus</name>
+	    <_description>Kazakh with Russian</_description>
+            <languageList><iso639Id>kaz</iso639Id>
+                          <iso639Id>rus</iso639Id></languageList>
+	  </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>la</name>
+        <_shortDescription>Lao</_shortDescription>
+        <_description>Laos</_description>
+        <languageList><iso639Id>lao</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>latam</name>
+        <_shortDescription>LAm</_shortDescription>
+        <_description>Latin American</_description>
+        <countryList>
+          <iso3166Id>AR</iso3166Id>
+          <iso3166Id>BO</iso3166Id>
+          <iso3166Id>CL</iso3166Id>
+          <iso3166Id>CO</iso3166Id>
+          <iso3166Id>CR</iso3166Id>
+          <iso3166Id>CU</iso3166Id>
+          <iso3166Id>DO</iso3166Id>
+          <iso3166Id>EC</iso3166Id>
+          <iso3166Id>GT</iso3166Id>
+          <iso3166Id>HN</iso3166Id>
+          <iso3166Id>HT</iso3166Id>
+          <iso3166Id>MX</iso3166Id>
+          <iso3166Id>NI</iso3166Id>
+          <iso3166Id>PA</iso3166Id>
+          <iso3166Id>PE</iso3166Id>
+          <iso3166Id>PR</iso3166Id>
+          <iso3166Id>PY</iso3166Id>
+          <iso3166Id>UY</iso3166Id>
+          <iso3166Id>VE</iso3166Id>
+        </countryList>
+        <languageList><iso639Id>spa</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lt</name>
+        <_shortDescription>Ltu</_shortDescription>
+        <_description>Lithuania</_description>
+        <languageList><iso639Id>lit</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Lithuanian letters</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ibm</name>
+            <_description>IBM (LST 1205-92)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>lekp</name>
+            <_description>LEKP</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>lekpa</name>
+            <_description>LEKPa</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>balticplus</name>
+            <_description>Baltic+</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lv</name>
+        <_shortDescription>Lav</_shortDescription>
+        <_description>Latvia</_description>
+        <languageList><iso639Id>lav</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>apostrophe</name>
+            <_description>Apostrophe (') variant</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tilde</name>
+            <_description>Tilde (~) variant</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fkey</name>
+            <_description>F-letter (F) variant</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mao</name>
+        <_shortDescription>Mao</_shortDescription>
+        <_description>Maori</_description>
+        <languageList><iso639Id>mao</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>me</name>
+        <_shortDescription>MNE</_shortDescription>
+        <_description>Montenegro</_description>
+        <languageList><iso639Id>srp</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cyrillic</name>
+            <_description>Cyrillic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cyrillicyz</name>
+            <_description>Cyrillic, Z and ZHE swapped</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicode</name>
+            <_description>Latin unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinyz</name>
+            <_description>Latin qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicodeyz</name>
+            <_description>Latin unicode qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cyrillicalternatequotes</name>
+            <_description>Cyrillic with guillemets</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinalternatequotes</name>
+            <_description>Latin with guillemets</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mk</name>
+        <_shortDescription>Mkd</_shortDescription>
+        <_description>Macedonia</_description>
+        <languageList><iso639Id>mkd</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mt</name>
+        <_shortDescription>Mlt</_shortDescription>
+        <_description>Malta</_description>
+        <languageList><iso639Id>mlt</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>Maltese keyboard with US layout</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mn</name>
+        <_shortDescription>Mng</_shortDescription>
+        <_description>Mongolia</_description>
+        <languageList><iso639Id>mng</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>no</name>
+        <_shortDescription>Nor</_shortDescription>
+        <_description>Norway</_description>
+        <languageList><iso639Id>nor</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi_nodeadkeys</name>
+            <_description>Northern Saami, eliminate dead keys</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pl</name>
+        <_shortDescription>Pol</_shortDescription>
+        <_description>Poland</_description>
+        <languageList><iso639Id>pol</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>qwertz</name>
+            <_description>qwertz</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak_quotes</name>
+            <_description>Dvorak, Polish quotes on quotemark key</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak_altquotes</name>
+            <_description>Dvorak, Polish quotes on key "1/!"</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>csb</name>
+            <_description>Kashubian</_description>
+            <languageList><iso639Id>csb</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ru_phonetic_dvorak</name>
+            <_description>Russian phonetic Dvorak</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pt</name>
+        <_shortDescription>Prt</_shortDescription>
+        <_description>Portugal</_description>
+        <languageList><iso639Id>por</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_sundeadkeys</name>
+            <_description>Macintosh, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo</name>
+            <_description>Nativo</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-us</name>
+            <_description>Nativo for USA keyboards</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-epo</name>
+            <_description>Nativo for Esperanto</_description>
+            <languageList><iso639Id>epo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ro</name>
+        <_shortDescription>Rou</_shortDescription>
+        <_description>Romania</_description>
+        <languageList><iso639Id>rum</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cedilla</name>
+            <_description>Cedilla</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std_cedilla</name>
+            <_description>Standard (Cedilla)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ru</name>
+        <_shortDescription>Rus</_shortDescription>
+        <_description>Russia</_description>
+        <languageList><iso639Id>rus</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>typewriter</name>
+            <_description>Typewriter</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>legacy</name>
+            <_description>Legacy</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tt</name>
+            <_description>Tatar</_description>
+            <languageList><iso639Id>tat</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os_legacy</name>
+            <_description>Ossetian, legacy</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os_winkeys</name>
+            <_description>Ossetian, Winkeys</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cv</name>
+            <_description>Chuvash</_description>
+            <languageList><iso639Id>chv</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cv_latin</name>
+            <_description>Chuvash Latin</_description>
+            <languageList><iso639Id>chv</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>udm</name>
+            <_description>Udmurt</_description>
+            <languageList><iso639Id>udm</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kom</name>
+            <_description>Komi</_description>
+            <languageList><iso639Id>kom</iso639Id></languageList>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>sah</name>
+            <_description>Yakut</_description>
+            <languageList><iso639Id>sah</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>rs</name>
+        <_shortDescription>SRB</_shortDescription>
+        <_description>Serbia</_description>
+        <languageList><iso639Id>srp</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>yz</name>
+            <_description>Z and ZHE swapped</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicode</name>
+            <_description>Latin Unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinyz</name>
+            <_description>Latin qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicodeyz</name>
+            <_description>Latin Unicode qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>With guillemets</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinalternatequotes</name>
+            <_description>Latin with guillemets</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>si</name>
+        <_shortDescription>Svn</_shortDescription>
+        <_description>Slovenia</_description>
+        <languageList><iso639Id>slv</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Slovenian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Slovenian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Slovenian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>sk</name>
+        <_shortDescription>Svk</_shortDescription>
+        <_description>Slovakia</_description>
+        <languageList><iso639Id>slo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>bksl</name>
+            <_description>Extended Backslash</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_bksl</name>
+            <_description>qwerty, extended Backslash</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>es</name>
+        <_shortDescription>Esp</_shortDescription>
+        <_description>Spain</_description>
+        <languageList><iso639Id>spa</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ast</name>
+            <_description>Asturian variant with bottom-dot H and bottom-dot L</_description>
+            <languageList><iso639Id>ast</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cat</name>
+            <_description>Catalan variant with middle-dot L</_description>
+            <languageList><iso639Id>cat</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>se</name>
+        <_shortDescription>Swe</_shortDescription>
+        <_description>Sweden</_description>
+        <languageList><iso639Id>swe</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus</name>
+            <_description>Russian phonetic</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus_nodeadkeys</name>
+            <_description>Russian phonetic, eliminate dead keys</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>svdvorak</name>
+            <_description>Svdvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ch</name>
+        <_shortDescription>Che</_shortDescription>
+        <_description>Switzerland</_description>
+        <languageList><iso639Id>ger</iso639Id>
+                      <iso639Id>gsw</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>de_nodeadkeys</name>
+            <_description>German, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>de_sundeadkeys</name>
+            <_description>German, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr</name>
+            <_description>French</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_nodeadkeys</name>
+            <_description>French, eliminate dead keys</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_sundeadkeys</name>
+            <_description>French, Sun dead keys</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_mac</name>
+            <_description>French (Macintosh)</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>de_mac</name>
+            <_description>German (Macintosh)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>sy</name>
+        <_shortDescription>Syr</_shortDescription>
+        <_description>Syria</_description>
+        <languageList><iso639Id>syr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>syc</name>
+            <_description>Syriac</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>syc_phonetic</name>
+            <_description>Syriac phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>tj</name>
+        <_shortDescription>Tjk</_shortDescription>
+        <_description>Tajikistan</_description>
+        <languageList><iso639Id>tgk</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lk</name>
+        <_shortDescription>SrL</_shortDescription>
+        <_description>Sri Lanka</_description>
+        <languageList><iso639Id>sin</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <_description>Tamil Unicode</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <_description>Tamil TAB Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>th</name>
+        <_shortDescription>Tha</_shortDescription>
+        <_description>Thailand</_description>
+        <languageList><iso639Id>tha</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tis</name>
+            <_description>TIS-820.2538</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>pat</name>
+            <_description>Pattachote</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>tr</name>
+        <_shortDescription>Tur</_shortDescription>
+        <_description>Turkey</_description>
+        <languageList><iso639Id>tur</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>f</name>
+            <_description>(F)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alt</name>
+            <_description>Alt-Q</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ua</name>
+        <_shortDescription>Ukr</_shortDescription>
+        <_description>Ukraine</_description>
+        <languageList><iso639Id>ukr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>typewriter</name>
+            <_description>Typewriter</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rstu</name>
+<!-- RSTU 2019-91 -->
+            <_description>Standard RSTU</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rstu_ru</name>
+<!-- RSTU 2019-91 -->
+            <_description>Standard RSTU on Russian layout</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>homophonic</name>
+            <_description>Homophonic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gb</name>
+        <_shortDescription>GBr</_shortDescription>
+        <_description>United Kingdom</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorakukp</name>
+            <_description>Dvorak (UK Punctuation)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Colemak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>uz</name>
+        <_shortDescription>Uzb</_shortDescription>
+        <_description>Uzbekistan</_description>
+        <languageList><iso639Id>uzb</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>vn</name>
+        <_shortDescription>Vnm</_shortDescription>
+        <_description>Vietnam</_description>
+        <languageList><iso639Id>vie</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+       <configItem>
+        <name>kr</name>
+        <_shortDescription>Kor</_shortDescription>
+        <_description>Korea, Republic of</_description>
+        <languageList><iso639Id>kor</iso639Id></languageList>
+      </configItem>
+      <variantList>
+	<variant>
+	  <configItem>
+	    <name>kr104</name>
+	    <_description>101/104 key Compatible</_description>
+	  </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>nec_vndr/jp</name>
+        <_shortDescription>Jpn</_shortDescription>
+        <_description>Japan (PC-98xx Series)</_description>
+        <countryList><iso3166Id>JP</iso3166Id></countryList>
+        <languageList><iso639Id>jpn</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ie</name>
+        <_shortDescription>Irl</_shortDescription>
+        <_description>Ireland</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>CloGaelach</name>
+            <_description>CloGaelach</_description>
+            <languageList><iso639Id>gla</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>UnicodeExpert</name>
+            <_description>UnicodeExpert</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ogam</name>
+            <_description>Ogham</_description>
+            <!-- No ISO code in ISO639 -->
+         </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ogam_is434</name>
+            <_description>Ogham IS434</_description>
+            <!-- No ISO code in ISO639 -->
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pk</name>
+        <_shortDescription>Pak</_shortDescription>
+        <_description>Pakistan</_description>
+        <languageList><iso639Id>urd</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ara</name>
+            <_description>Arabic</_description>
+            <languageList><iso639Id>ara</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mv</name>
+        <_shortDescription>Mal</_shortDescription>
+        <_description>Maldives</_description>
+        <languageList><iso639Id>div</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+       <configItem>
+        <name>za</name>
+        <_shortDescription>Zar</_shortDescription>
+        <_description>South Africa</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>epo</name>
+        <_shortDescription>Epo</_shortDescription>
+	<_description>Esperanto</_description>
+        <languageList><iso639Id>epo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>legacy</name>
+            <_description>displaced semicolon and quote (obsolete)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>np</name>
+        <_shortDescription>Nep</_shortDescription>
+	<_description>Nepal</_description>
+        <languageList><iso639Id>nep</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ng</name>
+        <_shortDescription>Nig</_shortDescription>
+	<_description>Nigeria</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>igbo</name>
+            <_description>Igbo</_description>
+            <languageList><iso639Id>ibo</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>yoruba</name>
+            <_description>Yoruba</_description>
+            <languageList><iso639Id>yor</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hausa</name>
+            <_description>Hausa</_description>
+            <languageList><iso639Id>hau</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>et</name>
+        <_shortDescription>Eth</_shortDescription>
+        <_description>Ethiopia</_description>
+        <languageList><iso639Id>amh</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>braille</name>
+        <_shortDescription>Brl</_shortDescription>
+        <_description>Braille</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>left_hand</name>
+            <_description>Left hand</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>right_hand</name>
+            <_description>Right hand</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+  </layoutList>
+  <optionList>
+    <group allowMultipleSelection="true">
+      <!-- The key combination used to switch between groups -->
+      <configItem>
+        <name>grp</name>
+        <_description>Layout switching</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>grp:switch</name>
+          <_description>R-Alt switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lswitch</name>
+          <_description>Left Alt key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lwin_switch</name>
+          <_description>Left Win-key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rwin_switch</name>
+          <_description>Right Win-key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:win_switch</name>
+          <_description>Both Win-keys switch layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:caps_switch</name>
+          <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rctrl_switch</name>
+          <_description>Right Ctrl key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:toggle</name>
+          <_description>Right Alt key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lalt_toggle</name>
+          <_description>Left Alt key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:caps_toggle</name>
+          <_description>CapsLock key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shift_caps_toggle</name>
+          <_description>Shift+CapsLock changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shift_caps_switch</name>
+          <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alt_caps_toggle</name>
+          <_description>Alt+CapsLock changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shifts_toggle</name>
+          <_description>Both Shift keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alts_toggle</name>
+          <_description>Both Alt keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrls_toggle</name>
+          <_description>Both Ctrl keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_shift_toggle</name>
+          <_description>Ctrl+Shift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lctrl_lshift_toggle</name>
+          <_description>LCtrl+LShift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_alt_toggle</name>
+          <_description>Alt+Ctrl change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alt_shift_toggle</name>
+          <_description>Alt+Shift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:menu_toggle</name>
+          <_description>Menu key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lwin_toggle</name>
+          <_description>Left Win-key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rwin_toggle</name>
+          <_description>Right Win-key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lshift_toggle</name>
+          <_description>Left Shift key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rshift_toggle</name>
+          <_description>Right Shift key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lctrl_toggle</name>
+          <_description>Left Ctrl key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rctrl_toggle</name>
+          <_description>Right Ctrl key changes layout.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- The key combination used to choose the 3rd (and 4th, together with Shift)
+	   level of symbols -->
+      <configItem>
+        <name>lv3</name>
+        <_description>Third level choosers</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>lv3:switch</name>
+          <_description>Press Right Ctrl to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:menu_switch</name>
+          <_description>Press Menu key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:win_switch</name>
+          <_description>Press any of Win-keys to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lwin_switch</name>
+          <_description>Press Left Win-key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:rwin_switch</name>
+          <_description>Press Right Win-key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:alt_switch</name>
+          <_description>Press any of Alt keys to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lalt_switch</name>
+          <_description>Press Left Alt key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_switch</name>
+          <_description>Press Right Alt key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_switch_multikey</name>
+          <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_alt</name>
+          <_description>Right Alt key never chooses 3rd level.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Tweaking the position of the "Ctrl" key -->
+      <configItem>
+        <name>ctrl</name>
+        <_description>Ctrl key position</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>ctrl:nocaps</name>
+          <_description>Make CapsLock an additional Ctrl.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:swapcaps</name>
+          <_description>Swap Ctrl and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ac</name>
+          <_description>Ctrl key at left of 'A'</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_aa</name>
+          <_description>Ctrl key at bottom left</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ra</name>
+          <_description>Right Ctrl key works as Right Alt.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
+      <configItem>
+        <name>grp_led</name>
+        <_description>Use keyboard LED to show alternative layout.</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>grp_led:num</name>
+          <_description>NumLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp_led:caps</name>
+          <_description>CapsLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp_led:scroll</name>
+          <_description>ScrollLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Select a keypad type -->
+      <configItem>
+        <name>keypad</name>
+        <_description>Numeric keypad layout selection</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>keypad:legacy</name>
+          <_description>Legacy keypad</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:oss</name>
+          <_description>Keypad with unicode additions (arrows and math operators)</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:future</name>
+          <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:legacy_wang</name>
+          <_description>Legacy Wang 724 keypad</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:oss_wang</name>
+          <_description>Wang 724 keypad with unicode additions (arrows and math operators)</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:future_wang</name>
+          <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:phone_hex</name>
+          <_description>ATM/phone-style hexadecimal keypad</_description>
+        </configItem>
+      </option>
+    </group>
+    <!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place -->
+    <group allowMultipleSelection="false">
+      <!-- Select a keypad KPDL variant -->
+      <configItem>
+        <name>kpdl</name>
+        <_description>Numeric keypad delete key behaviour</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <!-- Actually, with KP_DECIMAL, as the old keypad(dot) -->
+          <name>kpdl:dot</name>
+          <_description>Legacy key with dot</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:comma</name>
+          <!-- Actually, with KP_SEPARATOR, as the old keypad(comma) -->
+          <_description>Legacy key with comma</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:dotoss</name>
+          <_description>Four-level key with dot</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:dotoss_latin9</name>
+          <_description>Four-level key with dot, latin-9 restriction</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:commaoss</name>
+          <_description>Four-level key with comma</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:momayyezoss</name>
+          <_description>Four-level key with momayyez</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:kposs</name>
+          <!-- This assumes the KP_ abstract symbols are actually useful for some apps
+               The description needs to be rewritten -->
+          <_description>Four-level key with abstract separators</_description>
+       </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- CapsLock tweaks. 
+	   "Internal" capitalization means capitalization using some internal tables.
+	   Otherwise "as Shift" - means using next group. -->
+      <configItem>
+        <name>caps</name>
+        <_description>CapsLock key behavior</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>caps:internal</name>
+          <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:internal_nocancel</name>
+          <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shift</name>
+          <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shift_nocancel</name>
+          <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:capslock</name>
+          <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:swapescape</name>
+          <_description>Swap ESC and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shiftlock</name>
+          <_description>CapsLock toggles Shift so all keys are affected.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
+      <configItem>
+        <name>altwin</name>
+        <_description>Alt/Win key behavior</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>altwin:menu</name>
+          <_description>Add the standard behavior to Menu key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:meta_alt</name>
+          <_description>Alt and Meta are on the Alt keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:ctrl_win</name>
+          <_description>Control is mapped to the Win-keys (and the usual Ctrl keys).</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:meta_win</name>
+          <_description>Meta is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:left_meta_win</name>
+          <_description>Meta is mapped to the left Win-key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:super_win</name>
+          <_description>Super is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:hyper_win</name>
+          <_description>Hyper is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:alt_super_win</name>
+          <_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:swap_lalt_lwin</name>
+          <_description>Left Alt is swapped with left Win-key.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
+      <configItem>
+        <name>Compose key</name>
+        <_description>Compose key position</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>compose:ralt</name>
+          <_description>Right Alt is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:lwin</name>
+          <_description>Left Win-key is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:rwin</name>
+          <_description>Right Win-key is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:menu</name>
+          <_description>Menu is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:rctrl</name>
+          <_description>Right Ctrl is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:caps</name>
+          <_description>Caps Lock is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:102</name>
+          <_description>Less-than/Greater-than is Compose.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>compat</name>
+        <_description>Miscellaneous compatibility options</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>numpad:pc</name>
+          <_description>Default numeric keypad keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:mac</name>
+          <_description>Numeric keypad keys work as with Mac.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:microsoft</name>
+          <_description>Shift with numeric keypad keys works as in MS Windows.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>srvrkeys:none</name>
+          <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>apple:badmap</name>
+          <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>shift:breaks_caps</name>
+          <_description>Shift cancels CapsLock.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Special shortcuts for the Euro character -->
+      <configItem>
+        <name>eurosign</name>
+        <_description>Adding the EuroSign to certain keys</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>eurosign:e</name>
+          <_description>Add the EuroSign to the E key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:2</name>
+          <_description>Add the EuroSign to the 2 key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:4</name>
+          <_description>Add the EuroSign to the 4 key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:5</name>
+          <_description>Add the EuroSign to the 5 key.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Let space output nobreakspace for the desired level -->
+      <configItem>
+        <name>nbsp</name>
+        <_description>Using space key to input non-breakable space character</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>nbsp:none</name>
+          <_description>Space key outputs usual space at any level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level2</name>
+          <_description>Space key outputs non-breakable space character at second level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3</name>
+          <_description>Space key outputs non-breakable space character at third level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3s</name>
+          <_description>Space key outputs non-breakable space character at third level, nothing at fourth level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3n</name>
+          <_description>Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4</name>
+          <_description>Space key outputs non-breakable space character at fourth level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4n</name>
+          <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4nl</name>
+          <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>japan</name>
+        <_description>Japanese keyboard options</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>japan:kana_lock</name>
+          <_description>Kana Lock key is locking</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>japan:nicola_f_bs</name>
+          <_description>NICOLA-F style Backspace</_description>
+       </configItem>
+      </option>
+    </group>
+  </optionList>
+</xkbConfigRegistry>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/rules/evdev	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,1013 @@
+// 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
+// uncomment lines below
+//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
+//              in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
+//              ru scc sy syr tel th tj tam ua uz
+
+// PC models
+! $pcmodels = pc101 pc102 pc104 pc105
+
+// Microsoft models (using MS geometry)
+! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
+
+// PC geometries - they have special geometry but symbols are mostly pc105
+! $pcgeometries = abnt2 latitude jp106 kr106
+
+// Layouts that provide further specializations for the OLPC
+! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us 
+
+! $macbooks = macbook78 macbook79
+! $maclaptop = ibook powerbook macbook78 macbook79
+! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
+
+! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us
+
+! $azerty = be fr
+! $qwertz = al cz de hr hu ro si sk 
+
+! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
+              acer_c300 acer_ferrari4k acer_laptop \
+              acpi airkey \
+              apple armada asus_laptop azonaRF2300 \
+              benqx brother \
+              btc5113rf btc5126t btc6301urf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+              cherryblue cherrybluea cherryblueb cherrycyboard \
+              chicony chicony0108 chicony9885 \
+              compaqeak8 compaqik7 compaqik13 compaqik18 \
+              cymotionlinux \
+              dell dellm65 inspiron precision_m dellusbmm dtk2000 \
+              emachines ennyah_dkb1008 evdev fscaa1667g \
+              genius geniuscomfy geniuscomfy2 geniuskb19e \
+              gyration honeywell_euroboard \
+              hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
+              hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
+              ibm_spacesaver ipaq inspiron intel latitude \
+              logiaccess logicda logicink \
+              logiex110 logiclx300 \
+              logiinkse logiinkseusb logiitc logiik \
+              logitech_base itouch logiultrax \
+              logitech_g15 \
+	      logidinovo logidinovoedge \
+              microsoft7000 microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
+              microsoftoffice microsoftmult \
+              mx1998 mx2500 mx2750 \
+              oretec \
+              presario propeller \
+              qtronix \
+              rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
+              samsung4500 samsung4510 \
+              scorpius silvercrest \
+              sk1300 sk2500 sk6200 sk7100 sp_inet \
+              sven sven303 symplon \
+              toshiba_s3000 trust trustda \
+              yahoo
+
+// all layouts with 3rd and 4th groups
+! $threelevellayouts = al az \
+              be br bt \
+              ca ch cs cz \
+              de dk \
+              ee es \
+              fi fo fr \
+              gb gr \
+              hu \
+              ie ir is it \
+              kg \
+              latam \
+              lk lt \
+              mn mt \
+              nl no \
+              pl pt \
+              ro \
+              se sk \
+              tr \
+              us \
+              vn \
+              za
+
+
+! $dvoraklayouts = br ca de ee es fr gb no pl se us
+
+! $sun = sun_type4 sun_type4_ca sun_type4_jp sun_type4_euro sun_type5 sun_type5_euro sun_type5_jp sun_type5_unix sun_type5_hobo sun_type5_euro_hobo sun_type5_jp_hobo sun_type5_unix_hobo sun_type6 sun_type6_euro sun_type6_jp sun_type6_unix sun_type6_usb sun_type6_euro_usb sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb sun_type7 sun_type7_euro sun_type7_unix sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb
+! $sun_type4 = sun_type4 sun_type4_ca sun_type4_jp sun_type4_euro
+! $sun_type5 = sun_type5 sun_type5_euro sun_type5_jp sun_type5_unix
+! $sun_hobo = sun_type5_hobo sun_type5_euro_hobo sun_type5_jp_hobo sun_type5_unix_hobo
+! $sun_type6 = sun_type6 sun_type6_euro sun_type6_jp sun_type6_unix sun_type6_usb sun_type6_euro_usb sun_type6_jp_usb sun_type6_unix_usb
+! $sun_type7 = sun_type7_jp_usb sun_type7 sun_type7_euro sun_type7_unix sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb
+! $sun_jp = sun_type4_jp sun_type5_jp sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
+
+// Sun Type 6 keyboards with custom/non-standard layouts
+! $sun_t6_custom = am ar az be br ca_bi cz de de_CH \
+                   dk dvorak es fi fr fr_CH gb ge gr \
+                   it jp kg ko kz nl no pl_dev \
+                   pt ru se sk tj tr tr_f tw \
+                   ua uz
+// Sun Type 7 Keyboards with custom/non-standard layouts
+! $sun_t7_custom = am ar az be br ca_bi cz de de_CH \
+                   dk dvorak es fi fr fr_CH gb ge gr \
+                   it jp kg ko kz nl no pl_dev \
+                   pt ru se sk tj tr tr_f tw \
+                   ua uz
+
+! model		=	keycodes
+  pc98		=	evdev(pc98)
+  abnt2		=	evdev(abnt2)
+  jp106		=	evdev(jp106)
+ $sun_jp        =       sun(type6_jp_usb)
+ $sun           =       sun(type6_usb)
+  *		=	evdev
+
+! layout[1]	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! layout	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! option	=	keycodes
+  apple:badmap		=	+macintosh(badmap)
+  apple:goodmap		=	+macintosh(goodmap)
+
+! model		layout	=	geometry
+  thinkpad     us              =       thinkpad(us)
+
+! model		=	geometry
+  microsoftelite	=	microsoft(elite)
+ $msmodels	=	microsoft(natural)
+  dell101	=	dell(dell101)
+  dellm65	=	dell(dellm65)
+  flexpro	=	keytronic(FlexPro)
+  hp6000	=	hp(omnibook)
+  omnikey101	=	northgate(omnikey101)
+ $pcmodels	=	pc(%m)
+ $pcgeometries	=	pc(%m)
+  everex	=	everex(STEPnote)
+  thinkpad	=	thinkpad(intl)
+  thinkpad60	=	thinkpad(60)
+  thinkpadz60	=	thinkpad(60)
+  winbook	=	winbook(XP5)
+  pc98		=	nec(pc98)
+ $macbooks      =       macintosh(%m)
+ $macs		=	macintosh(macintosh)
+  hhk		=	hhk(basic)
+  kinesis	=	kinesis(model100)
+  sun_type4             =    sun(type4)
+  sun_type4_ca          =    sun(type4_ca)
+  sun_type4_jp          =    sun(type4jp)
+  sun_type4_euro        =    sun(type4tuv)
+  sun_type5             =    sun(type5)
+  sun_type5_euro        =    sun(type5tuv)
+  sun_type5_jp          =    sun(type5jp)
+  sun_type5_unix        =    sun(type5unix)
+  sun_type5_hobo        =    sun(type5hobo)
+  sun_type5_euro_hobo   =    sun(type5tuvhobo)
+  sun_type5_jp_hobo     =    sun(type5jphobo)
+  sun_type5_unix_hobo   =    sun(type5hobo)
+  sun_type6             =    sun(type6)
+  sun_type6_euro        =    sun(type6tuv)
+  sun_type6_jp          =    sun(type6jp)
+  sun_type6_unix        =    sun(type6unix)
+  sun_type6_usb         =    sun(type6)
+  sun_type6_euro_usb    =    sun(type6tuv)
+  sun_type6_jp_usb      =    sun(type6jp)
+  sun_type6_unix_usb    =    sun(type6unix)
+  sun_type7_jp_usb      =    sun(type6jp)
+  sun_type7             =    sun(type7)
+  sun_type7_euro        =    sun(type7tuv)
+  sun_type7_unix        =    sun(type7unix)
+  sun_type7_usb         =    sun(type7)
+  sun_type7_euro_usb    =    sun(type7tuv)
+  sun_type7_unix_usb    =    sun(type7unix)
+  *		=       pc(pc104)
+
+! model		layout		variant		=	symbols
+  *		ben		basic		=	pc+in(ben)
+  *		ben		probhat		=	pc+in(ben_probhat)
+  *		dev		basic		=	pc+in(deva)
+  *		dvorak		$dvoraklayouts		=	pc+%v(dvorak)
+  *		dvorak		basic		=	pc+us(dvorak)
+  *		dvorak		pl_basic		=	pc+pl(dvorak)
+  *		dvorak		pl		=	pc+pl(dvorak_quotes)
+  *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
+  *		dzdwi		basic		=	pc+bt(basic)
+  *		fi		basic		=	pc+fi(classic)
+  *		ge		azerty_tskapo		=	pc+fr(geo)
+  *		guj		basic		=	pc+in(guj)
+  *		gur		basic		=	pc+in(guru)
+  *		ie		laptop		=	pc+ie(basic)
+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
+  *		il		si1452		=	pc+ie(basic)
+  *		iu		basic		=	pc+ca(ike)
+  *		lo		basic		=	pc+la(basic)
+  *		kan		basic		=	pc+in(kan)
+  *		mal		basic		=	pc+in(mal)
+  *		mal		mlplusnum		=	pc+in(mal)
+  *		ogham		basic		=	pc+ie(ogam)
+  *		ogham		laptop		=	pc+ie(ogam)
+  *		ogham		is434		=	pc+ie(ogam_is434)
+  *		ogham		is434laptop		=	pc+ie(ogam_is434)
+  *		ori		basic		=	pc+in(ori)
+  *		ro		de		=	pc+ro(winkeys)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma		=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
+  *		ru		os		=	pc+ru(os_legacy)
+  *		sapmi		basic		=	pc+no(smi)
+  *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
+  *		sapmi		sefi		=	pc+fi(smi)
+  *		sin		phonetic-static		=	pc+in(sin_phonetic)
+  *		syr		basic		=	pc+sy(syc)
+  *		syr		phonetic		=	pc+sy(syc_phonetic)
+  *		tam		INSCRIPT		=	pc+in(tam)
+  *		tam		UNI		=	pc+in(tam_unicode)
+  *		tam		TAB		=	pc+in(tam_TAB)
+  *		tam		TSCII		=	pc+in(tam_TSCII)
+  *		tel		basic		=	pc+in(tel)
+  *		yu		basic		=	pc+srp(latin)
+  *		yu		unicode		=	pc+srp(latinunicode)
+  *		yu		yz		=	pc+srp(latinyz)
+  *		yu		unicodeyz		=	pc+srp(latinunicodeyz)
+  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)
+
+! model		layout				=	symbols
+  *		ar			=	pc+ara
+  *		ben			=	pc+in(ben)
+  *		bs			=	pc+ba
+  *		cs			=	pc+rs
+  *		cz_qwerty			=	pc+cz(qwerty)
+  *		dev			=	pc+in(deva)
+  *		dvorak			=	pc+us(dvorak)
+  *		dzdwi			=	pc+bt
+  *		el			=	pc+gr
+  *		en_US			=	pc+latin
+  *		guj			=	pc+in(guj)
+  *		gur			=	pc+in(guru)
+  *		iu			=	pc+ca(ike)
+  *		lo			=	pc+la
+  *		kan			=	pc+in(kan)
+  *		mi			=	pc+mao
+  *		ml			=	pc+in(mal)
+  *		ogham			=	pc+ie(ogam)
+  *		ori			=	pc+ie(ori)
+  *		sapmi			=	pc+no(smi)
+  *		sr			=	pc+srp
+  *		syr			=	pc+sy(syc)
+  *		tel			=	pc+in(tel)
+  *		tml			=	pc+in(tam)
+  *		yu			=	pc+srp
+  *		fr-latin9			=	pc+fr(latin9)
+  *		us_intl			=	pc+us(alt-intl)
+  *		ben(basic)			=	pc+in(ben)
+  *		ben(probhat)			=	pc+in(ben_probhat)
+  *		dev(basic)			=	pc+in(deva)
+  *		dvorak($dvoraklayouts)			=	pc+%v(dvorak)
+  *		dvorak(basic)			=	pc+us(dvorak)
+  *		dvorak(pl_basic)			=	pc+pl(dvorak)
+  *		dvorak(pl)			=	pc+pl(dvorak_quotes)
+  *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
+  *		dzdwi(basic)			=	pc+bt(basic)
+  *		fi(basic)			=	pc+fi(classic)
+  *		ge(azerty_tskapo)			=	pc+fr(geo)
+  *		guj(basic)			=	pc+in(guj)
+  *		gur(basic)			=	pc+in(guru)
+  *		ie(laptop)			=	pc+ie(basic)
+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
+  *		il(si1452)			=	pc+ie(basic)
+  *		iu(basic)			=	pc+ca(ike)
+  *		lo(basic)			=	pc+la(basic)
+  *		kan(basic)			=	pc+in(kan)
+  *		mal(basic)			=	pc+in(mal)
+  *		mal(mlplusnum)			=	pc+in(mal)
+  *		ogham(basic)			=	pc+ie(ogam)
+  *		ogham(laptop)			=	pc+ie(ogam)
+  *		ogham(is434)			=	pc+ie(ogam_is434)
+  *		ogham(is434laptop)			=	pc+ie(ogam_is434)
+  *		ori(basic)			=	pc+in(ori)
+  *		ro(de)			=	pc+ro(winkeys)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)			=	pc+ro(std)
+  *		ro(comma)			=	pc+ro(basic)
+  *		ru(os)			=	pc+ru(os_legacy)
+  *		sapmi(basic)			=	pc+no(smi)
+  *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
+  *		sapmi(sefi)			=	pc+fi(smi)
+  *		sin(phonetic-static)			=	pc+in(sin_phonetic)
+  *		syr(basic)			=	pc+sy(syc)
+  *		syr(phonetic)			=	pc+sy(syc_phonetic)
+  *		tam(INSCRIPT)			=	pc+in(tam)
+  *		tam(UNI)			=	pc+in(tam_unicode)
+  *		tam(TAB)			=	pc+in(tam_TAB)
+  *		tam(TSCII)			=	pc+in(tam_TSCII)
+  *		tel(basic)			=	pc+in(tel)
+  *		yu(basic)			=	pc+srp(latin)
+  *		yu(unicode)			=	pc+srp(latinunicode)
+  *		yu(yz)			=	pc+srp(latinyz)
+  *		yu(unicodeyz)			=	pc+srp(latinunicodeyz)
+  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
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l%(v)
+  classmate	us			=	pc+%l(classmate)
+ $sun_type4     *       		=       sun_vndr/us(type4)+sun_vndr/%l(type4)
+ $sun_type5     *       		=       sun_vndr/us(type5)+sun_vndr/%l(type5)
+ $sun_hobo      *       		=       sun_vndr/us(type5hobo)+sun_vndr/%l(type5hobo)
+ $sun_type6     us      		=       sun_vndr/us(type6)+sun_vndr/solaris(defaults)
+ $sun_type6     jp      		=       sun_vndr/us(type6)+sun_vndr/jp(type6)
+ $sun_type7     jp      		=       sun_vndr/us(type6)+sun_vndr/jp(type7)
+  jp106         jp      		=       sun_vndr/us(type6)+sun_vndr/jp(type7)
+ $sun_type6    $sun_t6_custom  		=       sun_vndr/us(type6)+sun_vndr/%l(type6)
+ $sun_type6     *       		=       pc+sun_vndr/us(type6)+%l%(v)
+ $sun_type7     us      		=       sun_vndr/us(type6)+sun_vndr/solaris(defaults)
+ $sun_type7    $sun_t7_custom  		=       sun_vndr/us(type6)+sun_vndr/%l(type6)
+ $sun_type7     *       		=       pc+sun_vndr/us(type6)+%l%(v)            
+  pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
+  macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
+ $macs		en_US			=	pc+macintosh_vndr/us(extended)
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
+  olpc		$olpclayouts		=	olpc+%l%(m)
+  olpc		*			=	olpc+%l%(v)
+  thinkpad   	br			=	pc+br(thinkpad)
+  *	   	$nonlatin		=	pc+us+%l%(v):2
+  *		*			=	pc+%l%(v)
+
+! model		layout[1]			=	symbols
+  *		ar			=	pc+ara%(v[1])
+  *		ben			=	pc+in(ben)%(v[1])
+  *		bs			=	pc+ba%(v[1])
+  *		cs			=	pc+rs%(v[1])
+  *		cz_qwerty			=	pc+cz(qwerty)%(v[1])
+  *		dev			=	pc+in(deva)%(v[1])
+  *		dvorak			=	pc+us(dvorak)%(v[1])
+  *		dzdwi			=	pc+bt%(v[1])
+  *		el			=	pc+gr%(v[1])
+  *		en_US			=	pc+latin%(v[1])
+  *		guj			=	pc+in(guj)%(v[1])
+  *		gur			=	pc+in(guru)%(v[1])
+  *		iu			=	pc+ca(ike)%(v[1])
+  *		lo			=	pc+la%(v[1])
+  *		kan			=	pc+in(kan)%(v[1])
+  *		mi			=	pc+mao%(v[1])
+  *		ml			=	pc+in(mal)%(v[1])
+  *		ogham			=	pc+ie(ogam)%(v[1])
+  *		ori			=	pc+ie(ori)%(v[1])
+  *		sapmi			=	pc+no(smi)%(v[1])
+  *		sr			=	pc+srp%(v[1])
+  *		syr			=	pc+sy(syc)%(v[1])
+  *		tel			=	pc+in(tel)%(v[1])
+  *		tml			=	pc+in(tam)%(v[1])
+  *		yu			=	pc+srp%(v[1])
+  *		fr-latin9			=	pc+fr(latin9)%(v[1])
+  *		us_intl			=	pc+us(alt-intl)%(v[1])
+  *		ben(basic)			=	pc+in(ben)
+  *		ben(probhat)			=	pc+in(ben_probhat)
+  *		dev(basic)			=	pc+in(deva)
+  *		dvorak($dvoraklayouts)			=	pc+%v(dvorak)
+  *		dvorak(basic)			=	pc+us(dvorak)
+  *		dvorak(pl_basic)			=	pc+pl(dvorak)
+  *		dvorak(pl)			=	pc+pl(dvorak_quotes)
+  *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
+  *		dzdwi(basic)			=	pc+bt(basic)
+  *		fi(basic)			=	pc+fi(classic)
+  *		ge(azerty_tskapo)			=	pc+fr(geo)
+  *		guj(basic)			=	pc+in(guj)
+  *		gur(basic)			=	pc+in(guru)
+  *		ie(laptop)			=	pc+ie(basic)
+  *		ie(CloGaelachLaptop)			=	pc+ie(CloGaelach)
+  *		il(si1452)			=	pc+ie(basic)
+  *		iu(basic)			=	pc+ca(ike)
+  *		lo(basic)			=	pc+la(basic)
+  *		kan(basic)			=	pc+in(kan)
+  *		mal(basic)			=	pc+in(mal)
+  *		mal(mlplusnum)			=	pc+in(mal)
+  *		ogham(basic)			=	pc+ie(ogam)
+  *		ogham(laptop)			=	pc+ie(ogam)
+  *		ogham(is434)			=	pc+ie(ogam_is434)
+  *		ogham(is434laptop)			=	pc+ie(ogam_is434)
+  *		ori(basic)			=	pc+in(ori)
+  *		ro(de)			=	pc+ro(winkeys)
+  *		ro(us)			=	pc+ro(std)
+  *		ro(academic)			=	pc+ro(std)
+  *		ro(std_comma)			=	pc+ro(std)
+  *		ro(comma)			=	pc+ro(basic)
+  *		ru(os)			=	pc+ru(os_legacy)
+  *		sapmi(basic)			=	pc+no(smi)
+  *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
+  *		sapmi(sefi)			=	pc+fi(smi)
+  *		sin(phonetic-static)			=	pc+in(sin_phonetic)
+  *		syr(basic)			=	pc+sy(syc)
+  *		syr(phonetic)			=	pc+sy(syc_phonetic)
+  *		tam(INSCRIPT)			=	pc+in(tam)
+  *		tam(UNI)			=	pc+in(tam_unicode)
+  *		tam(TAB)			=	pc+in(tam_TAB)
+  *		tam(TSCII)			=	pc+in(tam_TSCII)
+  *		tel(basic)			=	pc+in(tel)
+  *		yu(basic)			=	pc+srp(latin)
+  *		yu(unicode)			=	pc+srp(latinunicode)
+  *		yu(yz)			=	pc+srp(latinyz)
+  *		yu(unicodeyz)			=	pc+srp(latinunicodeyz)
+  ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
+  amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+  macintosh_old	us			=	macintosh_vndr/us(oldmac)
+  macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
+  macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
+  thinkpad	br			=	pc+%l[1](thinkpad)
+  *		*			=	pc+%l[1]%(v[1])
+
+! model		layout[1]	variant[1]	=	symbols
+  *		ben		basic		=	pc+in(ben)
+  *		ben		probhat		=	pc+in(ben_probhat)
+  *		dev		basic		=	pc+in(deva)
+  *		dvorak		$dvoraklayouts		=	pc+%v(dvorak)
+  *		dvorak		basic		=	pc+us(dvorak)
+  *		dvorak		pl_basic		=	pc+pl(dvorak)
+  *		dvorak		pl		=	pc+pl(dvorak_quotes)
+  *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
+  *		dzdwi		basic		=	pc+bt(basic)
+  *		fi		basic		=	pc+fi(classic)
+  *		ge		azerty_tskapo		=	pc+fr(geo)
+  *		guj		basic		=	pc+in(guj)
+  *		gur		basic		=	pc+in(guru)
+  *		ie		laptop		=	pc+ie(basic)
+  *		ie		CloGaelachLaptop		=	pc+ie(CloGaelach)
+  *		il		si1452		=	pc+ie(basic)
+  *		iu		basic		=	pc+ca(ike)
+  *		lo		basic		=	pc+la(basic)
+  *		kan		basic		=	pc+in(kan)
+  *		mal		basic		=	pc+in(mal)
+  *		mal		mlplusnum		=	pc+in(mal)
+  *		ogham		basic		=	pc+ie(ogam)
+  *		ogham		laptop		=	pc+ie(ogam)
+  *		ogham		is434		=	pc+ie(ogam_is434)
+  *		ogham		is434laptop		=	pc+ie(ogam_is434)
+  *		ori		basic		=	pc+in(ori)
+  *		ro		de		=	pc+ro(winkeys)
+  *		ro		us		=	pc+ro(std)
+  *		ro		academic		=	pc+ro(std)
+  *		ro		std_comma		=	pc+ro(std)
+  *		ro		comma		=	pc+ro(basic)
+  *		ru		os		=	pc+ru(os_legacy)
+  *		sapmi		basic		=	pc+no(smi)
+  *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
+  *		sapmi		sefi		=	pc+fi(smi)
+  *		sin		phonetic-static		=	pc+in(sin_phonetic)
+  *		syr		basic		=	pc+sy(syc)
+  *		syr		phonetic		=	pc+sy(syc_phonetic)
+  *		tam		INSCRIPT		=	pc+in(tam)
+  *		tam		UNI		=	pc+in(tam_unicode)
+  *		tam		TAB		=	pc+in(tam_TAB)
+  *		tam		TSCII		=	pc+in(tam_TSCII)
+  *		tel		basic		=	pc+in(tel)
+  *		yu		basic		=	pc+srp(latin)
+  *		yu		unicode		=	pc+srp(latinunicode)
+  *		yu		yz		=	pc+srp(latinyz)
+  *		yu		unicodeyz		=	pc+srp(latinunicodeyz)
+
+! model         layout  =       symbols
+ $sun_type7     jp      =       +sun_vndr/solaris(defaults_type7jp)
+  jp106         jp      =       +sun_vndr/solaris(defaults_type7jp)
+ $sun           *       =       +sun_vndr/solaris(defaults)
+
+! layout[2]	=	symbols
+  ar		=	+ara%(v[2]):2
+  ben		=	+in(ben)%(v[2]):2
+  bs		=	+ba%(v[2]):2
+  cs		=	+rs%(v[2]):2
+  cz_qwerty		=	+cz(qwerty)%(v[2]):2
+  dev		=	+in(deva)%(v[2]):2
+  dvorak		=	+us(dvorak)%(v[2]):2
+  dzdwi		=	+bt%(v[2]):2
+  el		=	+gr%(v[2]):2
+  en_US		=	+latin%(v[2]):2
+  guj		=	+in(guj)%(v[2]):2
+  gur		=	+in(guru)%(v[2]):2
+  iu		=	+ca(ike)%(v[2]):2
+  lo		=	+la%(v[2]):2
+  kan		=	+in(kan)%(v[2]):2
+  mi		=	+mao%(v[2]):2
+  ml		=	+in(mal)%(v[2]):2
+  ogham		=	+ie(ogam)%(v[2]):2
+  ori		=	+ie(ori)%(v[2]):2
+  sapmi		=	+no(smi)%(v[2]):2
+  sr		=	+srp%(v[2]):2
+  syr		=	+sy(syc)%(v[2]):2
+  tel		=	+in(tel)%(v[2]):2
+  tml		=	+in(tam)%(v[2]):2
+  yu		=	+srp%(v[2]):2
+  fr-latin9		=	+fr(latin9)%(v[2]):2
+  us_intl		=	+us(alt-intl)%(v[2]):2
+  ben(basic)	=	+in(ben):2
+  ben(probhat)	=	+in(ben_probhat):2
+  dev(basic)	=	+in(deva):2
+  dvorak($dvoraklayouts)	=	+%v(dvorak):2
+  dvorak(basic)	=	+us(dvorak):2
+  dvorak(pl_basic)	=	+pl(dvorak):2
+  dvorak(pl)	=	+pl(dvorak_quotes):2
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):2
+  dzdwi(basic)	=	+bt(basic):2
+  fi(basic)	=	+fi(classic):2
+  ge(azerty_tskapo)	=	+fr(geo):2
+  guj(basic)	=	+in(guj):2
+  gur(basic)	=	+in(guru):2
+  ie(laptop)	=	+ie(basic):2
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):2
+  il(si1452)	=	+ie(basic):2
+  iu(basic)	=	+ca(ike):2
+  lo(basic)	=	+la(basic):2
+  kan(basic)	=	+in(kan):2
+  mal(basic)	=	+in(mal):2
+  mal(mlplusnum)	=	+in(mal):2
+  ogham(basic)	=	+ie(ogam):2
+  ogham(laptop)	=	+ie(ogam):2
+  ogham(is434)	=	+ie(ogam_is434):2
+  ogham(is434laptop)	=	+ie(ogam_is434):2
+  ori(basic)	=	+in(ori):2
+  ro(de)	=	+ro(winkeys):2
+  ro(us)	=	+ro(std):2
+  ro(academic)	=	+ro(std):2
+  ro(std_comma)	=	+ro(std):2
+  ro(comma)	=	+ro(basic):2
+  ru(os)	=	+ru(os_legacy):2
+  sapmi(basic)	=	+no(smi):2
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
+  sapmi(sefi)	=	+fi(smi):2
+  sin(phonetic-static)	=	+in(sin_phonetic):2
+  syr(basic)	=	+sy(syc):2
+  syr(phonetic)	=	+sy(syc_phonetic):2
+  tam(INSCRIPT)	=	+in(tam):2
+  tam(UNI)	=	+in(tam_unicode):2
+  tam(TAB)	=	+in(tam_TAB):2
+  tam(TSCII)	=	+in(tam_TSCII):2
+  tel(basic)	=	+in(tel):2
+  yu(basic)	=	+srp(latin):2
+  yu(unicode)	=	+srp(latinunicode):2
+  yu(yz)	=	+srp(latinyz):2
+  yu(unicodeyz)	=	+srp(latinunicodeyz):2
+  *		=	+%l[2]%(v[2]):2
+
+! layout[3]	=	symbols
+  ar		=	+ara%(v[3]):3
+  ben		=	+in(ben)%(v[3]):3
+  bs		=	+ba%(v[3]):3
+  cs		=	+rs%(v[3]):3
+  cz_qwerty		=	+cz(qwerty)%(v[3]):3
+  dev		=	+in(deva)%(v[3]):3
+  dvorak		=	+us(dvorak)%(v[3]):3
+  dzdwi		=	+bt%(v[3]):3
+  el		=	+gr%(v[3]):3
+  en_US		=	+latin%(v[3]):3
+  guj		=	+in(guj)%(v[3]):3
+  gur		=	+in(guru)%(v[3]):3
+  iu		=	+ca(ike)%(v[3]):3
+  lo		=	+la%(v[3]):3
+  kan		=	+in(kan)%(v[3]):3
+  mi		=	+mao%(v[3]):3
+  ml		=	+in(mal)%(v[3]):3
+  ogham		=	+ie(ogam)%(v[3]):3
+  ori		=	+ie(ori)%(v[3]):3
+  sapmi		=	+no(smi)%(v[3]):3
+  sr		=	+srp%(v[3]):3
+  syr		=	+sy(syc)%(v[3]):3
+  tel		=	+in(tel)%(v[3]):3
+  tml		=	+in(tam)%(v[3]):3
+  yu		=	+srp%(v[3]):3
+  fr-latin9		=	+fr(latin9)%(v[3]):3
+  us_intl		=	+us(alt-intl)%(v[3]):3
+  ben(basic)	=	+in(ben):3
+  ben(probhat)	=	+in(ben_probhat):3
+  dev(basic)	=	+in(deva):3
+  dvorak($dvoraklayouts)	=	+%v(dvorak):3
+  dvorak(basic)	=	+us(dvorak):3
+  dvorak(pl_basic)	=	+pl(dvorak):3
+  dvorak(pl)	=	+pl(dvorak_quotes):3
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):3
+  dzdwi(basic)	=	+bt(basic):3
+  fi(basic)	=	+fi(classic):3
+  ge(azerty_tskapo)	=	+fr(geo):3
+  guj(basic)	=	+in(guj):3
+  gur(basic)	=	+in(guru):3
+  ie(laptop)	=	+ie(basic):3
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):3
+  il(si1452)	=	+ie(basic):3
+  iu(basic)	=	+ca(ike):3
+  lo(basic)	=	+la(basic):3
+  kan(basic)	=	+in(kan):3
+  mal(basic)	=	+in(mal):3
+  mal(mlplusnum)	=	+in(mal):3
+  ogham(basic)	=	+ie(ogam):3
+  ogham(laptop)	=	+ie(ogam):3
+  ogham(is434)	=	+ie(ogam_is434):3
+  ogham(is434laptop)	=	+ie(ogam_is434):3
+  ori(basic)	=	+in(ori):3
+  ro(de)	=	+ro(winkeys):3
+  ro(us)	=	+ro(std):3
+  ro(academic)	=	+ro(std):3
+  ro(std_comma)	=	+ro(std):3
+  ro(comma)	=	+ro(basic):3
+  ru(os)	=	+ru(os_legacy):3
+  sapmi(basic)	=	+no(smi):3
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
+  sapmi(sefi)	=	+fi(smi):3
+  sin(phonetic-static)	=	+in(sin_phonetic):3
+  syr(basic)	=	+sy(syc):3
+  syr(phonetic)	=	+sy(syc_phonetic):3
+  tam(INSCRIPT)	=	+in(tam):3
+  tam(UNI)	=	+in(tam_unicode):3
+  tam(TAB)	=	+in(tam_TAB):3
+  tam(TSCII)	=	+in(tam_TSCII):3
+  tel(basic)	=	+in(tel):3
+  yu(basic)	=	+srp(latin):3
+  yu(unicode)	=	+srp(latinunicode):3
+  yu(yz)	=	+srp(latinyz):3
+  yu(unicodeyz)	=	+srp(latinunicodeyz):3
+  *		=	+%l[3]%(v[3]):3
+
+! layout[4]	=	symbols
+  ar		=	+ara%(v[4]):4
+  ben		=	+in(ben)%(v[4]):4
+  bs		=	+ba%(v[4]):4
+  cs		=	+rs%(v[4]):4
+  cz_qwerty		=	+cz(qwerty)%(v[4]):4
+  dev		=	+in(deva)%(v[4]):4
+  dvorak		=	+us(dvorak)%(v[4]):4
+  dzdwi		=	+bt%(v[4]):4
+  el		=	+gr%(v[4]):4
+  en_US		=	+latin%(v[4]):4
+  guj		=	+in(guj)%(v[4]):4
+  gur		=	+in(guru)%(v[4]):4
+  iu		=	+ca(ike)%(v[4]):4
+  lo		=	+la%(v[4]):4
+  kan		=	+in(kan)%(v[4]):4
+  mi		=	+mao%(v[4]):4
+  ml		=	+in(mal)%(v[4]):4
+  ogham		=	+ie(ogam)%(v[4]):4
+  ori		=	+ie(ori)%(v[4]):4
+  sapmi		=	+no(smi)%(v[4]):4
+  sr		=	+srp%(v[4]):4
+  syr		=	+sy(syc)%(v[4]):4
+  tel		=	+in(tel)%(v[4]):4
+  tml		=	+in(tam)%(v[4]):4
+  yu		=	+srp%(v[4]):4
+  fr-latin9		=	+fr(latin9)%(v[4]):4
+  us_intl		=	+us(alt-intl)%(v[4]):4
+  ben(basic)	=	+in(ben):4
+  ben(probhat)	=	+in(ben_probhat):4
+  dev(basic)	=	+in(deva):4
+  dvorak($dvoraklayouts)	=	+%v(dvorak):4
+  dvorak(basic)	=	+us(dvorak):4
+  dvorak(pl_basic)	=	+pl(dvorak):4
+  dvorak(pl)	=	+pl(dvorak_quotes):4
+  dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):4
+  dzdwi(basic)	=	+bt(basic):4
+  fi(basic)	=	+fi(classic):4
+  ge(azerty_tskapo)	=	+fr(geo):4
+  guj(basic)	=	+in(guj):4
+  gur(basic)	=	+in(guru):4
+  ie(laptop)	=	+ie(basic):4
+  ie(CloGaelachLaptop)	=	+ie(CloGaelach):4
+  il(si1452)	=	+ie(basic):4
+  iu(basic)	=	+ca(ike):4
+  lo(basic)	=	+la(basic):4
+  kan(basic)	=	+in(kan):4
+  mal(basic)	=	+in(mal):4
+  mal(mlplusnum)	=	+in(mal):4
+  ogham(basic)	=	+ie(ogam):4
+  ogham(laptop)	=	+ie(ogam):4
+  ogham(is434)	=	+ie(ogam_is434):4
+  ogham(is434laptop)	=	+ie(ogam_is434):4
+  ori(basic)	=	+in(ori):4
+  ro(de)	=	+ro(winkeys):4
+  ro(us)	=	+ro(std):4
+  ro(academic)	=	+ro(std):4
+  ro(std_comma)	=	+ro(std):4
+  ro(comma)	=	+ro(basic):4
+  ru(os)	=	+ru(os_legacy):4
+  sapmi(basic)	=	+no(smi):4
+  sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
+  sapmi(sefi)	=	+fi(smi):4
+  sin(phonetic-static)	=	+in(sin_phonetic):4
+  syr(basic)	=	+sy(syc):4
+  syr(phonetic)	=	+sy(syc_phonetic):4
+  tam(INSCRIPT)	=	+in(tam):4
+  tam(UNI)	=	+in(tam_unicode):4
+  tam(TAB)	=	+in(tam_TAB):4
+  tam(TSCII)	=	+in(tam_TSCII):4
+  tel(basic)	=	+in(tel):4
+  yu(basic)	=	+srp(latin):4
+  yu(unicode)	=	+srp(latinunicode):4
+  yu(yz)	=	+srp(latinyz):4
+  yu(unicodeyz)	=	+srp(latinunicodeyz):4
+  *		=	+%l[4]%(v[4]):4
+
+! layout[2]	variant[2]	=	symbols
+  ben		basic	=	+in(ben):2
+  ben		probhat	=	+in(ben_probhat):2
+  dev		basic	=	+in(deva):2
+  dvorak		$dvoraklayouts	=	+%v(dvorak):2
+  dvorak		basic	=	+us(dvorak):2
+  dvorak		pl_basic	=	+pl(dvorak):2
+  dvorak		pl	=	+pl(dvorak_quotes):2
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):2
+  dzdwi		basic	=	+bt(basic):2
+  fi		basic	=	+fi(classic):2
+  ge		azerty_tskapo	=	+fr(geo):2
+  guj		basic	=	+in(guj):2
+  gur		basic	=	+in(guru):2
+  ie		laptop	=	+ie(basic):2
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):2
+  il		si1452	=	+ie(basic):2
+  iu		basic	=	+ca(ike):2
+  lo		basic	=	+la(basic):2
+  kan		basic	=	+in(kan):2
+  mal		basic	=	+in(mal):2
+  mal		mlplusnum	=	+in(mal):2
+  ogham		basic	=	+ie(ogam):2
+  ogham		laptop	=	+ie(ogam):2
+  ogham		is434	=	+ie(ogam_is434):2
+  ogham		is434laptop	=	+ie(ogam_is434):2
+  ori		basic	=	+in(ori):2
+  ro		de	=	+ro(winkeys):2
+  ro		us	=	+ro(std):2
+  ro		academic	=	+ro(std):2
+  ro		std_comma	=	+ro(std):2
+  ro		comma	=	+ro(basic):2
+  ru		os	=	+ru(os_legacy):2
+  sapmi		basic	=	+no(smi):2
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
+  sapmi		sefi	=	+fi(smi):2
+  sin		phonetic-static	=	+in(sin_phonetic):2
+  syr		basic	=	+sy(syc):2
+  syr		phonetic	=	+sy(syc_phonetic):2
+  tam		INSCRIPT	=	+in(tam):2
+  tam		UNI	=	+in(tam_unicode):2
+  tam		TAB	=	+in(tam_TAB):2
+  tam		TSCII	=	+in(tam_TSCII):2
+  tel		basic	=	+in(tel):2
+  yu		basic	=	+srp(latin):2
+  yu		unicode	=	+srp(latinunicode):2
+  yu		yz	=	+srp(latinyz):2
+  yu		unicodeyz	=	+srp(latinunicodeyz):2
+
+! layout[3]	variant[3]	=	symbols
+  ben		basic	=	+in(ben):3
+  ben		probhat	=	+in(ben_probhat):3
+  dev		basic	=	+in(deva):3
+  dvorak		$dvoraklayouts	=	+%v(dvorak):3
+  dvorak		basic	=	+us(dvorak):3
+  dvorak		pl_basic	=	+pl(dvorak):3
+  dvorak		pl	=	+pl(dvorak_quotes):3
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):3
+  dzdwi		basic	=	+bt(basic):3
+  fi		basic	=	+fi(classic):3
+  ge		azerty_tskapo	=	+fr(geo):3
+  guj		basic	=	+in(guj):3
+  gur		basic	=	+in(guru):3
+  ie		laptop	=	+ie(basic):3
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):3
+  il		si1452	=	+ie(basic):3
+  iu		basic	=	+ca(ike):3
+  lo		basic	=	+la(basic):3
+  kan		basic	=	+in(kan):3
+  mal		basic	=	+in(mal):3
+  mal		mlplusnum	=	+in(mal):3
+  ogham		basic	=	+ie(ogam):3
+  ogham		laptop	=	+ie(ogam):3
+  ogham		is434	=	+ie(ogam_is434):3
+  ogham		is434laptop	=	+ie(ogam_is434):3
+  ori		basic	=	+in(ori):3
+  ro		de	=	+ro(winkeys):3
+  ro		us	=	+ro(std):3
+  ro		academic	=	+ro(std):3
+  ro		std_comma	=	+ro(std):3
+  ro		comma	=	+ro(basic):3
+  ru		os	=	+ru(os_legacy):3
+  sapmi		basic	=	+no(smi):3
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
+  sapmi		sefi	=	+fi(smi):3
+  sin		phonetic-static	=	+in(sin_phonetic):3
+  syr		basic	=	+sy(syc):3
+  syr		phonetic	=	+sy(syc_phonetic):3
+  tam		INSCRIPT	=	+in(tam):3
+  tam		UNI	=	+in(tam_unicode):3
+  tam		TAB	=	+in(tam_TAB):3
+  tam		TSCII	=	+in(tam_TSCII):3
+  tel		basic	=	+in(tel):3
+  yu		basic	=	+srp(latin):3
+  yu		unicode	=	+srp(latinunicode):3
+  yu		yz	=	+srp(latinyz):3
+  yu		unicodeyz	=	+srp(latinunicodeyz):3
+
+! layout[4]	variant[4]	=	symbols
+  ben		basic	=	+in(ben):4
+  ben		probhat	=	+in(ben_probhat):4
+  dev		basic	=	+in(deva):4
+  dvorak		$dvoraklayouts	=	+%v(dvorak):4
+  dvorak		basic	=	+us(dvorak):4
+  dvorak		pl_basic	=	+pl(dvorak):4
+  dvorak		pl	=	+pl(dvorak_quotes):4
+  dvorak		pl_altquotes	=	+pl(dvorak_altquotes):4
+  dzdwi		basic	=	+bt(basic):4
+  fi		basic	=	+fi(classic):4
+  ge		azerty_tskapo	=	+fr(geo):4
+  guj		basic	=	+in(guj):4
+  gur		basic	=	+in(guru):4
+  ie		laptop	=	+ie(basic):4
+  ie		CloGaelachLaptop	=	+ie(CloGaelach):4
+  il		si1452	=	+ie(basic):4
+  iu		basic	=	+ca(ike):4
+  lo		basic	=	+la(basic):4
+  kan		basic	=	+in(kan):4
+  mal		basic	=	+in(mal):4
+  mal		mlplusnum	=	+in(mal):4
+  ogham		basic	=	+ie(ogam):4
+  ogham		laptop	=	+ie(ogam):4
+  ogham		is434	=	+ie(ogam_is434):4
+  ogham		is434laptop	=	+ie(ogam_is434):4
+  ori		basic	=	+in(ori):4
+  ro		de	=	+ro(winkeys):4
+  ro		us	=	+ro(std):4
+  ro		academic	=	+ro(std):4
+  ro		std_comma	=	+ro(std):4
+  ro		comma	=	+ro(basic):4
+  ru		os	=	+ru(os_legacy):4
+  sapmi		basic	=	+no(smi):4
+  sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4
+  sapmi		sefi	=	+fi(smi):4
+  sin		phonetic-static	=	+in(sin_phonetic):4
+  syr		basic	=	+sy(syc):4
+  syr		phonetic	=	+sy(syc_phonetic):4
+  tam		INSCRIPT	=	+in(tam):4
+  tam		UNI	=	+in(tam_unicode):4
+  tam		TAB	=	+in(tam_TAB):4
+  tam		TSCII	=	+in(tam_TSCII):4
+  tel		basic	=	+in(tel):4
+  yu		basic	=	+srp(latin):4
+  yu		unicode	=	+srp(latinunicode):4
+  yu		yz	=	+srp(latinyz):4
+  yu		unicodeyz	=	+srp(latinunicodeyz):4
+
+! model		=	symbols
+  *     =       +inet(evdev)
+
+! model		layout		=	compat
+ $sun_jp        jp              =       complete+japan(kana_lock)
+  jp106         jp              =       complete+japan(kana_lock)
+  pc98		nec_vndr/jp	=	pc98(basic)
+  *		jp		=	complete+japan
+  olpc          *               =       olpc
+  *		*		=	complete
+
+! model		layout[1]	=	compat
+  *		*		=	complete
+
+! model		=	types
+  $macs		=	complete+numpad(mac)
+  *		=	complete
+
+! layout	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
+
+! layout[1]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
+
+! layout[2]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
+
+! layout[3]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
+
+! layout[4]	option	=	symbols
+  $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
+
+! option	=	symbols
+  grp:shift_toggle	=	+group(shifts_toggle)
+  altwin:menu		=	+altwin(menu)
+  altwin:meta_alt	=	+altwin(meta_alt)
+  altwin:ctrl_win	=	+altwin(ctrl_win)
+  altwin:meta_win	=	+altwin(meta_win)
+  altwin:left_meta_win	=	+altwin(left_meta_win)
+  altwin:super_win	=	+altwin(super_win)
+  altwin:hyper_win	=	+altwin(hyper_win)
+  altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)
+  grp:switch		=	+group(switch)
+  grp:lswitch		=	+group(lswitch)
+  grp:win_switch	=	+group(win_switch)
+  grp:lwin_switch	=	+group(lwin_switch)
+  grp:rwin_switch	=	+group(rwin_switch)
+  grp:toggle		=	+group(toggle)
+  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: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:alt_caps_toggle   =       +group(alt_caps_toggle)
+  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
+  grp:alt_shift_toggle	=	+group(alt_shift_toggle)
+  grp:menu_toggle	=	+group(menu_toggle)
+  grp:lwin_toggle	=	+group(lwin_toggle)
+  grp:rwin_toggle	=	+group(rwin_toggle)
+  grp:lshift_toggle	=	+group(lshift_toggle)
+  grp:rshift_toggle	=	+group(rshift_toggle)
+  grp:rctrl_switch	=	+group(rctrl_switch)
+  grp:lctrl_toggle	=	+group(lctrl_toggle)
+  grp:rctrl_toggle	=	+group(rctrl_toggle)
+  grp:lalt_toggle	=	+group(lalt_toggle)
+  lv3:switch		=	+level3(switch)
+  lv3:ralt_switch	=	+level3(ralt_switch)
+  lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
+  lv3:ralt_alt		=	+level3(ralt_alt)
+  lv3:lalt_switch	=	+level3(lalt_switch)
+  lv3:alt_switch	=	+level3(alt_switch)
+  lv3:menu_switch	=	+level3(menu_switch)
+  lv3:win_switch	=	+level3(win_switch)
+  lv3:lwin_switch	=	+level3(lwin_switch)
+  lv3:rwin_switch	=	+level3(rwin_switch)
+  caps:capslock		=	+capslock(capslock)
+  caps:shiftlock	=	+capslock(shiftlock)
+  caps:swapescape	=	+capslock(swapescape)
+  ctrl:nocaps		=	+ctrl(nocaps)
+  ctrl:swapcaps		=	+ctrl(swapcaps)
+  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
+  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
+  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
+  compose:ralt		=	+compose(ralt)
+  compose:lwin		=	+compose(lwin)
+  compose:rwin		=	+compose(rwin)
+  compose:menu		=	+compose(menu)
+  compose:rctrl		=	+compose(rctrl)
+  compose:caps		=	+compose(caps)
+  compose:102		=	+compose(102)
+  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
+  eurosign:e		=	+eurosign(e)
+  eurosign:2		=	+eurosign(2)
+  eurosign:4		=	+eurosign(4)
+  eurosign:5		=	+eurosign(5)
+  keypad:oss            =       +keypad(oss)
+  keypad:legacy         =	+keypad(legacy)
+  keypad:legacy_wang    =	+keypad(legacy_wang)
+  keypad:oss_wang       =	+keypad(oss_wang)
+  keypad:future         =	+keypad(future)
+  keypad:future_wang    =	+keypad(future_wang)
+  keypad:phone_hex      =	+keypad(phone_hex)
+  nbsp:none             =	+nbsp(none)
+  nbsp:level2           =	+nbsp(level2)
+  nbsp:level3           =	+nbsp(level3)
+  nbsp:level3s          =	+nbsp(level3s)
+  nbsp:level3n          =	+nbsp(level3n)
+  nbsp:level4           =	+nbsp(level4)
+  nbsp:level4n          =	+nbsp(level4n)
+  nbsp:level4nl         =	+nbsp(level4nl)
+  japan:nicola_f_bs     =	+jp(nicola_f_bs)
+  kpdl:dot              =	+kpdl(dot)
+  kpdl:comma            =	+kpdl(comma)
+  kpdl:dotoss           =	+kpdl(dotoss)
+  kpdl:dotoss_latin9    =	+kpdl(dotoss_latin9)
+  kpdl:commaoss         =	+kpdl(commaoss)
+  kpdl:momayyezoss      =	+kpdl(momayyezoss)
+  kpdl:kposs            =	+kpdl(kposs)
+  shift:breaks_caps     =	+shift(breaks_caps)
+
+
+! option	=	compat
+  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)
+
+
+! option	=	types
+  caps:internal			=	+caps(internal)
+  caps:internal_nocancel	=	+caps(internal_nocancel)
+  caps:shift			=	+caps(shift)
+  caps:shift_nocancel		=	+caps(shift_nocancel)
+  numpad:pc			=	+numpad(pc)
+  numpad:mac			=	+numpad(mac)
+  numpad:microsoft		=	+numpad(microsoft)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/rules/evdev.lst	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,710 @@
+! model
+  sun_type7_usb         Sun Type 7 USB 
+  sun_type7_euro_usb    Sun Type 7 USB (European layout)
+  sun_type7_unix_usb    Sun Type 7 USB (Unix layout)
+  sun_type7_jp_usb      Sun Type 7 USB (Japanese layout) / Japanese 106-key
+  pc101           Generic 101-key PC
+  pc102           Generic 102-key (Intl) PC
+  pc104           Generic 104-key PC
+  pc105           Generic 105-key (Intl) PC
+  dell101         Dell 101-key PC
+  latitude        Dell Latitude series laptop
+  dellm65         Dell Precision M65
+  everex          Everex STEPnote
+  flexpro         Keytronic FlexPro
+  microsoft       Microsoft Natural
+  omnikey101      Northgate OmniKey 101
+  winbook         Winbook Model XP5
+  jp106           Japanese 106-key
+  pc98            PC-98xx Series
+  a4techKB21      A4Tech KB-21
+  a4techKBS8      A4Tech KBS-8
+  a4_rfkb23       A4Tech Wireless Desktop RFKB-23
+  abnt2           Brazilian ABNT2
+  airkey          Acer AirKey V
+  acpi            ACPI Standard
+  azonaRF2300     Azona RF2300 wireless Internet Keyboard
+  scorpius        Advance Scorpius KI
+  brother         Brother Internet Keyboard
+  btc5113rf       BTC 5113RF Multimedia
+  btc5126t        BTC 5126T
+  btc6301urf      BTC 6301URF
+  btc9000         BTC 9000
+  btc9000a        BTC 9000A
+  btc9001ah       BTC 9001AH
+  btc5090         BTC 5090
+  btc9019u        BTC 9019U
+  cherryblue      Cherry Blue Line CyBo@rd
+  cherryblueb     Cherry CyMotion Master XPress
+  cherrybluea     Cherry Blue Line CyBo@rd (alternate option)
+  cherrycyboard   Cherry CyBo@rd USB-Hub
+  chicony         Chicony Internet Keyboard
+  chicony0108     Chicony KU-0108
+  chicony9885     Chicony KB-9885
+  compaqeak8      Compaq Easy Access Keyboard
+  compaqik7       Compaq Internet Keyboard (7 keys)
+  compaqik13      Compaq Internet Keyboard (13 keys)
+  compaqik18      Compaq Internet Keyboard (18 keys)
+  cymotionlinux   Cherry CyMotion Master Linux
+  armada          Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
+  presario        Laptop/notebook Compaq (eg. Presario) Internet Keyboard
+  ipaq            Compaq iPaq Keyboard
+  dell            Dell
+  dellsk8125      Dell SK-8125
+  dellsk8135      Dell SK-8135
+  dellusbmm       Dell USB Multimedia Keyboard
+  inspiron        Dell Laptop/notebook Inspiron 6xxx/8xxx
+  precision_m     Dell Laptop/notebook Precision M series
+  dexxa           Dexxa Wireless Desktop Keyboard
+  diamond         Diamond 9801 / 9802 series
+  dtk2000         DTK2000
+  ennyah_dkb1008  Ennyah DKB-1008
+  fscaa1667g      Fujitsu-Siemens Computers AMILO A1667G laptop
+  genius          Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+  geniuscomfy     Genius Comfy KB-12e
+  geniuscomfy2    Genius Comfy KB-21e-Scroll
+  geniuskb19e     Genius KB-19e NB
+  gyration        Gyration
+  logitech_base   Logitech Generic Keyboard
+  logitech_g15    Logitech G15 extra keys via G15daemon
+  hpi6            Hewlett-Packard Internet Keyboard
+  hp2501          Hewlett-Packard SK-2501 Multimedia Keyboard
+  hp2505          Hewlett-Packard SK-2505 Internet Keyboard
+  hpxe3gc         Hewlett-Packard Omnibook XE3 GC
+  hpxe3gf         Hewlett-Packard Omnibook XE3 GF
+  hpxt1000        Hewlett-Packard Omnibook XT1000
+  hpzt11xx        Hewlett-Packard Pavilion ZT11xx
+  hp500fa         Hewlett-Packard Omnibook 500 FA
+  hp5xx           Hewlett-Packard Omnibook 5xx
+  hp5181          Hewlett-Packard Internet Keyboard 5181
+  hp5185          Hewlett-Packard Internet Keyboard 5185
+  hpnx9020        Hewlett-Packard nx9020
+  hp6000          Hewlett-Packard Omnibook 6000/6100
+  honeywell_euroboard Honeywell Euroboard
+  rapidaccess     IBM Rapid Access
+  rapidaccess2    IBM Rapid Access II
+  rapidaccess2a   IBM Rapid Access II (alternate option)
+  thinkpad        IBM ThinkPad 560Z/600/600E/A22E
+  thinkpadintl    IBM ThinkPad 560Z/600/600E/A22E, Intl
+  thinkpad60      IBM ThinkPad R60/T60/R61/T61
+  thinkpadz60     IBM ThinkPad Z60m/Z60t/Z61m/Z61t
+  ibm_spacesaver  IBM Space Saver
+  logiaccess      Logitech Access Keyboard
+  logiclx300      Logitech Cordless Desktop LX-300
+  logii350        Logitech Internet 350 Keyboard
+  logimel         Logitech Media Elite Keyboard
+  logicd          Logitech Cordless Desktop
+  logicd_it       Logitech Cordless Desktop iTouch
+  logicd_nav      Logitech Cordless Desktop Navigator
+  logicd_opt      Logitech Cordless Desktop Optical
+  logicda         Logitech Cordless Desktop (alternate option)
+  logicdpa2       Logitech Cordless Desktop Pro (alternate option2)
+  logicfn         Logitech Cordless Freedom/Desktop Navigator
+  logicdn         Logitech Cordless Desktop Navigator
+  logiitc         Logitech iTouch Cordless Keyboard (model Y-RB6)
+  logiik          Logitech Internet Keyboard
+  itouch          Logitech iTouch
+  logicink        Logitech Internet Navigator Keyboard
+  logiex110       Logitech Cordless Desktop EX110
+  logiinkse       Logitech iTouch Internet Navigator Keyboard SE
+  logiinkseusb    Logitech iTouch Internet Navigator Keyboard SE (USB)
+  logiultrax      Logitech Ultra-X Keyboard
+  logiultraxc     Logitech Ultra-X Cordless Media Desktop Keyboard
+  logidinovo      Logitech diNovo Keyboard
+  logidinovoedge  Logitech diNovo Edge Keyboard
+  mx1998          Memorex MX1998
+  mx2500          Memorex MX2500 EZ-Access Keyboard
+  mx2750          Memorex MX2750
+  microsoft7000   Microsoft Natural Wireless Ergonomic Keyboard 7000
+  microsoftinet   Microsoft Internet Keyboard
+  microsoftpro    Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
+  microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
+  microsoftprooem Microsoft Natural Keyboard Pro OEM
+  vsonku306       ViewSonic KU-306 Internet Keyboard
+  microsoftprose  Microsoft Internet Keyboard Pro, Swedish
+  microsoftoffice Microsoft Office Keyboard
+  microsoftmult   Microsoft Wireless Multimedia Keyboard 1.0A
+  microsoftelite  Microsoft Natural Keyboard Elite
+  oretec          Ortek MCK-800 MM/Internet keyboard
+  propeller       Propeller Voyager (KTEZ-1000)
+  qtronix         QTronix Scorpius 98N+
+  samsung4500     Samsung SDM 4500P
+  samsung4510     Samsung SDM 4510P
+  sk1300          SK-1300
+  sk2500          SK-2500
+  sk6200          SK-6200
+  sk7100          SK-7100
+  sp_inet         Super Power Multimedia Keyboard
+  sun_type7             Sun Type 7 
+  sun_type7_euro        Sun Type 7 (European layout)
+  sun_type7_unix        Sun Type 7 (Unix layout)
+  sun_type6_usb         Sun Type 6 USB
+  sun_type6_euro_usb    Sun Type 6 USB (European layout)
+  sun_type6_unix_usb    Sun Type 6 USB (Unix layout)
+  sun_type6_jp_usb      Sun Type 6 USB (Japanese layout)
+  sun_type6             Sun Type 6 
+  sun_type6_euro        Sun Type 6 (European layout)
+  sun_type6_jp          Sun Type 6 (Japanese layout)
+  sun_type6_unix        Sun Type 6 (Unix layout)
+  sun_type5             Sun Type 5 
+  sun_type5_euro        Sun Type 5 (European layout)
+  sun_type5_jp          Sun Type 5 (Japanese layout)
+  sun_type5_unix        Sun Type 5 (Unix layout)
+  sun_type5_hobo        Sun Type 5 Compact 
+  sun_type5_euro_hobo   Sun Type 5 Compact (European layout)
+  sun_type5_jp_hobo     Sun Type 5 Compact (Japanese layout)
+  sun_type4             Sun Type 4
+  sun_type4_ca          Sun Type 4 (Canadian  layout)
+  sun_type4_jp          Sun Type 4 (Japanese layout)
+  sun_type4_euro        Sun Type 4 (European layout)
+  sven            SVEN Ergonomic 2500
+  sven303         SVEN Slim 303
+  symplon         Symplon PaceBook (tablet PC)
+  toshiba_s3000   Toshiba Satellite S3000
+  trust           Trust Wireless Keyboard Classic
+  trustda         Trust Direct Access Keyboard
+  yahoo           Yahoo! Internet Keyboard
+  macbook78       MacBook/MacBook Pro
+  macbook79       MacBook/MacBook Pro (Intl)
+  macintosh       Macintosh
+  macintosh_old   Macintosh Old
+  macintosh_hhk   Happy Hacking Keyboard for Mac
+  acer_c300       Acer C300
+  acer_ferrari4k  Acer Ferrari 4000
+  acer_laptop     Acer Laptop
+  asus_laptop     Asus Laptop
+  apple           Apple
+  apple_laptop    Apple Laptop
+  silvercrest     SILVERCREST Multimedia Wireless Keyboard
+  emachines       Laptop/notebook eMachines m68xx
+  kr106           Korean 106-key
+  evdev           Evdev-managed keyboard
+  benqx           BenQ X-Touch
+  benqx730        BenQ X-Touch 730
+  benqx800        BenQ X-Touch 800
+  hhk             Happy Hacking Keyboard
+  classmate       Classmate PC
+  olpc            OLPC
+
+
+! layout
+  us              USA
+  ad              Andorra
+  af              Afghanistan
+  ara             Arabic
+  al              Albania
+  am              Armenia
+  az              Azerbaijan
+  by              Belarus
+  be              Belgium
+  bd              Bangladesh
+  in              India
+  ba              Bosnia and Herzegovina
+  br              Brazil
+  bg              Bulgaria
+  ma              Morocco
+  mm              Myanmar
+  ca              Canada
+  cd              Congo, Democratic Republic of the
+  cn              China
+  hr              Croatia
+  cz              Czechia
+  dk              Denmark
+  dvorak	  Dvorak
+  nl              Netherlands
+  bt              Bhutan
+  ee              Estonia
+  ir              Iran
+  iq              Iraq
+  fo              Faroe Islands
+  fi              Finland
+  fr              France
+  gh              Ghana
+  gn              Guinea
+  ge              Georgia
+  de              Germany
+  gr              Greece
+  hu              Hungary
+  is              Iceland
+  il              Israel
+  it              Italy
+  jp              Japan
+  kg              Kyrgyzstan
+  kh              Cambodia
+  kz              Kazakhstan
+  la              Laos
+  latam           Latin American
+  lt              Lithuania
+  lv              Latvia
+  mao             Maori
+  me              Montenegro
+  mk              Macedonia
+  mt              Malta
+  mn              Mongolia
+  no              Norway
+  pl              Poland
+  pt              Portugal
+  ro              Romania
+  ru              Russia
+  rs              Serbia
+  si              Slovenia
+  sk              Slovakia
+  es              Spain
+  se              Sweden
+  ch              Switzerland
+  sy              Syria
+  tj              Tajikistan
+  lk              Sri Lanka
+  th              Thailand
+  tr              Turkey
+  ua              Ukraine
+  gb              United Kingdom
+  uz              Uzbekistan
+  vn              Vietnam
+  kr              Korea, Republic of
+  nec_vndr/jp     Japan (PC-98xx Series)
+  ie              Ireland
+  pk              Pakistan
+  mv              Maldives
+  za              South Africa
+  epo             Esperanto
+  np              Nepal
+  ng              Nigeria
+  et              Ethiopia
+  braille         Braille
+
+! variant
+  chr             us: Cherokee
+  euro            us: With EuroSign on 5
+  intl            us: International (with dead keys)
+  alt-intl        us: Alternative international (former us_intl)
+  colemak         us: Colemak
+  dvorak          us: Dvorak
+  dvorak-intl     us: Dvorak international
+  dvorak-l        us: Left handed Dvorak
+  dvorak-r        us: Right handed Dvorak
+  dvorak-classic  us: Classic Dvorak
+  dvp             us: Programmer Dvorak
+  rus             us: Russian phonetic
+  mac             us: Macintosh
+  altgr-intl      us: International (AltGr dead keys)
+  olpc2           us: Group toggle on multiply/divide key
+  ps              af: Pashto
+  uz              af: Southern Uzbek
+  olpc-ps         af: OLPC Pashto
+  olpc-fa         af: OLPC Dari
+  olpc-uz         af: OLPC Southern Uzbek
+  azerty          ara: azerty
+  azerty_digits   ara: azerty/digits
+  digits          ara: digits
+  qwerty          ara: qwerty
+  qwerty_digits   ara: qwerty/digits
+  buckwalter      ara: Buckwalter
+  phonetic        am: Phonetic
+  phonetic-alt    am: Alternative Phonetic
+  eastern         am: Eastern
+  western         am: Western
+  eastern-alt     am: Alternative Eastern
+  cyrillic        az: Cyrillic
+  winkeys         by: Winkeys
+  latin           by: Latin
+  iso-alternate   be: ISO Alternate
+  nodeadkeys      be: Eliminate dead keys
+  sundeadkeys     be: Sun dead keys
+  wang            be: Wang model 724 azerty
+  probhat         bd: Probhat
+  ben             in: Bengali
+  ben_probhat     in: Bengali Probhat
+  guj             in: Gujarati
+  guru            in: Gurmukhi
+  jhelum          in: Gurmukhi Jhelum
+  kan             in: Kannada
+  mal             in: Malayalam
+  mal_lalitha     in: Malayalam Lalitha
+  ori             in: Oriya
+  tam_unicode     in: Tamil Unicode
+  tam_TAB         in: Tamil TAB Typewriter
+  tam_TSCII       in: Tamil TSCII Typewriter
+  tam             in: Tamil
+  tel             in: Telugu
+  urd             in: Urdu
+  bolnagri        in: Hindi Bolnagri
+  alternatequotes ba: Use guillemets for quotes
+  unicode         ba: Use Bosnian digraphs
+  unicodeus       ba: US keyboard with Bosnian digraphs
+  us              ba: US keyboard with Bosnian letters
+  nodeadkeys      br: Eliminate dead keys
+  dvorak          br: Dvorak
+  nativo          br: Nativo
+  nativo-us       br: Nativo for USA keyboards
+  nativo-epo      br: Nativo for Esperanto
+  phonetic        bg: Phonetic
+  french          ma: French
+  tifinagh        ma: Tifinagh
+  tifinagh-alt    ma: Tifinagh Alternative
+  tifinagh-alt-phonetic ma: Tifinagh Alternative Phonetic
+  tifinagh-extended ma: Tifinagh Extended
+  tifinagh-phonetic ma: Tifinagh Phonetic
+  tifinagh-extended-phonetic ma: Tifinagh Extended Phonetic
+  fr-dvorak       ca: French Dvorak
+  fr-legacy       ca: French (legacy)
+  multix          ca: Multilingual
+  multi           ca: Multilingual, first part
+  multi-2gr       ca: Multilingual, second part
+  ike             ca: Inuktitut
+  shs             ca: Secwepemctsin
+  kut             ca: Ktunaxa
+  tib             cn: Tibetan
+  tib_asciinum    cn: Tibetan (with ASCII numerals)
+  alternatequotes hr: Use guillemets for quotes
+  unicode         hr: Use Croatian digraphs
+  unicodeus       hr: US keyboard with Croatian digraphs
+  us              hr: US keyboard with Croatian letters
+  bksl            cz: With &lt;\|&gt; key
+  qwerty          cz: qwerty
+  qwerty_bksl     cz: qwerty, extended Backslash
+  ucw             cz: UCW layout (accented letters only)
+  nodeadkeys      dk: Eliminate dead keys
+  mac             dk: Macintosh
+  mac_nodeadkeys  dk: Macintosh, eliminate dead keys
+  dvorak          dk: Dvorak
+  sundeadkeys     nl: Sun dead keys
+  mac             nl: Macintosh
+  std             nl: Standard
+  nodeadkeys      ee: Eliminate dead keys
+  dvorak          ee: Dvorak
+  us              ee: US keyboard with Estonian letters
+  pro             ir: Pro
+  keypad          ir: Keypad
+  pro_keypad      ir: Pro Keypad
+  ku              ir: Kurdish, Latin Q
+  ku_f            ir: Kurdish, (F)
+  ku_alt          ir: Kurdish, Latin Alt-Q
+  ku_ara          ir: Kurdish, Arabic-Latin
+  ku              iq: Kurdish, Latin Q
+  ku_f            iq: Kurdish, (F)
+  ku_alt          iq: Kurdish, Latin Alt-Q
+  ku_ara          iq: Kurdish, Arabic-Latin
+  nodeadkeys      fo: Eliminate dead keys
+  nodeadkeys      fi: Eliminate dead keys
+  smi             fi: Northern Saami
+  classic         fi: Classic
+  mac             fi: Macintosh
+  nodeadkeys      fr: Eliminate dead keys
+  sundeadkeys     fr: Sun dead keys
+  oss             fr: Alternative
+  oss_latin9      fr: Alternative, latin-9 only
+  oss_nodeadkeys  fr: Alternative, eliminate dead keys
+  oss_sundeadkeys fr: Alternative, Sun dead keys
+  latin9          fr: (Legacy) Alternative
+  latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys
+  latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys
+  bepo            fr: Bepo, ergonomic, Dvorak way
+  bepo_latin9     fr: Bepo, ergonomic, Dvorak way, latin-9 only
+  dvorak          fr: Dvorak
+  mac             fr: Macintosh
+  geo             fr: Georgian AZERTY Tskapo
+  generic         gh: Multilingual
+  akan            gh: Akan
+  ewe             gh: Ewe
+  fula            gh: Fula
+  ga              gh: Ga
+  hausa           gh: Hausa
+  ergonomic       ge: Ergonomic
+  mess            ge: MESS
+  ru              ge: Russian
+  os              ge: Ossetian
+  deadacute       de: Dead acute
+  deadgraveacute  de: Dead grave acute
+  nodeadkeys      de: Eliminate dead keys
+  ro              de: Romanian keyboard with German letters
+  ro_nodeadkeys   de: Romanian keyboard with German letters, eliminate dead keys
+  dvorak          de: Dvorak
+  sundeadkeys     de: Sun dead keys
+  neo             de: Neostyle
+  mac             de: Macintosh
+  mac_nodeadkeys  de: Macintosh, eliminate dead keys
+  simple          gr: Simple
+  extended        gr: Extended
+  nodeadkeys      gr: Eliminate dead keys
+  polytonic       gr: Polytonic
+  standard        hu: Standard
+  nodeadkeys      hu: Eliminate dead keys
+  qwerty          hu: qwerty
+  101_qwertz_comma_dead hu: 101/qwertz/comma/Dead keys
+  101_qwertz_comma_nodead hu: 101/qwertz/comma/Eliminate dead keys
+  101_qwertz_dot_dead hu: 101/qwertz/dot/Dead keys
+  101_qwertz_dot_nodead hu: 101/qwertz/dot/Eliminate dead keys
+  101_qwerty_comma_dead hu: 101/qwerty/comma/Dead keys
+  101_qwerty_comma_nodead hu: 101/qwerty/comma/Eliminate dead keys
+  101_qwerty_dot_dead hu: 101/qwerty/dot/Dead keys
+  101_qwerty_dot_nodead hu: 101/qwerty/dot/Eliminate dead keys
+  102_qwertz_comma_dead hu: 102/qwertz/comma/Dead keys
+  102_qwertz_comma_nodead hu: 102/qwertz/comma/Eliminate dead keys
+  102_qwertz_dot_dead hu: 102/qwertz/dot/Dead keys
+  102_qwertz_dot_nodead hu: 102/qwertz/dot/Eliminate dead keys
+  102_qwerty_comma_dead hu: 102/qwerty/comma/Dead keys
+  102_qwerty_comma_nodead hu: 102/qwerty/comma/Eliminate dead keys
+  102_qwerty_dot_dead hu: 102/qwerty/dot/Dead keys
+  102_qwerty_dot_nodead hu: 102/qwerty/dot/Eliminate dead keys
+  Sundeadkeys     is: Sun dead keys
+  nodeadkeys      is: Eliminate dead keys
+  mac             is: Macintosh
+  dvorak          is: Dvorak
+  lyx             il: lyx
+  phonetic        il: Phonetic
+  biblical        il: Biblical Hebrew (Tiro)
+  nodeadkeys      it: Eliminate dead keys
+  mac             it: Macintosh
+  geo             it: Georgian
+  kana            jp: Kana
+  OADG109A        jp: OADG 109A
+  ruskaz          kz: Russian with Kazakh
+  kazrus          kz: Kazakh with Russian
+  nodeadkeys      latam: Eliminate dead keys
+  sundeadkeys     latam: Sun dead keys
+  std             lt: Standard
+  us              lt: US keyboard with Lithuanian letters
+  ibm             lt: IBM (LST 1205-92)
+  lekp            lt: LEKP
+  lekpa           lt: LEKPa
+  balticplus      lt: Baltic+
+  apostrophe      lv: Apostrophe (') variant
+  tilde           lv: Tilde (~) variant
+  fkey            lv: F-letter (F) variant
+  cyrillic        me: Cyrillic
+  cyrillicyz      me: Cyrillic, Z and ZHE swapped
+  latinunicode    me: Latin unicode
+  latinyz         me: Latin qwerty
+  latinunicodeyz  me: Latin unicode qwerty
+  cyrillicalternatequotes me: Cyrillic with guillemets
+  latinalternatequotes me: Latin with guillemets
+  nodeadkeys      mk: Eliminate dead keys
+  us              mt: Maltese keyboard with US layout
+  nodeadkeys      no: Eliminate dead keys
+  dvorak          no: Dvorak
+  smi             no: Northern Saami
+  smi_nodeadkeys  no: Northern Saami, eliminate dead keys
+  mac             no: Macintosh
+  mac_nodeadkeys  no: Macintosh, eliminate dead keys
+  qwertz          pl: qwertz
+  dvorak          pl: Dvorak
+  dvorak_quotes   pl: Dvorak, Polish quotes on quotemark key
+  dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!"
+  csb             pl: Kashubian
+  ru_phonetic_dvorak pl: Russian phonetic Dvorak
+  nodeadkeys      pt: Eliminate dead keys
+  sundeadkeys     pt: Sun dead keys
+  mac             pt: Macintosh
+  mac_nodeadkeys  pt: Macintosh, eliminate dead keys
+  mac_sundeadkeys pt: Macintosh, Sun dead keys
+  nativo          pt: Nativo
+  nativo-us       pt: Nativo for USA keyboards
+  nativo-epo      pt: Nativo for Esperanto
+  cedilla         ro: Cedilla
+  std             ro: Standard
+  std_cedilla     ro: Standard (Cedilla)
+  winkeys         ro: Winkeys
+  phonetic        ru: Phonetic
+  typewriter      ru: Typewriter
+  legacy          ru: Legacy
+  tt              ru: Tatar
+  os_legacy       ru: Ossetian, legacy
+  os_winkeys      ru: Ossetian, Winkeys
+  cv              ru: Chuvash
+  cv_latin        ru: Chuvash Latin
+  udm             ru: Udmurt
+  kom             ru: Komi
+  sah             ru: Yakut
+  yz              rs: Z and ZHE swapped
+  latin           rs: Latin
+  latinunicode    rs: Latin Unicode
+  latinyz         rs: Latin qwerty
+  latinunicodeyz  rs: Latin Unicode qwerty
+  alternatequotes rs: With guillemets
+  latinalternatequotes rs: Latin with guillemets
+  alternatequotes si: Use guillemets for quotes
+  unicode         si: Use Slovenian digraphs
+  unicodeus       si: US keyboard with Slovenian digraphs
+  us              si: US keyboard with Slovenian letters
+  bksl            sk: Extended Backslash
+  qwerty          sk: qwerty
+  qwerty_bksl     sk: qwerty, extended Backslash
+  nodeadkeys      es: Eliminate dead keys
+  sundeadkeys     es: Sun dead keys
+  dvorak          es: Dvorak
+  ast             es: Asturian variant with bottom-dot H and bottom-dot L
+  cat             es: Catalan variant with middle-dot L
+  mac             es: Macintosh
+  nodeadkeys      se: Eliminate dead keys
+  dvorak          se: Dvorak
+  rus             se: Russian phonetic
+  rus_nodeadkeys  se: Russian phonetic, eliminate dead keys
+  smi             se: Northern Saami
+  mac             se: Macintosh
+  svdvorak        se: Svdvorak
+  de_nodeadkeys   ch: German, eliminate dead keys
+  de_sundeadkeys  ch: German, Sun dead keys
+  fr              ch: French
+  fr_nodeadkeys   ch: French, eliminate dead keys
+  fr_sundeadkeys  ch: French, Sun dead keys
+  fr_mac          ch: French (Macintosh)
+  de_mac          ch: German (Macintosh)
+  syc             sy: Syriac
+  syc_phonetic    sy: Syriac phonetic
+  ku              sy: Kurdish, Latin Q
+  ku_f            sy: Kurdish, (F)
+  ku_alt          sy: Kurdish, Latin Alt-Q
+  tam_unicode     lk: Tamil Unicode
+  tam_TAB         lk: Tamil TAB Typewriter
+  tis             th: TIS-820.2538
+  pat             th: Pattachote
+  f               tr: (F)
+  alt             tr: Alt-Q
+  sundeadkeys     tr: Sun dead keys
+  ku              tr: Kurdish, Latin Q
+  ku_f            tr: Kurdish, (F)
+  ku_alt          tr: Kurdish, Latin Alt-Q
+  intl            tr: International (with dead keys)
+  phonetic        ua: Phonetic
+  typewriter      ua: Typewriter
+  winkeys         ua: Winkeys
+  unicode         ua: Unicode
+  rstu            ua: Standard RSTU
+  rstu_ru         ua: Standard RSTU on Russian layout
+  homophonic      ua: Homophonic
+  intl            gb: International (with dead keys)
+  dvorak          gb: Dvorak
+  dvorakukp       gb: Dvorak (UK Punctuation)
+  mac             gb: Macintosh
+  colemak         gb: Colemak
+  latin           uz: Latin
+  kr104           kr: 101/104 key Compatible
+  CloGaelach      ie: CloGaelach
+  UnicodeExpert   ie: UnicodeExpert
+  ogam            ie: Ogham
+  ogam_is434      ie: Ogham IS434
+  ara             pk: Arabic
+  legacy          epo: displaced semicolon and quote (obsolete)
+  igbo            ng: Igbo
+  yoruba          ng: Yoruba
+  hausa           ng: Hausa
+  left_hand       braille: Left hand
+  right_hand      braille: Right hand
+
+! option
+  grp                  Layout switching
+  grp:switch           R-Alt switches layout while pressed.
+  grp:lswitch          Left Alt key switches layout while pressed.
+  grp:lwin_switch      Left Win-key switches layout while pressed.
+  grp:rwin_switch      Right Win-key switches layout while pressed.
+  grp:win_switch       Both Win-keys switch layout while pressed.
+  grp:caps_switch      CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.
+  grp:rctrl_switch     Right Ctrl key switches layout while pressed.
+  grp:toggle           Right Alt key changes layout.
+  grp:lalt_toggle      Left Alt key changes layout.
+  grp:caps_toggle      CapsLock key changes layout.
+  grp:shift_caps_toggle Shift+CapsLock changes layout.
+  grp:shift_caps_switch CapsLock switch to first layout, Shift+CapsLock switch to last layout.
+  grp:alt_caps_toggle  Alt+CapsLock changes layout.
+  grp:shifts_toggle    Both Shift keys together change layout.
+  grp:alts_toggle      Both Alt keys together change layout.
+  grp:ctrls_toggle     Both Ctrl keys together change layout.
+  grp:ctrl_shift_toggle Ctrl+Shift change layout.
+  grp:lctrl_lshift_toggle LCtrl+LShift change layout.
+  grp:ctrl_alt_toggle  Alt+Ctrl change layout.
+  grp:alt_shift_toggle Alt+Shift change layout.
+  grp:menu_toggle      Menu key changes layout.
+  grp:lwin_toggle      Left Win-key changes layout.
+  grp:rwin_toggle      Right Win-key changes layout.
+  grp:lshift_toggle    Left Shift key changes layout.
+  grp:rshift_toggle    Right Shift key changes layout.
+  grp:lctrl_toggle     Left Ctrl key changes layout.
+  grp:rctrl_toggle     Right Ctrl key changes layout.
+  lv3                  Third level choosers
+  lv3:switch           Press Right Ctrl to choose 3rd level.
+  lv3:menu_switch      Press Menu key to choose 3rd level.
+  lv3:win_switch       Press any of Win-keys to choose 3rd level.
+  lv3:lwin_switch      Press Left Win-key to choose 3rd level.
+  lv3:rwin_switch      Press Right Win-key to choose 3rd level.
+  lv3:alt_switch       Press any of Alt keys to choose 3rd level.
+  lv3:lalt_switch      Press Left Alt key to choose 3rd level.
+  lv3:ralt_switch      Press Right Alt key to choose 3rd level.
+  lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.
+  lv3:ralt_alt         Right Alt key never chooses 3rd level.
+  ctrl                 Ctrl key position
+  ctrl:nocaps          Make CapsLock an additional Ctrl.
+  ctrl:swapcaps        Swap Ctrl and CapsLock.
+  ctrl:ctrl_ac         Ctrl key at left of 'A'
+  ctrl:ctrl_aa         Ctrl key at bottom left
+  ctrl:ctrl_ra         Right Ctrl key works as Right Alt.
+  grp_led              Use keyboard LED to show alternative layout.
+  grp_led:num          NumLock LED shows alternative layout.
+  grp_led:caps         CapsLock LED shows alternative layout.
+  grp_led:scroll       ScrollLock LED shows alternative layout.
+  keypad               Numeric keypad layout selection
+  keypad:legacy        Legacy keypad
+  keypad:oss           Keypad with unicode additions (arrows and math operators)
+  keypad:future        Keypad with unicode additions (arrows and math operators). Math operators on default level.
+  keypad:legacy_wang   Legacy Wang 724 keypad
+  keypad:oss_wang      Wang 724 keypad with unicode additions (arrows and math operators)
+  keypad:future_wang   Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.
+  keypad:phone_hex     ATM/phone-style hexadecimal keypad
+  kpdl                 Numeric keypad delete key behaviour
+  kpdl:dot             Legacy key with dot
+  kpdl:comma           Legacy key with comma
+  kpdl:dotoss          Four-level key with dot
+  kpdl:dotoss_latin9   Four-level key with dot, latin-9 restriction
+  kpdl:commaoss        Four-level key with comma
+  kpdl:momayyezoss     Four-level key with momayyez
+  kpdl:kposs           Four-level key with abstract separators
+  caps                 CapsLock key behavior
+  caps:internal        CapsLock uses internal capitalization. Shift "pauses" CapsLock.
+  caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock.
+  caps:shift           CapsLock acts as Shift with locking. Shift "pauses" CapsLock.
+  caps:shift_nocancel  CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.
+  caps:capslock        CapsLock toggles normal capitalization of alphabetic characters.
+  caps:swapescape      Swap ESC and CapsLock.
+  caps:shiftlock       CapsLock toggles Shift so all keys are affected.
+  altwin               Alt/Win key behavior
+  altwin:menu          Add the standard behavior to Menu key.
+  altwin:meta_alt      Alt and Meta are on the Alt keys.
+  altwin:ctrl_win      Control is mapped to the Win-keys (and the usual Ctrl keys).
+  altwin:meta_win      Meta is mapped to the Win-keys.
+  altwin:left_meta_win Meta is mapped to the left Win-key.
+  altwin:super_win     Super is mapped to the Win-keys.
+  altwin:hyper_win     Hyper is mapped to the Win-keys.
+  altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.
+  altwin:swap_lalt_lwin Left Alt is swapped with left Win-key.
+  Compose key          Compose key position
+  compose:ralt         Right Alt is Compose.
+  compose:lwin         Left Win-key is Compose.
+  compose:rwin         Right Win-key is Compose.
+  compose:menu         Menu is Compose.
+  compose:rctrl        Right Ctrl is Compose.
+  compose:caps         Caps Lock is Compose.
+  compose:102          Less-than/Greater-than is Compose.
+  compat               Miscellaneous compatibility options
+  numpad:pc            Default numeric keypad keys.
+  numpad:mac           Numeric keypad keys work as with Mac.
+  numpad:microsoft     Shift with numeric keypad keys works as in MS Windows.
+  srvrkeys:none        Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.
+  apple:badmap         Swap keycodes of two keys when Mac keyboards are misdetected by kernel.
+  shift:breaks_caps    Shift cancels CapsLock.
+  eurosign             Adding the EuroSign to certain keys
+  eurosign:e           Add the EuroSign to the E key.
+  eurosign:2           Add the EuroSign to the 2 key.
+  eurosign:4           Add the EuroSign to the 4 key.
+  eurosign:5           Add the EuroSign to the 5 key.
+  nbsp                 Using space key to input non-breakable space character
+  nbsp:none            Space key outputs usual space at any level.
+  nbsp:level2          Space key outputs non-breakable space character at second level.
+  nbsp:level3          Space key outputs non-breakable space character at third level.
+  nbsp:level3s         Space key outputs non-breakable space character at third level, nothing at fourth level.
+  nbsp:level3n         Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level
+  nbsp:level4          Space key outputs non-breakable space character at fourth level.
+  nbsp:level4n         Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level
+  nbsp:level4nl        Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)
+  japan                Japanese keyboard options
+  japan:kana_lock      Kana Lock key is locking
+  japan:nicola_f_bs    NICOLA-F style Backspace
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/rules/evdev.xml	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,4881 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+  <modelList>
+    <model>
+      <configItem>
+        <name>pc101</name>
+        <_description>Generic 101-key PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc102</name>
+        <_description>Generic 102-key (Intl) PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc104</name>
+        <_description>Generic 104-key PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc105</name>
+        <_description>Generic 105-key (Intl) PC</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dell101</name>
+        <_description>Dell 101-key PC</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>latitude</name>
+        <_description>Dell Latitude series laptop</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellm65</name>
+        <_description>Dell Precision M65</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>everex</name>
+        <_description>Everex STEPnote</_description>
+        <vendor>Everex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>flexpro</name>
+        <_description>Keytronic FlexPro</_description>
+        <vendor>Keytronic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoft</name>
+        <_description>Microsoft Natural</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>omnikey101</name>
+        <_description>Northgate OmniKey 101</_description>
+        <vendor>Northgate</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>winbook</name>
+        <_description>Winbook Model XP5</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>jp106</name>
+        <_description>Japanese 106-key</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>pc98</name>
+        <_description>PC-98xx Series</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4techKB21</name>
+        <_description>A4Tech KB-21</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4techKBS8</name>
+        <_description>A4Tech KBS-8</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>a4_rfkb23</name>
+        <_description>A4Tech Wireless Desktop RFKB-23</_description>
+        <vendor>A4Tech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>abnt2</name>
+        <_description>Brazilian ABNT2</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>airkey</name>
+        <_description>Acer AirKey V</_description>
+        <vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acpi</name>
+        <_description>ACPI Standard</_description>
+        <vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>azonaRF2300</name>
+        <_description>Azona RF2300 wireless Internet Keyboard</_description>
+        <vendor>Azona</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>scorpius</name>
+        <_description>Advance Scorpius KI</_description>
+        <vendor>Scorpius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>brother</name>
+        <_description>Brother Internet Keyboard</_description>
+        <vendor>Brother</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5113rf</name>
+        <_description>BTC 5113RF Multimedia</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5126t</name>
+        <_description>BTC 5126T</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc6301urf</name>
+        <_description>BTC 6301URF</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9000</name>
+        <_description>BTC 9000</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9000a</name>
+        <_description>BTC 9000A</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9001ah</name>
+        <_description>BTC 9001AH</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc5090</name>
+        <_description>BTC 5090</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>btc9019u</name>
+	<_description>BTC 9019U</_description>
+        <vendor>BTC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherryblue</name>
+        <_description>Cherry Blue Line CyBo@rd</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherryblueb</name>
+        <_description>Cherry CyMotion Master XPress</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherrybluea</name>
+        <_description>Cherry Blue Line CyBo@rd (alternate option)</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherrycyboard</name>
+        <_description>Cherry CyBo@rd USB-Hub</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony</name>
+        <_description>Chicony Internet Keyboard</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony0108</name>
+        <_description>Chicony KU-0108</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>chicony9885</name>
+        <_description>Chicony KB-9885</_description>
+        <vendor>Chicony</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqeak8</name>
+        <_description>Compaq Easy Access Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik7</name>
+        <_description>Compaq Internet Keyboard (7 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik13</name>
+        <_description>Compaq Internet Keyboard (13 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>compaqik18</name>
+        <_description>Compaq Internet Keyboard (18 keys)</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cymotionlinux</name>
+        <_description>Cherry CyMotion Master Linux</_description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>armada</name>
+        <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>presario</name>
+        <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ipaq</name>
+        <_description>Compaq iPaq Keyboard</_description>
+        <vendor>Compaq</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dell</name>
+        <_description>Dell</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellsk8125</name>
+        <_description>Dell SK-8125</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellsk8135</name>
+        <_description>Dell SK-8135</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dellusbmm</name>
+        <_description>Dell USB Multimedia Keyboard</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>inspiron</name>
+        <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>precision_m</name>
+        <_description>Dell Laptop/notebook Precision M series</_description>
+        <vendor>Dell</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dexxa</name>
+        <_description>Dexxa Wireless Desktop Keyboard</_description>
+        <vendor>Dexxa</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>diamond</name>
+        <_description>Diamond 9801 / 9802 series</_description>
+        <vendor>Diamond</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>dtk2000</name>
+        <_description>DTK2000</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ennyah_dkb1008</name>
+        <_description>Ennyah DKB-1008</_description>
+        <vendor>Ennyah</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>fscaa1667g</name>
+        <_description>Fujitsu-Siemens Computers AMILO A1667G laptop</_description>
+        <vendor>Fujitsu-Siemens</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>genius</name>
+        <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuscomfy</name>
+        <_description>Genius Comfy KB-12e</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuscomfy2</name>
+        <_description>Genius Comfy KB-21e-Scroll</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>geniuskb19e</name>
+        <_description>Genius KB-19e NB</_description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>gyration</name>
+        <_description>Gyration</_description>
+        <vendor>Gyration</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logitech_base</name>
+        <_description>Logitech Generic Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logitech_g15</name>
+        <_description>Logitech G15 extra keys via G15daemon</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpi6</name>
+        <_description>Hewlett-Packard Internet Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp2501</name>
+        <_description>Hewlett-Packard SK-2501 Multimedia Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp2505</name>
+        <_description>Hewlett-Packard SK-2505 Internet Keyboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxe3gc</name>
+        <_description>Hewlett-Packard Omnibook XE3 GC</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxe3gf</name>
+        <_description>Hewlett-Packard Omnibook XE3 GF</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpxt1000</name>
+        <_description>Hewlett-Packard Omnibook XT1000</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpzt11xx</name>
+        <_description>Hewlett-Packard Pavilion ZT11xx</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp500fa</name>
+        <_description>Hewlett-Packard Omnibook 500 FA</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5xx</name>
+        <_description>Hewlett-Packard Omnibook 5xx</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5181</name>
+        <_description>Hewlett-Packard Internet Keyboard 5181</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp5185</name>
+        <_description>Hewlett-Packard Internet Keyboard 5185</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hpnx9020</name>
+        <_description>Hewlett-Packard nx9020</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>hp6000</name>
+        <_description>Hewlett-Packard Omnibook 6000/6100</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>honeywell_euroboard</name>
+        <_description>Honeywell Euroboard</_description>
+        <vendor>Hewlett-Packard</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess</name>
+        <_description>IBM Rapid Access</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess2</name>
+        <_description>IBM Rapid Access II</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>rapidaccess2a</name>
+        <_description>IBM Rapid Access II (alternate option)</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpad</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpadintl</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpad60</name>
+        <_description>IBM ThinkPad R60/T60/R61/T61</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>thinkpadz60</name>
+        <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>ibm_spacesaver</name>
+        <_description>IBM Space Saver</_description>
+        <vendor>IBM</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiaccess</name>
+        <_description>Logitech Access Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiclx300</name>
+        <_description>Logitech Cordless Desktop LX-300</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logii350</name>
+        <_description>Logitech Internet 350 Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logimel</name>
+        <_description>Logitech Media Elite Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd</name>
+        <_description>Logitech Cordless Desktop</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_it</name>
+        <_description>Logitech Cordless Desktop iTouch</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_nav</name>
+        <_description>Logitech Cordless Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicd_opt</name>
+        <_description>Logitech Cordless Desktop Optical</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicda</name>
+        <_description>Logitech Cordless Desktop (alternate option)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicdpa2</name>
+        <_description>Logitech Cordless Desktop Pro (alternate option2)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicfn</name>
+        <_description>Logitech Cordless Freedom/Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicdn</name>
+        <_description>Logitech Cordless Desktop Navigator</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiitc</name>
+        <_description>Logitech iTouch Cordless Keyboard (model Y-RB6)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiik</name>
+        <_description>Logitech Internet Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>itouch</name>
+        <_description>Logitech iTouch</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logicink</name>
+        <_description>Logitech Internet Navigator Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiex110</name>
+        <_description>Logitech Cordless Desktop EX110</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiinkse</name>
+        <_description>Logitech iTouch Internet Navigator Keyboard SE</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiinkseusb</name>
+        <_description>Logitech iTouch Internet Navigator Keyboard SE (USB)</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiultrax</name>
+        <_description>Logitech Ultra-X Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logiultraxc</name>
+        <_description>Logitech Ultra-X Cordless Media Desktop Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logidinovo</name>
+        <_description>Logitech diNovo Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>logidinovoedge</name>
+        <_description>Logitech diNovo Edge Keyboard</_description>
+        <vendor>Logitech</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx1998</name>
+        <_description>Memorex MX1998</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx2500</name>
+        <_description>Memorex MX2500 EZ-Access Keyboard</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>mx2750</name>
+        <_description>Memorex MX2750</_description>
+        <vendor>Memorex</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoft7000</name>
+        <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftinet</name>
+        <_description>Microsoft Internet Keyboard</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftpro</name>
+        <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprousb</name>
+        <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprooem</name>
+        <_description>Microsoft Natural Keyboard Pro OEM</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>vsonku306</name>
+        <_description>ViewSonic KU-306 Internet Keyboard</_description>
+        <vendor>ViewSonic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftprose</name>
+        <_description>Microsoft Internet Keyboard Pro, Swedish</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftoffice</name>
+        <_description>Microsoft Office Keyboard</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftmult</name> 
+        <_description>Microsoft Wireless Multimedia Keyboard 1.0A</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>microsoftelite</name> 
+        <_description>Microsoft Natural Keyboard Elite</_description>
+        <vendor>Microsoft Inc.</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>oretec</name>
+        <_description>Ortek MCK-800 MM/Internet keyboard</_description>
+        <vendor>Ortek</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>propeller</name>
+        <_description>Propeller Voyager (KTEZ-1000)</_description>
+        <vendor>KeyTronic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>qtronix</name>
+        <_description>QTronix Scorpius 98N+</_description>
+        <vendor>QTronix</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>samsung4500</name>
+        <_description>Samsung SDM 4500P</_description>
+        <vendor>Samsung</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>samsung4510</name>
+        <_description>Samsung SDM 4510P</_description>
+        <vendor>Samsung</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk1300</name>
+        <_description>SK-1300</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk2500</name>
+        <_description>SK-2500</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk6200</name>
+        <_description>SK-6200</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sk7100</name>
+        <_description>SK-7100</_description>
+	<vendor>NEC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sp_inet</name>
+        <_description>Super Power Multimedia Keyboard</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sven</name>
+        <_description>SVEN Ergonomic 2500</_description>
+	<vendor>SVEN</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sven303</name>
+        <_description>SVEN Slim 303</_description>
+	<vendor>SVEN</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>symplon</name>
+        <_description>Symplon PaceBook (tablet PC)</_description>
+	<vendor>Symplon</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>toshiba_s3000</name>
+        <_description>Toshiba Satellite S3000</_description>
+	<vendor>Toshiba</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>trust</name>
+        <_description>Trust Wireless Keyboard Classic</_description>
+	<vendor>Trust</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>trustda</name>
+        <_description>Trust Direct Access Keyboard</_description>
+	<vendor>Trust</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>yahoo</name>
+        <_description>Yahoo! Internet Keyboard</_description>
+	<vendor>Yahoo!</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook78</name>
+        <_description>MacBook/MacBook Pro</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook79</name>
+        <_description>MacBook/MacBook Pro (Intl)</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh</name>
+        <_description>Macintosh</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh_old</name>
+        <_description>Macintosh Old</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macintosh_hhk</name>
+        <_description>Happy Hacking Keyboard for Mac</_description>
+	<vendor>Fujitsu</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_c300</name>
+        <_description>Acer C300</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_ferrari4k</name>
+        <_description>Acer Ferrari 4000</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>acer_laptop</name>
+        <_description>Acer Laptop</_description>
+	<vendor>Acer</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>asus_laptop</name>
+        <_description>Asus Laptop</_description>
+	<vendor>Asus</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>apple</name>
+        <_description>Apple</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>apple_laptop</name>
+        <_description>Apple Laptop</_description>
+	<vendor>Apple</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>silvercrest</name>
+        <_description>SILVERCREST Multimedia Wireless Keyboard</_description>
+	<vendor>Silvercrest</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>emachines</name>
+        <_description>Laptop/notebook eMachines m68xx</_description>
+	<vendor>eMachines</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>kr106</name>
+	<_description>Korean 106-key</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>evdev</name>
+	<_description>Evdev-managed keyboard</_description>
+	<vendor>Generic</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx</name>
+	<_description>BenQ X-Touch</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx730</name>
+	<_description>BenQ X-Touch 730</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>benqx800</name>
+	<_description>BenQ X-Touch 800</_description>
+	<vendor>BenQ</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>hhk</name>
+	<_description>Happy Hacking Keyboard</_description>
+	<vendor>Fujitsu</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>classmate</name>
+	<_description>Classmate PC</_description>
+	<vendor>Intel</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+	<name>olpc</name>
+	<_description>OLPC</_description>
+	<vendor>OLPC</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_usb</name>
+        <_description>Sun Type 7 USB</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_euro_usb</name>
+        <_description>Sun Type 7 USB (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_unix_usb</name>
+        <_description>Sun Type 7 USB (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_jp_usb</name>
+        <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7</name>
+        <_description>Sun Type 7</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_euro</name>
+        <_description>Sun Type 7 (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type7_unix</name>
+        <_description>Sun Type 7 (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_usb</name>
+        <_description>Sun Type 6 USB</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_euro_usb</name>
+        <_description>Sun Type 6 USB (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_unix_usb</name>
+        <_description>Sun Type 6 USB (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_jp_usb</name>
+        <_description>Sun Type 6 USB (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_jp_usb</name>
+        <_description>Sun Type 6 USB (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6</name>
+        <_description>Sun Type 6</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_euro</name>
+        <_description>Sun Type 6 (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_jp</name>
+        <_description>Sun Type 6 (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type6_unix</name>
+        <_description>Sun Type 6 (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5</name>
+        <_description>Sun Type 5</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_euro</name>
+        <_description>Sun Type 5 (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_jp</name>
+        <_description>Sun Type 5 (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_unix</name>
+        <_description>Sun Type 5 (Unix layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_hobo</name>
+        <_description>Sun Type 5 Compact</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_euro_hobo</name>
+        <_description>Sun Type 5 Compact (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type5_jp_hobo</name>
+        <_description>Sun Type 5 Compact (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type4</name>
+        <_description>Sun Type 4</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type4_ca</name>
+        <_description>Sun Type 4 (Canadian  layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type4_jp</name>
+        <_description>Sun Type 4 (Japanese layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>sun_type4_euro</name>
+        <_description>Sun Type 4 (European layout)</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
+  </modelList>
+  <layoutList>
+    <layout>
+      <configItem>
+        <name>us</name>
+        <_shortDescription>USA</_shortDescription>
+        <_description>USA</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>chr</name>
+            <_description>Cherokee</_description>
+            <languageList><iso639Id>chr</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>euro</name>
+            <_description>With EuroSign on 5</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alt-intl</name>
+            <_description>Alternative international (former us_intl)</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Colemak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-intl</name>
+            <_description>Dvorak international</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-l</name>
+            <_description>Left handed Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-r</name>
+            <_description>Right handed Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak-classic</name>
+            <_description>Classic Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvp</name>
+            <_description>Programmer Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus</name>
+            <_description>Russian phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>altgr-intl</name>
+            <_description>International (AltGr dead keys)</_description>
+            <languageList><iso639Id>eng</iso639Id>
+                          <iso639Id>fra</iso639Id>
+                          <iso639Id>ger</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc2</name>
+            <_description>Group toggle on multiply/divide key</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ad</name>
+        <_shortDescription>And</_shortDescription>
+        <_description>Andorra</_description>
+        <languageList><iso639Id>cat</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>af</name>
+        <_shortDescription>Afg</_shortDescription>
+        <_description>Afghanistan</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ps</name>
+            <_description>Pashto</_description>
+            <languageList><iso639Id>pus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>uz</name>
+            <_description>Southern Uzbek</_description>
+            <languageList><iso639Id>uzb</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-ps</name>
+            <_description>OLPC Pashto</_description>
+            <languageList><iso639Id>pus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-fa</name>
+            <_description>OLPC Dari</_description>
+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>olpc-uz</name>
+            <_description>OLPC Southern Uzbek</_description>
+            <languageList><iso639Id>uzb</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ara</name>
+        <_shortDescription>Ara</_shortDescription>
+        <_description>Arabic</_description>
+        <countryList>
+          <iso3166Id>AE</iso3166Id>
+          <iso3166Id>BH</iso3166Id>
+          <iso3166Id>DZ</iso3166Id>
+          <iso3166Id>EG</iso3166Id>
+          <iso3166Id>EH</iso3166Id>
+          <iso3166Id>JO</iso3166Id>
+          <iso3166Id>KW</iso3166Id>
+          <iso3166Id>LB</iso3166Id>
+          <iso3166Id>LY</iso3166Id>
+          <iso3166Id>MA</iso3166Id>
+          <iso3166Id>MR</iso3166Id>
+          <iso3166Id>OM</iso3166Id>
+          <iso3166Id>PS</iso3166Id>
+          <iso3166Id>QA</iso3166Id>
+          <iso3166Id>SA</iso3166Id>
+          <iso3166Id>SD</iso3166Id>
+          <iso3166Id>SY</iso3166Id>
+          <iso3166Id>TN</iso3166Id>
+          <iso3166Id>YE</iso3166Id>
+        </countryList>
+        <languageList><iso639Id>ara</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>azerty</name>
+            <_description>azerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>azerty_digits</name>
+            <_description>azerty/digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>digits</name>
+            <_description>digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_digits</name>
+            <_description>qwerty/digits</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>buckwalter</name>
+            <_description>Buckwalter</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>al</name>
+        <_shortDescription>Alb</_shortDescription>
+        <_description>Albania</_description>
+        <languageList><iso639Id>alb</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>am</name>
+        <_shortDescription>Arm</_shortDescription>
+        <_description>Armenia</_description>
+        <languageList><iso639Id>hye</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>phonetic-alt</name>
+            <_description>Alternative Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eastern</name>
+            <_description>Eastern</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>western</name>
+            <_description>Western</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>eastern-alt</name>
+            <_description>Alternative Eastern</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>az</name>
+        <_shortDescription>Aze</_shortDescription>
+        <_description>Azerbaijan</_description>
+        <languageList><iso639Id>aze</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cyrillic</name>
+            <_description>Cyrillic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>by</name>
+        <_shortDescription>Blr</_shortDescription>
+        <_description>Belarus</_description>
+        <languageList><iso639Id>bel</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>be</name>
+        <_shortDescription>Bel</_shortDescription>
+        <_description>Belgium</_description>
+        <languageList><iso639Id>ger</iso639Id>
+                      <iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>iso-alternate</name>
+            <_description>ISO Alternate</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>wang</name>
+            <_description>Wang model 724 azerty</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bd</name>
+        <_shortDescription>Ban</_shortDescription>
+        <_description>Bangladesh</_description>
+        <languageList><iso639Id>ben</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>probhat</name>
+            <_description>Probhat</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>in</name>
+        <_shortDescription>Ind</_shortDescription>
+        <_description>India</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ben</name>
+            <_description>Bengali</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ben_probhat</name>
+            <_description>Bengali Probhat</_description>
+            <languageList><iso639Id>ben</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guj</name>
+            <_description>Gujarati</_description>
+            <languageList><iso639Id>guj</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>guru</name>
+            <_description>Gurmukhi</_description>
+            <languageList><iso639Id>pan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>jhelum</name>
+            <_description>Gurmukhi Jhelum</_description>
+            <languageList><iso639Id>pan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kan</name>
+            <_description>Kannada</_description>
+            <languageList><iso639Id>kan</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mal</name>
+            <_description>Malayalam</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
+         </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>mal_lalitha</name>
+            <_description>Malayalam Lalitha</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
+         </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ori</name>
+            <_description>Oriya</_description>
+            <languageList><iso639Id>ori</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <_description>Tamil Unicode</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <_description>Tamil TAB Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TSCII</name>
+            <_description>Tamil TSCII Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam</name>
+            <_description>Tamil</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tel</name>
+            <_description>Telugu</_description>
+            <languageList><iso639Id>tel</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>urd</name>
+            <_description>Urdu</_description>
+            <languageList><iso639Id>urd</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bolnagri</name>
+            <_description>Hindi Bolnagri</_description>
+            <languageList><iso639Id>hin</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ba</name>
+        <_shortDescription>Bih</_shortDescription>
+        <_description>Bosnia and Herzegovina</_description>
+        <languageList><iso639Id>bos</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description> Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Bosnian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Bosnian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Bosnian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>br</name>
+        <_shortDescription>Bra</_shortDescription>
+        <_description>Brazil</_description>
+        <languageList><iso639Id>por</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo</name>
+            <_description>Nativo</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-us</name>
+            <_description>Nativo for USA keyboards</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-epo</name>
+            <_description>Nativo for Esperanto</_description>
+            <languageList><iso639Id>epo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bg</name>
+        <_shortDescription>Bgr</_shortDescription>
+        <_description>Bulgaria</_description>
+        <languageList><iso639Id>bul</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ma</name>
+        <_description>Morocco</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>french</name>
+            <_description>French</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh</name>
+            <_description>Tifinagh</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-alt</name>
+            <_description>Tifinagh Alternative</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-alt-phonetic</name>
+            <_description>Tifinagh Alternative Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-extended</name>
+            <_description>Tifinagh Extended</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-phonetic</name>
+            <_description>Tifinagh Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tifinagh-extended-phonetic</name>
+            <_description>Tifinagh Extended Phonetic</_description>
+            <languageList><iso639Id>ber</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mm</name>
+        <_shortDescription>Mmr</_shortDescription>
+        <_description>Myanmar</_description>
+        <languageList><iso639Id>mya</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ca</name>
+        <_shortDescription>Can</_shortDescription>
+        <_description>Canada</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>fr-dvorak</name>
+            <_description>French Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr-legacy</name>
+            <_description>French (legacy)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multix</name>
+            <_description>Multilingual</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multi</name>
+            <_description>Multilingual, first part</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>multi-2gr</name>
+            <_description>Multilingual, second part</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ike</name>
+            <_description>Inuktitut</_description>
+            <languageList><iso639Id>iku</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>shs</name>
+            <_description>Secwepemctsin</_description>
+            <!-- No ISO code in ISO639-2, only draft ISO693-3 -->
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kut</name>
+            <_description>Ktunaxa</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cd</name>
+        <_shortDescription>DRC</_shortDescription>
+        <_description>Congo, Democratic Republic of the</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cn</name>
+        <_shortDescription>China</_shortDescription>
+        <_description>China</_description>
+        <languageList><iso639Id>chi</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tib</name>
+            <_description>Tibetan</_description>
+            <languageList><iso639Id>tib</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tib_asciinum</name>
+            <_description>Tibetan (with ASCII numerals)</_description>
+            <languageList><iso639Id>tib</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>hr</name>
+        <_shortDescription>Hrv</_shortDescription>
+        <_description>Croatia</_description>
+        <languageList><iso639Id>scr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Croatian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Croatian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Croatian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>cz</name>
+        <_shortDescription>Cze</_shortDescription>
+        <_description>Czechia</_description>
+        <languageList><iso639Id>cze</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>bksl</name>
+            <_description>With &lt;\|&gt; key</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_bksl</name>
+            <_description>qwerty, extended Backslash</_description>
+          </configItem>
+        </variant>
+	<variant>
+	  <configItem>
+	    <name>ucw</name>
+	    <_description>UCW layout (accented letters only)</_description>
+	 </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>dk</name>
+        <_shortDescription>Dan</_shortDescription>
+        <_description>Denmark</_description>
+        <languageList><iso639Id>dan</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>nl</name>
+        <_shortDescription>Nld</_shortDescription>
+        <_description>Netherlands</_description>
+        <languageList><iso639Id>nld</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>bt</name>
+        <_shortDescription>Bhu</_shortDescription>
+        <_description>Bhutan</_description>
+        <languageList><iso639Id>dzo</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ee</name>
+        <_shortDescription>Est</_shortDescription>
+        <_description>Estonia</_description>
+        <languageList><iso639Id>est</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Estonian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ir</name>
+        <_shortDescription>Irn</_shortDescription>
+        <_description>Iran</_description>
+        <languageList><iso639Id>per</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>pro</name>
+            <_description>Pro</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>keypad</name>
+            <_description>Keypad</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>pro_keypad</name>
+            <_description>Pro Keypad</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_ara</name>
+            <_description>Kurdish, Arabic-Latin</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>iq</name>
+        <_shortDescription>Irq</_shortDescription>
+        <_description>Iraq</_description>
+        <languageList><iso639Id>ara</iso639Id>
+                      <iso639Id>kur</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_ara</name>
+            <_description>Kurdish, Arabic-Latin</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fo</name>
+        <_shortDescription>Fao</_shortDescription>
+        <_description>Faroe Islands</_description>
+        <languageList><iso639Id>fao</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fi</name>
+        <_shortDescription>Fin</_shortDescription>
+        <_description>Finland</_description>
+        <languageList><iso639Id>fin</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>smi</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>classic</name>
+            <_description>Classic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>fr</name>
+        <_shortDescription>Fra</_shortDescription>
+        <_description>France</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss</name>
+            <_description>Alternative</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_latin9</name>
+            <_description>Alternative, latin-9 only</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_nodeadkeys</name>
+            <_description>Alternative, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_sundeadkeys</name>
+            <_description>Alternative, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9</name>
+            <_description>(Legacy) Alternative</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_nodeadkeys</name>
+            <_description>(Legacy) Alternative, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_sundeadkeys</name>
+            <_description>(Legacy) Alternative, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bepo</name>
+            <_description>Bepo, ergonomic, Dvorak way</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>bepo_latin9</name>
+            <_description>Bepo, ergonomic, Dvorak way, latin-9 only</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>geo</name>
+            <_description>Georgian AZERTY Tskapo</_description>
+            <languageList><iso639Id>geo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gh</name>
+        <_shortDescription>Gha</_shortDescription>
+        <_description>Ghana</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>generic</name>
+            <_description>Multilingual</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>akan</name>
+            <_description>Akan</_description>
+            <languageList><iso639Id>aka</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ewe</name>
+            <_description>Ewe</_description>
+            <languageList><iso639Id>ewe</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fula</name>
+            <_description>Fula</_description>
+            <languageList><iso639Id>ful</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ga</name>
+            <_description>Ga</_description>
+            <languageList><iso639Id>gaa</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hausa</name>
+            <_description>Hausa</_description>
+            <languageList><iso639Id>hau</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gn</name>
+        <_shortDescription>Gui</_shortDescription>
+        <_description>Guinea</_description>
+        <languageList><iso639Id>fra</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ge</name>
+        <_shortDescription>Geo</_shortDescription>
+        <_description>Georgia</_description>
+        <languageList><iso639Id>geo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <_description>Ergonomic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mess</name>
+            <_description>MESS</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ru</name>
+            <_description>Russian</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os</name>
+            <_description>Ossetian</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>de</name>
+        <_shortDescription>Deu</_shortDescription>
+        <_description>Germany</_description>
+        <languageList><iso639Id>ger</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>deadacute</name>
+            <_description>Dead acute</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>deadgraveacute</name>
+            <_description>Dead grave acute</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ro</name>
+            <_description>Romanian keyboard with German letters</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ro_nodeadkeys</name>
+            <_description>Romanian keyboard with German letters, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>neo</name>
+            <_description>Neostyle</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gr</name>
+        <_shortDescription>Gre</_shortDescription>
+        <_description>Greece</_description>
+        <languageList><iso639Id>gre</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>simple</name>
+            <_description>Simple</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>extended</name>
+            <_description>Extended</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>polytonic</name>
+            <_description>Polytonic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>hu</name>
+        <_shortDescription>Hun</_shortDescription>
+        <_description>Hungary</_description>
+        <languageList><iso639Id>hun</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>standard</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+
+        <!-- 101 keys -->
+        <variant>
+          <configItem>
+            <name>101_qwertz_comma_dead</name>
+            <_description>101/qwertz/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_comma_nodead</name>
+            <_description>101/qwertz/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_dot_dead</name>
+            <_description>101/qwertz/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwertz_dot_nodead</name>
+            <_description>101/qwertz/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_comma_dead</name>
+            <_description>101/qwerty/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_comma_nodead</name>
+            <_description>101/qwerty/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_dot_dead</name>
+            <_description>101/qwerty/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>101_qwerty_dot_nodead</name>
+            <_description>101/qwerty/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+
+
+        <!-- 102 keys -->
+        <variant>
+          <configItem>
+            <name>102_qwertz_comma_dead</name>
+            <_description>102/qwertz/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_comma_nodead</name>
+            <_description>102/qwertz/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_dot_dead</name>
+            <_description>102/qwertz/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwertz_dot_nodead</name>
+            <_description>102/qwertz/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_comma_dead</name>
+            <_description>102/qwerty/comma/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_comma_nodead</name>
+            <_description>102/qwerty/comma/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_dot_dead</name>
+            <_description>102/qwerty/dot/Dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>102_qwerty_dot_nodead</name>
+            <_description>102/qwerty/dot/Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>is</name>
+        <_shortDescription>Isl</_shortDescription>
+        <_description>Iceland</_description>
+        <languageList><iso639Id>ice</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>Sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>il</name>
+        <_shortDescription>Isr</_shortDescription>
+        <_description>Israel</_description>
+        <languageList><iso639Id>heb</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>lyx</name>
+            <_description>lyx</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>biblical</name>
+            <_description>Biblical Hebrew (Tiro)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>it</name>
+        <_shortDescription>Ita</_shortDescription>
+        <_description>Italy</_description>
+        <languageList><iso639Id>ita</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>geo</name>
+            <_description>Georgian</_description>
+            <languageList><iso639Id>geo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>jp</name>
+        <_shortDescription>Jpn</_shortDescription>
+        <_description>Japan</_description>
+        <languageList><iso639Id>jpn</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>kana</name>
+            <_description>Kana</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>OADG109A</name>
+            <_description>OADG 109A</_description>
+          </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>kg</name>
+        <_shortDescription>Kir</_shortDescription>
+        <_description>Kyrgyzstan</_description>
+        <languageList><iso639Id>kir</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>kh</name>
+        <_shortDescription>Khm</_shortDescription>
+        <_description>Cambodia</_description>
+        <languageList><iso639Id>khm</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+	<name>kz</name>
+	<_shortDescription>Kaz</_shortDescription>
+	<_description>Kazakhstan</_description>
+        <languageList><iso639Id>kaz</iso639Id></languageList>
+      </configItem>
+      <variantList>
+	<variant>
+	  <configItem>
+	    <name>ruskaz</name>
+	    <_description>Russian with Kazakh</_description>
+            <languageList><iso639Id>kaz</iso639Id>
+                          <iso639Id>rus</iso639Id></languageList>
+	  </configItem>
+	</variant>
+	<variant>
+	  <configItem>
+	    <name>kazrus</name>
+	    <_description>Kazakh with Russian</_description>
+            <languageList><iso639Id>kaz</iso639Id>
+                          <iso639Id>rus</iso639Id></languageList>
+	  </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>la</name>
+        <_shortDescription>Lao</_shortDescription>
+        <_description>Laos</_description>
+        <languageList><iso639Id>lao</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>latam</name>
+        <_shortDescription>LAm</_shortDescription>
+        <_description>Latin American</_description>
+        <countryList>
+          <iso3166Id>AR</iso3166Id>
+          <iso3166Id>BO</iso3166Id>
+          <iso3166Id>CL</iso3166Id>
+          <iso3166Id>CO</iso3166Id>
+          <iso3166Id>CR</iso3166Id>
+          <iso3166Id>CU</iso3166Id>
+          <iso3166Id>DO</iso3166Id>
+          <iso3166Id>EC</iso3166Id>
+          <iso3166Id>GT</iso3166Id>
+          <iso3166Id>HN</iso3166Id>
+          <iso3166Id>HT</iso3166Id>
+          <iso3166Id>MX</iso3166Id>
+          <iso3166Id>NI</iso3166Id>
+          <iso3166Id>PA</iso3166Id>
+          <iso3166Id>PE</iso3166Id>
+          <iso3166Id>PR</iso3166Id>
+          <iso3166Id>PY</iso3166Id>
+          <iso3166Id>UY</iso3166Id>
+          <iso3166Id>VE</iso3166Id>
+        </countryList>
+        <languageList><iso639Id>spa</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lt</name>
+        <_shortDescription>Ltu</_shortDescription>
+        <_description>Lithuania</_description>
+        <languageList><iso639Id>lit</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Lithuanian letters</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ibm</name>
+            <_description>IBM (LST 1205-92)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>lekp</name>
+            <_description>LEKP</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>lekpa</name>
+            <_description>LEKPa</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>balticplus</name>
+            <_description>Baltic+</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lv</name>
+        <_shortDescription>Lav</_shortDescription>
+        <_description>Latvia</_description>
+        <languageList><iso639Id>lav</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>apostrophe</name>
+            <_description>Apostrophe (') variant</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tilde</name>
+            <_description>Tilde (~) variant</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fkey</name>
+            <_description>F-letter (F) variant</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mao</name>
+        <_shortDescription>Mao</_shortDescription>
+        <_description>Maori</_description>
+        <languageList><iso639Id>mao</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>me</name>
+        <_shortDescription>MNE</_shortDescription>
+        <_description>Montenegro</_description>
+        <languageList><iso639Id>srp</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cyrillic</name>
+            <_description>Cyrillic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cyrillicyz</name>
+            <_description>Cyrillic, Z and ZHE swapped</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicode</name>
+            <_description>Latin unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinyz</name>
+            <_description>Latin qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicodeyz</name>
+            <_description>Latin unicode qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cyrillicalternatequotes</name>
+            <_description>Cyrillic with guillemets</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinalternatequotes</name>
+            <_description>Latin with guillemets</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mk</name>
+        <_shortDescription>Mkd</_shortDescription>
+        <_description>Macedonia</_description>
+        <languageList><iso639Id>mkd</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mt</name>
+        <_shortDescription>Mlt</_shortDescription>
+        <_description>Malta</_description>
+        <languageList><iso639Id>mlt</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>Maltese keyboard with US layout</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mn</name>
+        <_shortDescription>Mng</_shortDescription>
+        <_description>Mongolia</_description>
+        <languageList><iso639Id>mng</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>no</name>
+        <_shortDescription>Nor</_shortDescription>
+        <_description>Norway</_description>
+        <languageList><iso639Id>nor</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi_nodeadkeys</name>
+            <_description>Northern Saami, eliminate dead keys</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pl</name>
+        <_shortDescription>Pol</_shortDescription>
+        <_description>Poland</_description>
+        <languageList><iso639Id>pol</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>qwertz</name>
+            <_description>qwertz</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak_quotes</name>
+            <_description>Dvorak, Polish quotes on quotemark key</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak_altquotes</name>
+            <_description>Dvorak, Polish quotes on key "1/!"</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>csb</name>
+            <_description>Kashubian</_description>
+            <languageList><iso639Id>csb</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ru_phonetic_dvorak</name>
+            <_description>Russian phonetic Dvorak</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pt</name>
+        <_shortDescription>Prt</_shortDescription>
+        <_description>Portugal</_description>
+        <languageList><iso639Id>por</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_nodeadkeys</name>
+            <_description>Macintosh, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac_sundeadkeys</name>
+            <_description>Macintosh, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo</name>
+            <_description>Nativo</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-us</name>
+            <_description>Nativo for USA keyboards</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>nativo-epo</name>
+            <_description>Nativo for Esperanto</_description>
+            <languageList><iso639Id>epo</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ro</name>
+        <_shortDescription>Rou</_shortDescription>
+        <_description>Romania</_description>
+        <languageList><iso639Id>rum</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>cedilla</name>
+            <_description>Cedilla</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std</name>
+            <_description>Standard</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>std_cedilla</name>
+            <_description>Standard (Cedilla)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ru</name>
+        <_shortDescription>Rus</_shortDescription>
+        <_description>Russia</_description>
+        <languageList><iso639Id>rus</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>typewriter</name>
+            <_description>Typewriter</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>legacy</name>
+            <_description>Legacy</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tt</name>
+            <_description>Tatar</_description>
+            <languageList><iso639Id>tat</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os_legacy</name>
+            <_description>Ossetian, legacy</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>os_winkeys</name>
+            <_description>Ossetian, Winkeys</_description>
+            <languageList><iso639Id>oss</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cv</name>
+            <_description>Chuvash</_description>
+            <languageList><iso639Id>chv</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cv_latin</name>
+            <_description>Chuvash Latin</_description>
+            <languageList><iso639Id>chv</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>udm</name>
+            <_description>Udmurt</_description>
+            <languageList><iso639Id>udm</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>kom</name>
+            <_description>Komi</_description>
+            <languageList><iso639Id>kom</iso639Id></languageList>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>sah</name>
+            <_description>Yakut</_description>
+            <languageList><iso639Id>sah</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>rs</name>
+        <_shortDescription>SRB</_shortDescription>
+        <_description>Serbia</_description>
+        <languageList><iso639Id>srp</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>yz</name>
+            <_description>Z and ZHE swapped</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicode</name>
+            <_description>Latin Unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinyz</name>
+            <_description>Latin qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinunicodeyz</name>
+            <_description>Latin Unicode qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>With guillemets</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latinalternatequotes</name>
+            <_description>Latin with guillemets</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>si</name>
+        <_shortDescription>Svn</_shortDescription>
+        <_description>Slovenia</_description>
+        <languageList><iso639Id>slv</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alternatequotes</name>
+            <_description>Use guillemets for quotes</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Use Slovenian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicodeus</name>
+            <_description>US keyboard with Slovenian digraphs</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>us</name>
+            <_description>US keyboard with Slovenian letters</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>sk</name>
+        <_shortDescription>Svk</_shortDescription>
+        <_description>Slovakia</_description>
+        <languageList><iso639Id>slo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>bksl</name>
+            <_description>Extended Backslash</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty</name>
+            <_description>qwerty</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>qwerty_bksl</name>
+            <_description>qwerty, extended Backslash</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>es</name>
+        <_shortDescription>Esp</_shortDescription>
+        <_description>Spain</_description>
+        <languageList><iso639Id>spa</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ast</name>
+            <_description>Asturian variant with bottom-dot H and bottom-dot L</_description>
+            <languageList><iso639Id>ast</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>cat</name>
+            <_description>Catalan variant with middle-dot L</_description>
+            <languageList><iso639Id>cat</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>se</name>
+        <_shortDescription>Swe</_shortDescription>
+        <_description>Sweden</_description>
+        <languageList><iso639Id>swe</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>nodeadkeys</name>
+            <_description>Eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus</name>
+            <_description>Russian phonetic</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rus_nodeadkeys</name>
+            <_description>Russian phonetic, eliminate dead keys</_description>
+            <languageList><iso639Id>rus</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>smi</name>
+            <_description>Northern Saami</_description>
+            <languageList><iso639Id>sme</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>svdvorak</name>
+            <_description>Svdvorak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ch</name>
+        <_shortDescription>Che</_shortDescription>
+        <_description>Switzerland</_description>
+        <languageList><iso639Id>ger</iso639Id>
+                      <iso639Id>gsw</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>de_nodeadkeys</name>
+            <_description>German, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>de_sundeadkeys</name>
+            <_description>German, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr</name>
+            <_description>French</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_nodeadkeys</name>
+            <_description>French, eliminate dead keys</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_sundeadkeys</name>
+            <_description>French, Sun dead keys</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>fr_mac</name>
+            <_description>French (Macintosh)</_description>
+            <languageList><iso639Id>fra</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>de_mac</name>
+            <_description>German (Macintosh)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>sy</name>
+        <_shortDescription>Syr</_shortDescription>
+        <_description>Syria</_description>
+        <languageList><iso639Id>syr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>syc</name>
+            <_description>Syriac</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>syc_phonetic</name>
+            <_description>Syriac phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>tj</name>
+        <_shortDescription>Tjk</_shortDescription>
+        <_description>Tajikistan</_description>
+        <languageList><iso639Id>tgk</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>lk</name>
+        <_shortDescription>SrL</_shortDescription>
+        <_description>Sri Lanka</_description>
+        <languageList><iso639Id>sin</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tam_unicode</name>
+            <_description>Tamil Unicode</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>tam_TAB</name>
+            <_description>Tamil TAB Typewriter</_description>
+            <languageList><iso639Id>tam</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>th</name>
+        <_shortDescription>Tha</_shortDescription>
+        <_description>Thailand</_description>
+        <languageList><iso639Id>tha</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>tis</name>
+            <_description>TIS-820.2538</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>pat</name>
+            <_description>Pattachote</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>tr</name>
+        <_shortDescription>Tur</_shortDescription>
+        <_description>Turkey</_description>
+        <languageList><iso639Id>tur</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>f</name>
+            <_description>(F)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>alt</name>
+            <_description>Alt-Q</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>sundeadkeys</name>
+            <_description>Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku</name>
+            <_description>Kurdish, Latin Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_f</name>
+            <_description>Kurdish, (F)</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ku_alt</name>
+            <_description>Kurdish, Latin Alt-Q</_description>
+            <languageList><iso639Id>kur</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ua</name>
+        <_shortDescription>Ukr</_shortDescription>
+        <_description>Ukraine</_description>
+        <languageList><iso639Id>ukr</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>phonetic</name>
+            <_description>Phonetic</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>typewriter</name>
+            <_description>Typewriter</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>winkeys</name>
+            <_description>Winkeys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>unicode</name>
+            <_description>Unicode</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rstu</name>
+<!-- RSTU 2019-91 -->
+            <_description>Standard RSTU</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>rstu_ru</name>
+<!-- RSTU 2019-91 -->
+            <_description>Standard RSTU on Russian layout</_description>
+          </configItem>
+        </variant>
+	<variant>
+          <configItem>
+            <name>homophonic</name>
+            <_description>Homophonic</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>gb</name>
+        <_shortDescription>GBr</_shortDescription>
+        <_description>United Kingdom</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>intl</name>
+            <_description>International (with dead keys)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorak</name>
+            <_description>Dvorak</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>dvorakukp</name>
+            <_description>Dvorak (UK Punctuation)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>mac</name>
+            <_description>Macintosh</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>colemak</name>
+            <_description>Colemak</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>uz</name>
+        <_shortDescription>Uzb</_shortDescription>
+        <_description>Uzbekistan</_description>
+        <languageList><iso639Id>uzb</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>latin</name>
+            <_description>Latin</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>vn</name>
+        <_shortDescription>Vnm</_shortDescription>
+        <_description>Vietnam</_description>
+        <languageList><iso639Id>vie</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+       <configItem>
+        <name>kr</name>
+        <_shortDescription>Kor</_shortDescription>
+        <_description>Korea, Republic of</_description>
+        <languageList><iso639Id>kor</iso639Id></languageList>
+      </configItem>
+      <variantList>
+	<variant>
+	  <configItem>
+	    <name>kr104</name>
+	    <_description>101/104 key Compatible</_description>
+	  </configItem>
+	</variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>nec_vndr/jp</name>
+        <_shortDescription>Jpn</_shortDescription>
+        <_description>Japan (PC-98xx Series)</_description>
+        <countryList><iso3166Id>JP</iso3166Id></countryList>
+        <languageList><iso639Id>jpn</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ie</name>
+        <_shortDescription>Irl</_shortDescription>
+        <_description>Ireland</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>CloGaelach</name>
+            <_description>CloGaelach</_description>
+            <languageList><iso639Id>gla</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>UnicodeExpert</name>
+            <_description>UnicodeExpert</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ogam</name>
+            <_description>Ogham</_description>
+            <!-- No ISO code in ISO639 -->
+         </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ogam_is434</name>
+            <_description>Ogham IS434</_description>
+            <!-- No ISO code in ISO639 -->
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>pk</name>
+        <_shortDescription>Pak</_shortDescription>
+        <_description>Pakistan</_description>
+        <languageList><iso639Id>urd</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ara</name>
+            <_description>Arabic</_description>
+            <languageList><iso639Id>ara</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>mv</name>
+        <_shortDescription>Mal</_shortDescription>
+        <_description>Maldives</_description>
+        <languageList><iso639Id>div</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+       <configItem>
+        <name>za</name>
+        <_shortDescription>Zar</_shortDescription>
+        <_description>South Africa</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>epo</name>
+        <_shortDescription>Epo</_shortDescription>
+	<_description>Esperanto</_description>
+        <languageList><iso639Id>epo</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>legacy</name>
+            <_description>displaced semicolon and quote (obsolete)</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>np</name>
+        <_shortDescription>Nep</_shortDescription>
+	<_description>Nepal</_description>
+        <languageList><iso639Id>nep</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ng</name>
+        <_shortDescription>Nig</_shortDescription>
+	<_description>Nigeria</_description>
+        <languageList><iso639Id>eng</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>igbo</name>
+            <_description>Igbo</_description>
+            <languageList><iso639Id>ibo</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>yoruba</name>
+            <_description>Yoruba</_description>
+            <languageList><iso639Id>yor</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>hausa</name>
+            <_description>Hausa</_description>
+            <languageList><iso639Id>hau</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
+        <name>et</name>
+        <_shortDescription>Eth</_shortDescription>
+        <_description>Ethiopia</_description>
+        <languageList><iso639Id>amh</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>braille</name>
+        <_shortDescription>Brl</_shortDescription>
+        <_description>Braille</_description>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>left_hand</name>
+            <_description>Left hand</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>right_hand</name>
+            <_description>Right hand</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+  </layoutList>
+  <optionList>
+    <group allowMultipleSelection="true">
+      <!-- The key combination used to switch between groups -->
+      <configItem>
+        <name>grp</name>
+        <_description>Layout switching</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>grp:switch</name>
+          <_description>R-Alt switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lswitch</name>
+          <_description>Left Alt key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lwin_switch</name>
+          <_description>Left Win-key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rwin_switch</name>
+          <_description>Right Win-key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:win_switch</name>
+          <_description>Both Win-keys switch layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:caps_switch</name>
+          <_description>CapsLock key switches layout while pressed, Alt+CapsLock does the original capslock action.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rctrl_switch</name>
+          <_description>Right Ctrl key switches layout while pressed.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:toggle</name>
+          <_description>Right Alt key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lalt_toggle</name>
+          <_description>Left Alt key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:caps_toggle</name>
+          <_description>CapsLock key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shift_caps_toggle</name>
+          <_description>Shift+CapsLock changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shift_caps_switch</name>
+          <_description>CapsLock switch to first layout, Shift+CapsLock switch to last layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alt_caps_toggle</name>
+          <_description>Alt+CapsLock changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:shifts_toggle</name>
+          <_description>Both Shift keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alts_toggle</name>
+          <_description>Both Alt keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrls_toggle</name>
+          <_description>Both Ctrl keys together change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_shift_toggle</name>
+          <_description>Ctrl+Shift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lctrl_lshift_toggle</name>
+          <_description>LCtrl+LShift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:ctrl_alt_toggle</name>
+          <_description>Alt+Ctrl change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:alt_shift_toggle</name>
+          <_description>Alt+Shift change layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:menu_toggle</name>
+          <_description>Menu key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lwin_toggle</name>
+          <_description>Left Win-key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rwin_toggle</name>
+          <_description>Right Win-key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lshift_toggle</name>
+          <_description>Left Shift key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rshift_toggle</name>
+          <_description>Right Shift key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:lctrl_toggle</name>
+          <_description>Left Ctrl key changes layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp:rctrl_toggle</name>
+          <_description>Right Ctrl key changes layout.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- The key combination used to choose the 3rd (and 4th, together with Shift)
+	   level of symbols -->
+      <configItem>
+        <name>lv3</name>
+        <_description>Third level choosers</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>lv3:switch</name>
+          <_description>Press Right Ctrl to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:menu_switch</name>
+          <_description>Press Menu key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:win_switch</name>
+          <_description>Press any of Win-keys to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lwin_switch</name>
+          <_description>Press Left Win-key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:rwin_switch</name>
+          <_description>Press Right Win-key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:alt_switch</name>
+          <_description>Press any of Alt keys to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lalt_switch</name>
+          <_description>Press Left Alt key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_switch</name>
+          <_description>Press Right Alt key to choose 3rd level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_switch_multikey</name>
+          <_description>Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:ralt_alt</name>
+          <_description>Right Alt key never chooses 3rd level.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Tweaking the position of the "Ctrl" key -->
+      <configItem>
+        <name>ctrl</name>
+        <_description>Ctrl key position</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>ctrl:nocaps</name>
+          <_description>Make CapsLock an additional Ctrl.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:swapcaps</name>
+          <_description>Swap Ctrl and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ac</name>
+          <_description>Ctrl key at left of 'A'</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_aa</name>
+          <_description>Ctrl key at bottom left</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>ctrl:ctrl_ra</name>
+          <_description>Right Ctrl key works as Right Alt.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
+      <configItem>
+        <name>grp_led</name>
+        <_description>Use keyboard LED to show alternative layout.</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>grp_led:num</name>
+          <_description>NumLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp_led:caps</name>
+          <_description>CapsLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>grp_led:scroll</name>
+          <_description>ScrollLock LED shows alternative layout.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Select a keypad type -->
+      <configItem>
+        <name>keypad</name>
+        <_description>Numeric keypad layout selection</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>keypad:legacy</name>
+          <_description>Legacy keypad</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:oss</name>
+          <_description>Keypad with unicode additions (arrows and math operators)</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:future</name>
+          <_description>Keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:legacy_wang</name>
+          <_description>Legacy Wang 724 keypad</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:oss_wang</name>
+          <_description>Wang 724 keypad with unicode additions (arrows and math operators)</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:future_wang</name>
+          <_description>Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level.</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>keypad:phone_hex</name>
+          <_description>ATM/phone-style hexadecimal keypad</_description>
+        </configItem>
+      </option>
+    </group>
+    <!-- This option should override the KPDL key defined in keypad; I hope it's declared in the right place -->
+    <group allowMultipleSelection="false">
+      <!-- Select a keypad KPDL variant -->
+      <configItem>
+        <name>kpdl</name>
+        <_description>Numeric keypad delete key behaviour</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <!-- Actually, with KP_DECIMAL, as the old keypad(dot) -->
+          <name>kpdl:dot</name>
+          <_description>Legacy key with dot</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:comma</name>
+          <!-- Actually, with KP_SEPARATOR, as the old keypad(comma) -->
+          <_description>Legacy key with comma</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:dotoss</name>
+          <_description>Four-level key with dot</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:dotoss_latin9</name>
+          <_description>Four-level key with dot, latin-9 restriction</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:commaoss</name>
+          <_description>Four-level key with comma</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:momayyezoss</name>
+          <_description>Four-level key with momayyez</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>kpdl:kposs</name>
+          <!-- This assumes the KP_ abstract symbols are actually useful for some apps
+               The description needs to be rewritten -->
+          <_description>Four-level key with abstract separators</_description>
+       </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- CapsLock tweaks. 
+	   "Internal" capitalization means capitalization using some internal tables.
+	   Otherwise "as Shift" - means using next group. -->
+      <configItem>
+        <name>caps</name>
+        <_description>CapsLock key behavior</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>caps:internal</name>
+          <_description>CapsLock uses internal capitalization. Shift "pauses" CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:internal_nocancel</name>
+          <_description>CapsLock uses internal capitalization. Shift doesn't affect CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shift</name>
+          <_description>CapsLock acts as Shift with locking. Shift "pauses" CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shift_nocancel</name>
+          <_description>CapsLock acts as Shift with locking. Shift doesn't affect CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:capslock</name>
+          <_description>CapsLock toggles normal capitalization of alphabetic characters.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:swapescape</name>
+          <_description>Swap ESC and CapsLock.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>caps:shiftlock</name>
+          <_description>CapsLock toggles Shift so all keys are affected.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
+      <configItem>
+        <name>altwin</name>
+        <_description>Alt/Win key behavior</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>altwin:menu</name>
+          <_description>Add the standard behavior to Menu key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:meta_alt</name>
+          <_description>Alt and Meta are on the Alt keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:ctrl_win</name>
+          <_description>Control is mapped to the Win-keys (and the usual Ctrl keys).</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:meta_win</name>
+          <_description>Meta is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:left_meta_win</name>
+          <_description>Meta is mapped to the left Win-key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:super_win</name>
+          <_description>Super is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:hyper_win</name>
+          <_description>Hyper is mapped to the Win-keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:alt_super_win</name>
+          <_description>Alt is mapped to the right Win-key and Super to Menu.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>altwin:swap_lalt_lwin</name>
+          <_description>Left Alt is swapped with left Win-key.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
+      <configItem>
+        <name>Compose key</name>
+        <_description>Compose key position</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>compose:ralt</name>
+          <_description>Right Alt is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:lwin</name>
+          <_description>Left Win-key is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:rwin</name>
+          <_description>Right Win-key is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:menu</name>
+          <_description>Menu is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:rctrl</name>
+          <_description>Right Ctrl is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:caps</name>
+          <_description>Caps Lock is Compose.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>compose:102</name>
+          <_description>Less-than/Greater-than is Compose.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>compat</name>
+        <_description>Miscellaneous compatibility options</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>numpad:pc</name>
+          <_description>Default numeric keypad keys.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:mac</name>
+          <_description>Numeric keypad keys work as with Mac.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>numpad:microsoft</name>
+          <_description>Shift with numeric keypad keys works as in MS Windows.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>srvrkeys:none</name>
+          <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>apple:badmap</name>
+          <_description>Swap keycodes of two keys when Mac keyboards are misdetected by kernel.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>shift:breaks_caps</name>
+          <_description>Shift cancels CapsLock.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <!-- Special shortcuts for the Euro character -->
+      <configItem>
+        <name>eurosign</name>
+        <_description>Adding the EuroSign to certain keys</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>eurosign:e</name>
+          <_description>Add the EuroSign to the E key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:2</name>
+          <_description>Add the EuroSign to the 2 key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:4</name>
+          <_description>Add the EuroSign to the 4 key.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>eurosign:5</name>
+          <_description>Add the EuroSign to the 5 key.</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="false">
+      <!-- Let space output nobreakspace for the desired level -->
+      <configItem>
+        <name>nbsp</name>
+        <_description>Using space key to input non-breakable space character</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>nbsp:none</name>
+          <_description>Space key outputs usual space at any level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level2</name>
+          <_description>Space key outputs non-breakable space character at second level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3</name>
+          <_description>Space key outputs non-breakable space character at third level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3s</name>
+          <_description>Space key outputs non-breakable space character at third level, nothing at fourth level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level3n</name>
+          <_description>Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4</name>
+          <_description>Space key outputs non-breakable space character at fourth level.</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4n</name>
+          <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>nbsp:level4nl</name>
+          <_description>Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)</_description>
+        </configItem>
+      </option>
+    </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>japan</name>
+        <_description>Japanese keyboard options</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>japan:kana_lock</name>
+          <_description>Kana Lock key is locking</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>japan:nicola_f_bs</name>
+          <_description>NICOLA-F style Backspace</_description>
+       </configItem>
+      </option>
+    </group>
+  </optionList>
+</xkbConfigRegistry>
--- a/src/xorg/keytables/sun-src/rules/xorg	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1090 +0,0 @@
-// $XdotOrg$
-
-//
-//  Rules for resolving XKB components for use with X
-//  Copyright 1996 by Joseph Moss
-//
-//  2002 Modifier: Ivan Pascal      The XFree86 Project
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-//  $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
-// uncomment lines below
-//! $nonlatin = am ara bg by dev el ge il \
-//              ir iu kan kz lo mk mm ml \
-//              ori ru sr syr th tj ua 
-
-// Sun keyboards
-! model			=    geometry
-  sun_type4		=    sun(type4)
-  sun_type4_ca		=    sun(type4_ca)
-  sun_type4_jp		=    sun(type4jp)
-  sun_type4_euro	=    sun(type4tuv)
-  sun_type5		=    sun(type5)
-  sun_type5_euro	=    sun(type5tuv)
-  sun_type5_jp		=    sun(type5jp)
-  sun_type5_unix	=    sun(type5unix)
-  sun_type5_hobo	=    sun(type5hobo)
-  sun_type5_euro_hobo	=    sun(type5tuvhobo)
-  sun_type5_jp_hobo	=    sun(type5jphobo)
-  sun_type5_unix_hobo	=    sun(type5hobo)
-  sun_type6		=    sun(type6)
-  sun_type6_euro	=    sun(type6tuv)
-  sun_type6_jp		=    sun(type6jp)
-  sun_type6_unix	=    sun(type6unix)
-  sun_type6_usb		=    sun(type6)
-  sun_type6_euro_usb	=    sun(type6tuv)
-  sun_type6_jp_usb	=    sun(type6jp)
-  sun_type6_unix_usb	=    sun(type6unix)
-  sun_type7_jp_usb	=    sun(type6jp)
-
-! $sun = sun_type4 sun_type4_ca sun_type4_jp sun_type4_euro sun_type5 sun_type5_euro sun_type5_jp sun_type5_unix sun_type5_hobo sun_type5_euro_hobo sun_type5_jp_hobo sun_type5_unix_hobo sun_type6 sun_type6_euro sun_type6_jp sun_type6_unix sun_type6_usb sun_type6_euro_usb sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb
-! $sun_type4 = sun_type4 sun_type4_ca sun_type4_jp sun_type4_euro 
-| $sun_type5 = sun_type5 sun_type5_euro sun_type5_jp sun_type5_unix 
-| $sun_hobo = sun_type5_hobo sun_type5_euro_hobo sun_type5_jp_hobo sun_type5_unix_hobo 
-! $sun_type6 = sun_type6 sun_type6_euro sun_type6_jp sun_type6_unix sun_type6_usb sun_type6_euro_usb sun_type6_jp_usb sun_type6_unix_usb
-! $sun_type7 = sun_type7_jp_usb
-// Sun Type 6 keyboards with custom/non-standard layouts
-! $sun_t6_custom = am ar az be br ca_bi cz de de_CH \
-                   dk es fi fr fr_CH gb ge it \
-                   jp kg ko kz nl no pl_dev pt \
-                   ru se sk tj tr tr_f tw ua \
-                   uz
-
-! $sun_jp = sun_type4_jp sun_type5_jp sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
-
-! $pcmodels = pc101 pc102 pc104 pc105
-! $maclaptop = ibook powerbook
-! $mac = macintosh macintosh_old ibook powerbook
-
-! $azerty = be fr
-! $qwertz = al cz de hr hu ro si sk 
-
-! $inetkbds = a4techKB21 a4techKBS8 acer_tm_800 acpi airkey azonaRF2300 \
-              brother \
-              btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090\
-              cherryblue cherrybluea cherryblueb \
-              chicony chicony9885 \
-              compaqeak8 compaqik7 compaqik13 compaqik18 cymotionlinux \
-              armada presario ipaq \
-              dell inspiron dtk2000 \
-              dexxa diamond genius geniuscomfy2 \
-              ennyah_dkb1008 gyration \
-              hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
-              hp500fa hp5xx hp5185 \
-              honeywell_euroboard \
-              rapidaccess rapidaccess2 rapidaccess2a \
-              ltcd logiaccess logicdp logicdpa logicdit logicink logiciink \
-              logiinkse logiinkseusb logiitc logiik itouch logiultrax \
-              mx1998 mx2500 mx2750 \
-              microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
-              microsoftoffice microsoftmult \
-              oretec \
-              propeller scorpius \
-              qtronix \
-              samsung4500 samsung4510 \
-              sk1300 sk2500 sk6200 sk7100 sp_inet \
-              sven symplon toshiba_s3000 trust trustda yahoo
-
-! model		=	keycodes
-  $sun_jp	=	sun(type6_jp_usb)
-  $sun		=	sun(type6_usb)
-  macintosh_old	=	macintosh
-  powerpcps2	=	powerpcps2
-  pc98		=	xfree98(pc98)
-  abnt2		=	xfree86(abnt2)
-  jp106		=	sun(type6_jp_usb)
-  *		=	xfree86
-
-! layout[1]	=	keycodes
-  $azerty       =       +aliases(azerty)
-  $qwertz       =       +aliases(qwertz)
-  *             =       +aliases(qwerty)
-
-! layout	=	keycodes
-  $azerty       =       +aliases(azerty)
-  $qwertz       =       +aliases(qwertz)
-  *             =       +aliases(qwerty)
-
-! model		=	geometry
-  microsoft	=	microsoft(natural)
-  microsoftpro	=	microsoft(natural)
-  microsoftprousb =	microsoft(natural)
-  microsoftprose =	microsoft(natural)
-  dell101	=	dell(dell101)
-  flexpro	=	keytronic(FlexPro)
-  hp6000	=	hp(omnibook)
-  omnikey101	=	northgate(omnikey101)
-  thinkpad	=	ibm/thinkpad(common)
- $pcmodels	=	pc(%m)
-  jp106		=	pc(jp106)
-  everex	=	everex(STEPnote)
-  winbook	=	winbook(XP5)
-  pc98		=	nec(pc98)
-  abnt2		=	pc(abnt2)
- $mac		=	macintosh(macintosh)
-  *		=       pc(pc104)
-
-! model		layout		variant		=	symbols
-  $pcmodels	ben		basic		=	pc/pc(%m)+pc/in(ben)
-  *		ben		basic		=	pc/pc(pc105)+pc/in(ben)
-  $pcmodels	ben		probhat		=	pc/pc(%m)+pc/in(ben_probhat)
-  *		ben		probhat		=	pc/pc(pc105)+pc/in(ben_probhat)
-  $pcmodels	dev		basic		=	pc/pc(%m)+pc/in(deva)
-  *		dev		basic		=	pc/pc(pc105)+pc/in(deva)
-  $pcmodels	dvorak		gb		=	pc/pc(%m)+pc/gb(dvorak)
-  *		dvorak		gb		=	pc/pc(pc105)+pc/gb(dvorak)
-  $pcmodels	dvorak		fr		=	pc/pc(%m)+pc/fr(dvorak)
-  *		dvorak		fr		=	pc/pc(pc105)+pc/fr(dvorak)
-  $pcmodels	dvorak		no		=	pc/pc(%m)+pc/no(dvorak)
-  *		dvorak		no		=	pc/pc(pc105)+pc/no(dvorak)
-  $pcmodels	dvorak		se		=	pc/pc(%m)+pc/se(dvorak)
-  *		dvorak		se		=	pc/pc(pc105)+pc/se(dvorak)
-  $pcmodels	dvorak		basic		=	pc/pc(%m)+pc/us(dvorak)
-  *		dvorak		basic		=	pc/pc(pc105)+pc/us(dvorak)
-  $pcmodels	dvorak		pl_basic	=	pc/pc(%m)+pc/pl(dvorak)
-  *		dvorak		pl_basic	=	pc/pc(pc105)+pc/pl(dvorak)
-  $pcmodels	dvorak		pl		=	pc/pc(%m)+pc/pl(dvorak_quotes)
-  *		dvorak		pl		=	pc/pc(pc105)+pc/pl(dvorak_quotes)
-  $pcmodels	dvorak		pl_altquotes	=	pc/pc(%m)+pc/pl(dvorak_altquotes)
-  *		dvorak		pl_altquotes	=	pc/pc(pc105)+pc/pl(dvorak_altquotes)
-  $pcmodels	dz		basic		=	pc/pc(%m)+pc/bt(basic)
-  *		dz		basic		=	pc/pc(pc105)+pc/bt(basic)
-  $pcmodels	guj		basic		=	pc/pc(%m)+pc/in(guj)
-  *		guj		basic		=	pc/pc(pc105)+pc/in(guj)
-  $pcmodels	gur		basic		=	pc/pc(%m)+pc/in(guru)
-  *		gur		basic		=	pc/pc(pc105)+pc/in(guru)
-  $pcmodels	ie		laptop		=	pc/pc(%m)+pc/ie(basic)
-  *		ie		laptop		=	pc/pc(pc105)+pc/ie(basic)
-  $pcmodels	ie		CloGaelachLaptop		=	pc/pc(%m)+pc/ie(CloGaelach)
-  *		ie		CloGaelachLaptop		=	pc/pc(pc105)+pc/ie(CloGaelach)
-  $pcmodels	iu		basic		=	pc/pc(%m)+pc/ca(ike)
-  *		iu		basic		=	pc/pc(pc105)+pc/ca(ike)
-  $pcmodels	lo		basic		=	pc/pc(%m)+pc/la(basic)
-  *		lo		basic		=	pc/pc(pc105)+pc/la(basic)
-  $pcmodels	kan		basic		=	pc/pc(%m)+pc/in(kan)
-  *		kan		basic		=	pc/pc(pc105)+pc/in(kan)
-  $pcmodels	mal		basic		=	pc/pc(%m)+pc/in(mal)
-  *		mal		basic		=	pc/pc(pc105)+pc/in(mal)
-  $pcmodels	mal		mlplusnum	=	pc/pc(%m)+pc/in(mal)
-  *		mal		mlplusnum	=	pc/pc(pc105)+pc/in(mal)
-  $pcmodels	ogham		basic		=	pc/pc(%m)+pc/ie(ogam)
-  *		ogham		basic		=	pc/pc(pc105)+pc/ie(ogam)
-  $pcmodels	ogham		laptop		=	pc/pc(%m)+pc/ie(ogam)
-  *		ogham		laptop		=	pc/pc(pc105)+pc/ie(ogam)
-  $pcmodels	ogham		is434		=	pc/pc(%m)+pc/ie(ogam_is434)
-  *		ogham		is434		=	pc/pc(pc105)+pc/ie(ogam_is434)
-  $pcmodels	ogham		is434laptop	=	pc/pc(%m)+pc/ie(ogam_is434)
-  *		ogham		is434laptop	=	pc/pc(pc105)+pc/ie(ogam_is434)
-  $pcmodels	ori		basic		=	pc/pc(%m)+pc/in(ori)
-  *		ori		basic		=	pc/pc(pc105)+pc/in(ori)
-  $pcmodels	sapmi		basic		=	pc/pc(%m)+pc/no(smi)
-  *		sapmi		basic		=	pc/pc(pc105)+pc/no(smi)
-  $pcmodels	sapmi		nodeadkeys	=	pc/pc(%m)+pc/no(smi_nodeadkeys)
-  *		sapmi		nodeadkeys	=	pc/pc(pc105)+pc/no(smi_nodeadkeys)
-  $pcmodels	sapmi		sefi		=	pc/pc(%m)+pc/fi(smi)
-  *		sapmi		sefi		=	pc/pc(pc105)+pc/fi(smi)
-  $pcmodels	sin		phonetic-static	=	pc/pc(%m)+pc/in(sin_phonetic)
-  *		sin		phonetic-static	=	pc/pc(pc105)+pc/in(sin_phonetic)
-  $pcmodels	syr		basic		=	pc/pc(%m)+pc/sy(syc)
-  *		syr		basic		=	pc/pc(pc105)+pc/sy(syc)
-  $pcmodels	syr		phonetic	=	pc/pc(%m)+pc/sy(syc_phonetic)
-  *		syr		phonetic	=	pc/pc(pc105)+pc/sy(syc_phonetic)
-  $pcmodels	tam		INSCRIPT	=	pc/pc(%m)+pc/in(tam)
-  *		tam		INSCRIPT	=	pc/pc(pc105)+pc/in(tam)
-  $pcmodels	tam		UNI		=	pc/pc(%m)+pc/in(tam_unicode)
-  *		tam		UNI		=	pc/pc(pc105)+pc/in(tam_unicode)
-  $pcmodels	tam		TAB		=	pc/pc(%m)+pc/in(tam_TAB)
-  *		tam		TAB		=	pc/pc(pc105)+pc/in(tam_TAB)
-  $pcmodels	tam		TSCII		=	pc/pc(%m)+pc/in(tam_TSCII)
-  *		tam		TSCII		=	pc/pc(pc105)+pc/in(tam_TSCII)
-  $pcmodels	tel		basic		=	pc/pc(%m)+pc/in(tel)
-  *		tel		basic		=	pc/pc(pc105)+pc/in(tel)
-  $pcmodels	yu		basic		=	pc/pc(%m)+pc/srp(latin)
-  *		yu		basic		=	pc/pc(pc105)+pc/srp(latin)
-  $pcmodels	yu		unicode		=	pc/pc(%m)+pc/srp(latinunicode)
-  *		yu		unicode		=	pc/pc(pc105)+pc/srp(latinunicode)
-  $pcmodels	yu		yz		=	pc/pc(%m)+pc/srp(latinyz)
-  *		yu		yz		=	pc/pc(pc105)+pc/srp(latinyz)
-  $pcmodels	yu		unicodeyz	=	pc/pc(%m)+pc/srp(latinunicodeyz)
-  *		yu		unicodeyz	=	pc/pc(pc105)+pc/srp(latinunicodeyz)
- $maclaptop	*		nodeadkeys	=	macintosh/us(extended)+macintosh/%l%(v)+apple(laptop_bad_switch)
- $mac		*		nodeadkeys	=	macintosh/us(extended)+macintosh/%l%(v)
-
-! model		layout				=	symbols
-  $sun_type4	*	=	sun/us(type4)+sun/%l(type4)
-  $sun_type5	*	=	sun/us(type5)+sun/%l(type5)
-  $sun_hobo	*	=	sun/us(type5hobo)+sun/%l(type5hobo)
-  $sun_type6	us	=	sun/us(type6)+sun/solaris(defaults)
-  $sun_type6	jp	=	sun/us(type6)+sun/jp(type6)
-  $sun_type7	jp	=	sun/us(type6)+sun/jp(type7)
-  jp106		jp	=	sun/us(type6)+sun/jp(type7)
-  $sun_type6	$sun_t6_custom	=	sun/us(type6)+sun/%l(type6)
-  $sun_type6	*	=	sun/us(type6)+%l(sundeadkeys)
-  $pcmodels	ar			=	pc/pc(%m)+pc/ara
-  *		ar			=	pc/pc(pc105)+pc/ara
-  $pcmodels	ben			=	pc/pc(%m)+pc/in(ben)
-  *		ben			=	pc/pc(pc105)+pc/in(ben)
-  $pcmodels	bs			=	pc/pc(%m)+pc/ba
-  *		bs			=	pc/pc(pc105)+pc/ba
-  $pcmodels	dev			=	pc/pc(%m)+pc/in(deva)
-  *		dev			=	pc/pc(pc105)+pc/in(deva)
-  $pcmodels	dvorak			=	pc/pc(%m)+pc/us(dvorak)
-  *		dvorak			=	pc/pc(pc105)+pc/us(dvorak)
-  $pcmodels	dz			=	pc/pc(%m)+pc/bt
-  *		dz			=	pc/pc(pc105)+pc/bt
-  $pcmodels	el			=	pc/pc(%m)+pc/gr
-  *		el			=	pc/pc(pc105)+pc/gr
-  $pcmodels	ge_la			=	pc/pc(%m)+pc/ge
-  *		ge_la			=	pc/pc(pc105)+pc/ge
-  $pcmodels	ge_ru			=	pc/pc(%m)+pc/ge(ru)
-  *		ge_ru			=	pc/pc(pc105)+pc/ge(ru)
-  $pcmodels	guj			=	pc/pc(%m)+pc/in(guj)
-  *		guj			=	pc/pc(pc105)+pc/in(guj)
-  $pcmodels	gur			=	pc/pc(%m)+pc/in(guru)
-  *		gur			=	pc/pc(pc105)+pc/in(guru)
-  $pcmodels	iu			=	pc/pc(%m)+pc/ca(ike)
-  *		iu			=	pc/pc(pc105)+pc/ca(ike)
-  $pcmodels	lo			=	pc/pc(%m)+pc/la
-  *		lo			=	pc/pc(pc105)+pc/la
-  $pcmodels	kan			=	pc/pc(%m)+pc/in(kan)
-  *		kan			=	pc/pc(pc105)+pc/in(kan)
-  $pcmodels	mi			=	pc/pc(%m)+pc/mao
-  *		mi			=	pc/pc(pc105)+pc/mao
-  $pcmodels	mk			=	pc/pc(%m)+pc/mkd
-  *		mk			=	pc/pc(pc105)+pc/mkd
-  $pcmodels	ml			=	pc/pc(%m)+pc/in(mal)
-  *		ml			=	pc/pc(pc105)+pc/in(mal)
-  $pcmodels	ogham			=	pc/pc(%m)+pc/ie(ogam)
-  *		ogham			=	pc/pc(pc105)+pc/ie(ogam)
-  $pcmodels	ori			=	pc/pc(%m)+pc/ie(ori)
-  *		ori			=	pc/pc(pc105)+pc/ie(ori)
-  $pcmodels	sapmi			=	pc/pc(%m)+pc/no(smi)
-  *		sapmi			=	pc/pc(pc105)+pc/no(smi)
-  $pcmodels	sr			=	pc/pc(%m)+pc/srp
-  *		sr			=	pc/pc(pc105)+pc/srp
-  $pcmodels	syr			=	pc/pc(%m)+pc/sy(syc)
-  *		syr			=	pc/pc(pc105)+pc/sy(syc)
-  $pcmodels	tel			=	pc/pc(%m)+pc/in(tel)
-  *		tel			=	pc/pc(pc105)+pc/in(tel)
-  $pcmodels	tml			=	pc/pc(%m)+pc/in(tam)
-  *		tml			=	pc/pc(pc105)+pc/in(tam)
-  $pcmodels	yu			=	pc/pc(%m)+pc/srp
-  *		yu			=	pc/pc(pc105)+pc/srp
-  $pcmodels	ben(basic)		=	pc/pc(%m)+pc/in(ben)
-  *		ben(basic)		=	pc/pc(pc105)+pc/in(ben)
-  $pcmodels	ben(probhat)		=	pc/pc(%m)+pc/in(ben_probhat)
-  *		ben(probhat)		=	pc/pc(pc105)+pc/in(ben_probhat)
-  $pcmodels	dev(basic)		=	pc/pc(%m)+pc/in(deva)
-  *		dev(basic)		=	pc/pc(pc105)+pc/in(deva)
-  $pcmodels	dvorak(gb)		=	pc/pc(%m)+pc/gb(dvorak)
-  *		dvorak(gb)		=	pc/pc(pc105)+pc/gb(dvorak)
-  $pcmodels	dvorak(fr)		=	pc/pc(%m)+pc/fr(dvorak)
-  *		dvorak(fr)		=	pc/pc(pc105)+pc/fr(dvorak)
-  $pcmodels	dvorak(no)		=	pc/pc(%m)+pc/no(dvorak)
-  *		dvorak(no)		=	pc/pc(pc105)+pc/no(dvorak)
-  $pcmodels	dvorak(se)		=	pc/pc(%m)+pc/se(dvorak)
-  *		dvorak(se)		=	pc/pc(pc105)+pc/se(dvorak)
-  $pcmodels	dvorak(basic)		=	pc/pc(%m)+pc/us(dvorak)
-  *		dvorak(basic)		=	pc/pc(pc105)+pc/us(dvorak)
-  $pcmodels	dvorak(pl_basic)	=	pc/pc(%m)+pc/pl(dvorak)
-  *		dvorak(pl_basic)	=	pc/pc(pc105)+pc/pl(dvorak)
-  $pcmodels	dvorak(pl)		=	pc/pc(%m)+pc/pl(dvorak_quotes)
-  *		dvorak(pl)		=	pc/pc(pc105)+pc/pl(dvorak_quotes)
-  $pcmodels	dvorak(pl_altquotes)	=	pc/pc(%m)+pc/pl(dvorak_altquotes)
-  *		dvorak(pl_altquotes)	=	pc/pc(pc105)+pc/pl(dvorak_altquotes)
-  $pcmodels	dz(basic)		=	pc/pc(%m)+pc/bt(basic)
-  *		dz(basic)		=	pc/pc(pc105)+pc/bt(basic)
-  $pcmodels	guj(basic)		=	pc/pc(%m)+pc/in(guj)
-  *		guj(basic)		=	pc/pc(pc105)+pc/in(guj)
-  $pcmodels	gur(basic)		=	pc/pc(%m)+pc/in(guru)
-  *		gur(basic)		=	pc/pc(pc105)+pc/in(guru)
-  $pcmodels	ie(laptop)		=	pc/pc(%m)+pc/ie(basic)
-  *		ie(laptop)		=	pc/pc(pc105)+pc/ie(basic)
-  $pcmodels	ie(CloGaelachLaptop)	=	pc/pc(%m)+pc/ie(CloGaelach)
-  *		ie(CloGaelachLaptop)	=	pc/pc(pc105)+pc/ie(CloGaelach)
-  $pcmodels	iu(basic)		=	pc/pc(%m)+pc/ca(ike)
-  *		iu(basic)		=	pc/pc(pc105)+pc/ca(ike)
-  $pcmodels	lo(basic)		=	pc/pc(%m)+pc/la(basic)
-  *		lo(basic)		=	pc/pc(pc105)+pc/la(basic)
-  $pcmodels	kan(basic)		=	pc/pc(%m)+pc/in(kan)
-  *		kan(basic)		=	pc/pc(pc105)+pc/in(kan)
-  $pcmodels	mal(basic)		=	pc/pc(%m)+pc/in(mal)
-  *		mal(basic)		=	pc/pc(pc105)+pc/in(mal)
-  $pcmodels	mal(mlplusnum)		=	pc/pc(%m)+pc/in(mal)
-  *		mal(mlplusnum)		=	pc/pc(pc105)+pc/in(mal)
-  $pcmodels	ogham(basic)		=	pc/pc(%m)+pc/ie(ogam)
-  *		ogham(basic)		=	pc/pc(pc105)+pc/ie(ogam)
-  $pcmodels	ogham(laptop)		=	pc/pc(%m)+pc/ie(ogam)
-  *		ogham(laptop)		=	pc/pc(pc105)+pc/ie(ogam)
-  $pcmodels	ogham(is434)		=	pc/pc(%m)+pc/ie(ogam_is434)
-  *		ogham(is434)		=	pc/pc(pc105)+pc/ie(ogam_is434)
-  $pcmodels	ogham(is434laptop)	=	pc/pc(%m)+pc/ie(ogam_is434)
-  *		ogham(is434laptop)	=	pc/pc(pc105)+pc/ie(ogam_is434)
-  $pcmodels	ori(basic)		=	pc/pc(%m)+pc/in(ori)
-  *		ori(basic)		=	pc/pc(pc105)+pc/in(ori)
-  $pcmodels	sapmi(basic)		=	pc/pc(%m)+pc/no(smi)
-  *		sapmi(basic)		=	pc/pc(pc105)+pc/no(smi)
-  $pcmodels	sapmi(nodeadkeys)	=	pc/pc(%m)+pc/no(smi_nodeadkeys)
-  *		sapmi(nodeadkeys)	=	pc/pc(pc105)+pc/no(smi_nodeadkeys)
-  $pcmodels	sapmi(sefi)		=	pc/pc(%m)+pc/fi(smi)
-  *		sapmi(sefi)		=	pc/pc(pc105)+pc/fi(smi)
-  $pcmodels	sin(phonetic-static)	=	pc/pc(%m)+pc/in(sin_phonetic)
-  *		sin(phonetic-static)	=	pc/pc(pc105)+pc/in(sin_phonetic)
-  $pcmodels	syr(basic)		=	pc/pc(%m)+pc/sy(syc)
-  *		syr(basic)		=	pc/pc(pc105)+pc/sy(syc)
-  $pcmodels	syr(phonetic)		=	pc/pc(%m)+pc/sy(syc_phonetic)
-  *		syr(phonetic)		=	pc/pc(pc105)+pc/sy(syc_phonetic)
-  $pcmodels	tam(INSCRIPT)		=	pc/pc(%m)+pc/in(tam)
-  *		tam(INSCRIPT)		=	pc/pc(pc105)+pc/in(tam)
-  $pcmodels	tam(UNI)		=	pc/pc(%m)+pc/in(tam_unicode)
-  *		tam(UNI)		=	pc/pc(pc105)+pc/in(tam_unicode)
-  $pcmodels	tam(TAB)		=	pc/pc(%m)+pc/in(tam_TAB)
-  *		tam(TAB)		=	pc/pc(pc105)+pc/in(tam_TAB)
-  $pcmodels	tam(TSCII)		=	pc/pc(%m)+pc/in(tam_TSCII)
-  *		tam(TSCII)		=	pc/pc(pc105)+pc/in(tam_TSCII)
-  $pcmodels	tel(basic)		=	pc/pc(%m)+pc/in(tel)
-  *		tel(basic)		=	pc/pc(pc105)+pc/in(tel)
-  $pcmodels	yu(basic)		=	pc/pc(%m)+pc/srp(latin)
-  *		yu(basic)		=	pc/pc(pc105)+pc/srp(latin)
-  $pcmodels	yu(unicode)		=	pc/pc(%m)+pc/srp(latinunicode)
-  *		yu(unicode)		=	pc/pc(pc105)+pc/srp(latinunicode)
-  $pcmodels	yu(yz)			=	pc/pc(%m)+pc/srp(latinyz)
-  *		yu(yz)			=	pc/pc(pc105)+pc/srp(latinyz)
-  $pcmodels	yu(unicodeyz)		=	pc/pc(%m)+pc/srp(latinunicodeyz)
-  *		yu(unicodeyz)		=	pc/pc(pc105)+pc/srp(latinunicodeyz)
-  pc98		nec/jp			=	nec/jp(pc98)
-  abnt2		br			=	pc/pc(pc104)+pc/br
- $maclaptop	us			=	macintosh/us(extended)+apple(laptop_bad_switch)
- $maclaptop	en_US			=	macintosh/us(extended)+apple(laptop_bad_switch)
- $maclaptop	*			=	macintosh/us(extended)+apple(laptop_bad_switch)+macintosh/%l%(v)
- $mac		us			=	macintosh/us(extended)
- $mac		en_US			=	macintosh/us(extended)
- $mac		*			=	macintosh/us(extended)+macintosh/%l%(v)
- $pcmodels      intl   			=       us(%mcompose)
-  *		intl			=	us(pc104compose)
-  *		jp			=	pc/pc(pc102)+pc/jp(latin)+pc/jp:2
- $pcmodels      ca     			=       pc/pc(%m)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
-  *             ca     			=       pc/pc(pc105)+pc/ca(multi)+pc/ca(multi-2gr):2+group(rctrl_switch)
- $pcmodels $nonlatin			=	pc/pc(%m)+pc/us+pc/%l%(v):2
- $pcmodels	*			=	pc/pc(%m)+pc/%l%(v)
-  *	   $nonlatin			=	pc/pc(pc105)+pc/us+pc/%l%(v):2
-  *		*			=	pc/pc(pc105)+pc/%l%(v)
-
-! model		layout[1]			=	symbols
-  $pcmodels	ar			=	pc/pc(%m)+pc/ara%(v[1])
-  *		ar			=	pc/pc(pc105)+pc/ara%(v[1])
-  $pcmodels	ben			=	pc/pc(%m)+pc/in(ben)%(v[1])
-  *		ben			=	pc/pc(pc105)+pc/in(ben)%(v[1])
-  $pcmodels	bs			=	pc/pc(%m)+pc/ba%(v[1])
-  *		bs			=	pc/pc(pc105)+pc/ba%(v[1])
-  $pcmodels	dev			=	pc/pc(%m)+pc/in(deva)%(v[1])
-  *		dev			=	pc/pc(pc105)+pc/in(deva)%(v[1])
-  $pcmodels	dvorak			=	pc/pc(%m)+pc/us(dvorak)%(v[1])
-  *		dvorak			=	pc/pc(pc105)+pc/us(dvorak)%(v[1])
-  $pcmodels	dz			=	pc/pc(%m)+pc/bt%(v[1])
-  *		dz			=	pc/pc(pc105)+pc/bt%(v[1])
-  $pcmodels	el			=	pc/pc(%m)+pc/gr%(v[1])
-  *		el			=	pc/pc(pc105)+pc/gr%(v[1])
-  $pcmodels	ge_la			=	pc/pc(%m)+pc/ge%(v[1])
-  *		ge_la			=	pc/pc(pc105)+pc/ge%(v[1])
-  $pcmodels	ge_ru			=	pc/pc(%m)+pc/ge(ru)%(v[1])
-  *		ge_ru			=	pc/pc(pc105)+pc/ge(ru)%(v[1])
-  $pcmodels	guj			=	pc/pc(%m)+pc/in(guj)%(v[1])
-  *		guj			=	pc/pc(pc105)+pc/in(guj)%(v[1])
-  $pcmodels	gur			=	pc/pc(%m)+pc/in(guru)%(v[1])
-  *		gur			=	pc/pc(pc105)+pc/in(guru)%(v[1])
-  $pcmodels	iu			=	pc/pc(%m)+pc/ca(ike)%(v[1])
-  *		iu			=	pc/pc(pc105)+pc/ca(ike)%(v[1])
-  $pcmodels	lo			=	pc/pc(%m)+pc/la%(v[1])
-  *		lo			=	pc/pc(pc105)+pc/la%(v[1])
-  $pcmodels	kan			=	pc/pc(%m)+pc/in(kan)%(v[1])
-  *		kan			=	pc/pc(pc105)+pc/in(kan)%(v[1])
-  $pcmodels	mi			=	pc/pc(%m)+pc/mao%(v[1])
-  *		mi			=	pc/pc(pc105)+pc/mao%(v[1])
-  $pcmodels	mk			=	pc/pc(%m)+pc/mkd%(v[1])
-  *		mk			=	pc/pc(pc105)+pc/mkd%(v[1])
-  $pcmodels	ml			=	pc/pc(%m)+pc/in(mal)%(v[1])
-  *		ml			=	pc/pc(pc105)+pc/in(mal)%(v[1])
-  $pcmodels	ogham			=	pc/pc(%m)+pc/ie(ogam)%(v[1])
-  *		ogham			=	pc/pc(pc105)+pc/ie(ogam)%(v[1])
-  $pcmodels	ori			=	pc/pc(%m)+pc/ie(ori)%(v[1])
-  *		ori			=	pc/pc(pc105)+pc/ie(ori)%(v[1])
-  $pcmodels	sapmi			=	pc/pc(%m)+pc/no(smi)%(v[1])
-  *		sapmi			=	pc/pc(pc105)+pc/no(smi)%(v[1])
-  $pcmodels	sr			=	pc/pc(%m)+pc/srp%(v[1])
-  *		sr			=	pc/pc(pc105)+pc/srp%(v[1])
-  $pcmodels	syr			=	pc/pc(%m)+pc/sy(syc)%(v[1])
-  *		syr			=	pc/pc(pc105)+pc/sy(syc)%(v[1])
-  $pcmodels	tel			=	pc/pc(%m)+pc/in(tel)%(v[1])
-  *		tel			=	pc/pc(pc105)+pc/in(tel)%(v[1])
-  $pcmodels	tml			=	pc/pc(%m)+pc/in(tam)%(v[1])
-  *		tml			=	pc/pc(pc105)+pc/in(tam)%(v[1])
-  $pcmodels	yu			=	pc/pc(%m)+pc/srp%(v[1])
-  *		yu			=	pc/pc(pc105)+pc/srp%(v[1])
-  $pcmodels	ben(basic)		=	pc/pc(%m)+pc/in(ben)
-  *		ben(basic)		=	pc/pc(pc105)+pc/in(ben)
-  $pcmodels	ben(probhat)		=	pc/pc(%m)+pc/in(ben_probhat)
-  *		ben(probhat)		=	pc/pc(pc105)+pc/in(ben_probhat)
-  $pcmodels	dev(basic)		=	pc/pc(%m)+pc/in(deva)
-  *		dev(basic)		=	pc/pc(pc105)+pc/in(deva)
-  $pcmodels	dvorak(gb)		=	pc/pc(%m)+pc/gb(dvorak)
-  *		dvorak(gb)		=	pc/pc(pc105)+pc/gb(dvorak)
-  $pcmodels	dvorak(fr)		=	pc/pc(%m)+pc/fr(dvorak)
-  *		dvorak(fr)		=	pc/pc(pc105)+pc/fr(dvorak)
-  $pcmodels	dvorak(no)		=	pc/pc(%m)+pc/no(dvorak)
-  *		dvorak(no)		=	pc/pc(pc105)+pc/no(dvorak)
-  $pcmodels	dvorak(se)		=	pc/pc(%m)+pc/se(dvorak)
-  *		dvorak(se)		=	pc/pc(pc105)+pc/se(dvorak)
-  $pcmodels	dvorak(basic)		=	pc/pc(%m)+pc/us(dvorak)
-  *		dvorak(basic)		=	pc/pc(pc105)+pc/us(dvorak)
-  $pcmodels	dvorak(pl_basic)	=	pc/pc(%m)+pc/pl(dvorak)
-  *		dvorak(pl_basic)	=	pc/pc(pc105)+pc/pl(dvorak)
-  $pcmodels	dvorak(pl)		=	pc/pc(%m)+pc/pl(dvorak_quotes)
-  *		dvorak(pl)		=	pc/pc(pc105)+pc/pl(dvorak_quotes)
-  $pcmodels	dvorak(pl_altquotes)	=	pc/pc(%m)+pc/pl(dvorak_altquotes)
-  *		dvorak(pl_altquotes)	=	pc/pc(pc105)+pc/pl(dvorak_altquotes)
-  $pcmodels	dz(basic)		=	pc/pc(%m)+pc/bt(basic)
-  *		dz(basic)		=	pc/pc(pc105)+pc/bt(basic)
-  $pcmodels	guj(basic)		=	pc/pc(%m)+pc/in(guj)
-  *		guj(basic)		=	pc/pc(pc105)+pc/in(guj)
-  $pcmodels	gur(basic)		=	pc/pc(%m)+pc/in(guru)
-  *		gur(basic)		=	pc/pc(pc105)+pc/in(guru)
-  $pcmodels	ie(laptop)		=	pc/pc(%m)+pc/ie(basic)
-  *		ie(laptop)		=	pc/pc(pc105)+pc/ie(basic)
-  $pcmodels	ie(CloGaelachLaptop)	=	pc/pc(%m)+pc/ie(CloGaelach)
-  *		ie(CloGaelachLaptop)	=	pc/pc(pc105)+pc/ie(CloGaelach)
-  $pcmodels	iu(basic)		=	pc/pc(%m)+pc/ca(ike)
-  *		iu(basic)		=	pc/pc(pc105)+pc/ca(ike)
-  $pcmodels	lo(basic)		=	pc/pc(%m)+pc/la(basic)
-  *		lo(basic)		=	pc/pc(pc105)+pc/la(basic)
-  $pcmodels	kan(basic)		=	pc/pc(%m)+pc/in(kan)
-  *		kan(basic)		=	pc/pc(pc105)+pc/in(kan)
-  $pcmodels	mal(basic)		=	pc/pc(%m)+pc/in(mal)
-  *		mal(basic)		=	pc/pc(pc105)+pc/in(mal)
-  $pcmodels	mal(mlplusnum)		=	pc/pc(%m)+pc/in(mal)
-  *		mal(mlplusnum)		=	pc/pc(pc105)+pc/in(mal)
-  $pcmodels	ogham(basic)		=	pc/pc(%m)+pc/ie(ogam)
-  *		ogham(basic)		=	pc/pc(pc105)+pc/ie(ogam)
-  $pcmodels	ogham(laptop)		=	pc/pc(%m)+pc/ie(ogam)
-  *		ogham(laptop)		=	pc/pc(pc105)+pc/ie(ogam)
-  $pcmodels	ogham(is434)		=	pc/pc(%m)+pc/ie(ogam_is434)
-  *		ogham(is434)		=	pc/pc(pc105)+pc/ie(ogam_is434)
-  $pcmodels	ogham(is434laptop)	=	pc/pc(%m)+pc/ie(ogam_is434)
-  *		ogham(is434laptop)	=	pc/pc(pc105)+pc/ie(ogam_is434)
-  $pcmodels	ori(basic)		=	pc/pc(%m)+pc/in(ori)
-  *		ori(basic)		=	pc/pc(pc105)+pc/in(ori)
-  $pcmodels	sapmi(basic)		=	pc/pc(%m)+pc/no(smi)
-  *		sapmi(basic)		=	pc/pc(pc105)+pc/no(smi)
-  $pcmodels	sapmi(nodeadkeys)	=	pc/pc(%m)+pc/no(smi_nodeadkeys)
-  *		sapmi(nodeadkeys)	=	pc/pc(pc105)+pc/no(smi_nodeadkeys)
-  $pcmodels	sapmi(sefi)		=	pc/pc(%m)+pc/fi(smi)
-  *		sapmi(sefi)		=	pc/pc(pc105)+pc/fi(smi)
-  $pcmodels	sin(phonetic-static)	=	pc/pc(%m)+pc/in(sin_phonetic)
-  *		sin(phonetic-static)	=	pc/pc(pc105)+pc/in(sin_phonetic)
-  $pcmodels	syr(basic)		=	pc/pc(%m)+pc/sy(syc)
-  *		syr(basic)		=	pc/pc(pc105)+pc/sy(syc)
-  $pcmodels	syr(phonetic)		=	pc/pc(%m)+pc/sy(syc_phonetic)
-  *		syr(phonetic)		=	pc/pc(pc105)+pc/sy(syc_phonetic)
-  $pcmodels	tam(INSCRIPT)		=	pc/pc(%m)+pc/in(tam)
-  *		tam(INSCRIPT)		=	pc/pc(pc105)+pc/in(tam)
-  $pcmodels	tam(UNI)		=	pc/pc(%m)+pc/in(tam_unicode)
-  *		tam(UNI)		=	pc/pc(pc105)+pc/in(tam_unicode)
-  $pcmodels	tam(TAB)		=	pc/pc(%m)+pc/in(tam_TAB)
-  *		tam(TAB)		=	pc/pc(pc105)+pc/in(tam_TAB)
-  $pcmodels	tam(TSCII)		=	pc/pc(%m)+pc/in(tam_TSCII)
-  *		tam(TSCII)		=	pc/pc(pc105)+pc/in(tam_TSCII)
-  $pcmodels	tel(basic)		=	pc/pc(%m)+pc/in(tel)
-  *		tel(basic)		=	pc/pc(pc105)+pc/in(tel)
-  $pcmodels	yu(basic)		=	pc/pc(%m)+pc/srp(latin)
-  *		yu(basic)		=	pc/pc(pc105)+pc/srp(latin)
-  $pcmodels	yu(unicode)		=	pc/pc(%m)+pc/srp(latinunicode)
-  *		yu(unicode)		=	pc/pc(pc105)+pc/srp(latinunicode)
-  $pcmodels	yu(yz)			=	pc/pc(%m)+pc/srp(latinyz)
-  *		yu(yz)			=	pc/pc(pc105)+pc/srp(latinyz)
-  $pcmodels	yu(unicodeyz)		=	pc/pc(%m)+pc/srp(latinunicodeyz)
-  *		yu(unicodeyz)		=	pc/pc(pc105)+pc/srp(latinunicodeyz)
- $pcmodels	*			=	pc/pc(%m)+pc/%l[1]%(v[1])
-  *		*			=	pc/pc(pc105)+pc/%l[1]%(v[1])
-
-! model		layout[1]	variant[1]	=	symbols
-  $pcmodels	ben		basic		=	pc/pc(%m)+pc/in(ben)
-  *		ben		basic		=	pc/pc(pc105)+pc/in(ben)
-  $pcmodels	ben		probhat		=	pc/pc(%m)+pc/in(ben_probhat)
-  *		ben		probhat		=	pc/pc(pc105)+pc/in(ben_probhat)
-  $pcmodels	dev		basic		=	pc/pc(%m)+pc/in(deva)
-  *		dev		basic		=	pc/pc(pc105)+pc/in(deva)
-  $pcmodels	dvorak		gb		=	pc/pc(%m)+pc/gb(dvorak)
-  *		dvorak		gb		=	pc/pc(pc105)+pc/gb(dvorak)
-  $pcmodels	dvorak		fr		=	pc/pc(%m)+pc/fr(dvorak)
-  *		dvorak		fr		=	pc/pc(pc105)+pc/fr(dvorak)
-  $pcmodels	dvorak		no		=	pc/pc(%m)+pc/no(dvorak)
-  *		dvorak		no		=	pc/pc(pc105)+pc/no(dvorak)
-  $pcmodels	dvorak		se		=	pc/pc(%m)+pc/se(dvorak)
-  *		dvorak		se		=	pc/pc(pc105)+pc/se(dvorak)
-  $pcmodels	dvorak		basic		=	pc/pc(%m)+pc/us(dvorak)
-  *		dvorak		basic		=	pc/pc(pc105)+pc/us(dvorak)
-  $pcmodels	dvorak		pl_basic	=	pc/pc(%m)+pc/pl(dvorak)
-  *		dvorak		pl_basic	=	pc/pc(pc105)+pc/pl(dvorak)
-  $pcmodels	dvorak		pl		=	pc/pc(%m)+pc/pl(dvorak_quotes)
-  *		dvorak		pl		=	pc/pc(pc105)+pc/pl(dvorak_quotes)
-  $pcmodels	dvorak		pl_altquotes	=	pc/pc(%m)+pc/pl(dvorak_altquotes)
-  *		dvorak		pl_altquotes	=	pc/pc(pc105)+pc/pl(dvorak_altquotes)
-  $pcmodels	dz		basic		=	pc/pc(%m)+pc/bt(basic)
-  *		dz		basic		=	pc/pc(pc105)+pc/bt(basic)
-  $pcmodels	guj		basic		=	pc/pc(%m)+pc/in(guj)
-  *		guj		basic		=	pc/pc(pc105)+pc/in(guj)
-  $pcmodels	gur		basic		=	pc/pc(%m)+pc/in(guru)
-  *		gur		basic		=	pc/pc(pc105)+pc/in(guru)
-  $pcmodels	ie		laptop		=	pc/pc(%m)+pc/ie(basic)
-  *		ie		laptop		=	pc/pc(pc105)+pc/ie(basic)
-  $pcmodels	ie		CloGaelachLaptop		=	pc/pc(%m)+pc/ie(CloGaelach)
-  *		ie		CloGaelachLaptop		=	pc/pc(pc105)+pc/ie(CloGaelach)
-  $pcmodels	iu		basic		=	pc/pc(%m)+pc/ca(ike)
-  *		iu		basic		=	pc/pc(pc105)+pc/ca(ike)
-  $pcmodels	lo		basic		=	pc/pc(%m)+pc/la(basic)
-  *		lo		basic		=	pc/pc(pc105)+pc/la(basic)
-  $pcmodels	kan		basic		=	pc/pc(%m)+pc/in(kan)
-  *		kan		basic		=	pc/pc(pc105)+pc/in(kan)
-  $pcmodels	mal		basic		=	pc/pc(%m)+pc/in(mal)
-  *		mal		basic		=	pc/pc(pc105)+pc/in(mal)
-  $pcmodels	mal		mlplusnum	=	pc/pc(%m)+pc/in(mal)
-  *		mal		mlplusnum	=	pc/pc(pc105)+pc/in(mal)
-  $pcmodels	ogham		basic		=	pc/pc(%m)+pc/ie(ogam)
-  *		ogham		basic		=	pc/pc(pc105)+pc/ie(ogam)
-  $pcmodels	ogham		laptop		=	pc/pc(%m)+pc/ie(ogam)
-  *		ogham		laptop		=	pc/pc(pc105)+pc/ie(ogam)
-  $pcmodels	ogham		is434		=	pc/pc(%m)+pc/ie(ogam_is434)
-  *		ogham		is434		=	pc/pc(pc105)+pc/ie(ogam_is434)
-  $pcmodels	ogham		is434laptop	=	pc/pc(%m)+pc/ie(ogam_is434)
-  *		ogham		is434laptop	=	pc/pc(pc105)+pc/ie(ogam_is434)
-  $pcmodels	ori		basic		=	pc/pc(%m)+pc/in(ori)
-  *		ori		basic		=	pc/pc(pc105)+pc/in(ori)
-  $pcmodels	sapmi		basic		=	pc/pc(%m)+pc/no(smi)
-  *		sapmi		basic		=	pc/pc(pc105)+pc/no(smi)
-  $pcmodels	sapmi		nodeadkeys	=	pc/pc(%m)+pc/no(smi_nodeadkeys)
-  *		sapmi		nodeadkeys	=	pc/pc(pc105)+pc/no(smi_nodeadkeys)
-  $pcmodels	sapmi		sefi		=	pc/pc(%m)+pc/fi(smi)
-  *		sapmi		sefi		=	pc/pc(pc105)+pc/fi(smi)
-  $pcmodels	sin		phonetic-static	=	pc/pc(%m)+pc/in(sin_phonetic)
-  *		sin		phonetic-static	=	pc/pc(pc105)+pc/in(sin_phonetic)
-  $pcmodels	syr		basic		=	pc/pc(%m)+pc/sy(syc)
-  *		syr		basic		=	pc/pc(pc105)+pc/sy(syc)
-  $pcmodels	syr		phonetic	=	pc/pc(%m)+pc/sy(syc_phonetic)
-  *		syr		phonetic	=	pc/pc(pc105)+pc/sy(syc_phonetic)
-  $pcmodels	tam		INSCRIPT	=	pc/pc(%m)+pc/in(tam)
-  *		tam		INSCRIPT	=	pc/pc(pc105)+pc/in(tam)
-  $pcmodels	tam		UNI		=	pc/pc(%m)+pc/in(tam_unicode)
-  *		tam		UNI		=	pc/pc(pc105)+pc/in(tam_unicode)
-  $pcmodels	tam		TAB		=	pc/pc(%m)+pc/in(tam_TAB)
-  *		tam		TAB		=	pc/pc(pc105)+pc/in(tam_TAB)
-  $pcmodels	tam		TSCII		=	pc/pc(%m)+pc/in(tam_TSCII)
-  *		tam		TSCII		=	pc/pc(pc105)+pc/in(tam_TSCII)
-  $pcmodels	tel		basic		=	pc/pc(%m)+pc/in(tel)
-  *		tel		basic		=	pc/pc(pc105)+pc/in(tel)
-  $pcmodels	yu		basic		=	pc/pc(%m)+pc/srp(latin)
-  *		yu		basic		=	pc/pc(pc105)+pc/srp(latin)
-  $pcmodels	yu		unicode		=	pc/pc(%m)+pc/srp(latinunicode)
-  *		yu		unicode		=	pc/pc(pc105)+pc/srp(latinunicode)
-  $pcmodels	yu		yz		=	pc/pc(%m)+pc/srp(latinyz)
-  *		yu		yz		=	pc/pc(pc105)+pc/srp(latinyz)
-  $pcmodels	yu		unicodeyz	=	pc/pc(%m)+pc/srp(latinunicodeyz)
-  *		yu		unicodeyz	=	pc/pc(pc105)+pc/srp(latinunicodeyz)
-
-! layout[2]		=	symbols
-  ar			=	+pc/ara%(v[2]):2
-  ben			=	+pc/in(ben):2
-  bs			=	+pc/ba%(v[2]):2
-  dev			=	+pc/in(deva):2
-  dvorak		=	+pc/us(dvorak):2
-  dz			=	+pc/bt%(v[2]):2
-  el			=	+pc/gr%(v[2]):2
-  ge_la			=	+pc/ge%(v[2]):2
-  ge_ru			=	+pc/ge(ru):2
-  guj			=	+pc/in(guj):2
-  gur			=	+pc/in(guru):2
-  iu			=	+pc/ca(ike):2
-  lo			=	+pc/la%(v[2]):2
-  kan			=	+pc/in(kan):2
-  mi			=	+pc/mao%(v[2]):2
-  mk			=	+pc/mkd%(v[2]):2
-  ml			=	+pc/in(mal):2
-  ogham			=	+pc/ie(ogam):2
-  ori			=	+pc/ie(ori):2
-  sapmi			=	+pc/no(smi):2
-  sr			=	+pc/srp%(v[2]):2
-  syr			=	+pc/sy(syc):2
-  tel			=	+pc/in(tel):2
-  tml			=	+pc/in(tam):2
-  yu			=	+pc/srp%(v[2]):2
-  ben(basic)		=	+pc/in(ben):2
-  ben(probhat)		=	+pc/in(ben_probhat):2
-  dev(basic)		=	+pc/in(deva):2
-  dvorak(gb)		=	+pc/gb(dvorak):2
-  dvorak(fr)		=	+pc/fr(dvorak):2
-  dvorak(no)		=	+pc/no(dvorak):2
-  dvorak(se)		=	+pc/se(dvorak):2
-  dvorak(basic)		=	+pc/us(dvorak):2
-  dvorak(pl_basic)	=	+pc/pl(dvorak):2
-  dvorak(pl)		=	+pc/pl(dvorak_quotes):2
-  dvorak(pl_altquotes)	=	+pc/pl(dvorak_altquotes):2
-  dz(basic)		=	+pc/bt(basic):2
-  guj(basic)		=	+pc/in(guj):2
-  gur(basic)		=	+pc/in(guru):2
-  ie(laptop)		=	+pc/ie(basic):2
-  ie(CloGaelachLaptop)	=	+pc/ie(CloGaelach):2
-  iu(basic)		=	+pc/ca(ike):2
-  lo(basic)		=	+pc/la(basic):2
-  kan(basic)		=	+pc/in(kan):2
-  mal(basic)		=	+pc/in(mal):2
-  mal(mlplusnum)	=	+pc/in(mal):2
-  ogham(basic)		=	+pc/ie(ogam):2
-  ogham(laptop)		=	+pc/ie(ogam):2
-  ogham(is434)		=	+pc/ie(ogam_is434):2
-  ogham(is434laptop)	=	+pc/ie(ogam_is434):2
-  ori(basic)		=	+pc/in(ori):2
-  sapmi(basic)		=	+pc/no(smi):2
-  sapmi(nodeadkeys)	=	+pc/no(smi_nodeadkeys):2
-  sapmi(sefi)		=	+pc/fi(smi):2
-  sin(phonetic-static)	=	+pc/in(sin_phonetic):2
-  syr(basic)		=	+pc/sy(syc):2
-  syr(phonetic)		=	+pc/sy(syc_phonetic):2
-  tam(INSCRIPT)		=	+pc/in(tam):2
-  tam(UNI)		=	+pc/in(tam_unicode):2
-  tam(TAB)		=	+pc/in(tam_TAB):2
-  tam(TSCII)		=	+pc/in(tam_TSCII):2
-  tel(basic)		=	+pc/in(tel):2
-  yu(basic)		=	+pc/srp(latin):2
-  yu(unicode)		=	+pc/srp(latinunicode):2
-  yu(yz)		=	+pc/srp(latinyz):2
-  yu(unicodeyz)		=	+pc/srp(latinunicodeyz):2
-  *			=	+pc/%l[2]%(v[2]):2
-
-! layout[3]		=	symbols
-  ar			=	+pc/ara%(v[3]):3
-  ben			=	+pc/in(ben)%(v[3]):3
-  bs			=	+pc/ba%(v[3]):3
-  dev			=	+pc/in(deva)%(v[3]):3
-  dvorak		=	+pc/us(dvorak)%(v[3]):3
-  dz			=	+pc/bt%(v[3]):3
-  el			=	+pc/gr%(v[3]):3
-  ge_la			=	+pc/ge%(v[3]):3
-  ge_ru			=	+pc/ge(ru)%(v[3]):3
-  guj			=	+pc/in(guj)%(v[3]):3
-  gur			=	+pc/in(guru)%(v[3]):3
-  iu			=	+pc/ca(ike)%(v[3]):3
-  lo			=	+pc/la%(v[3]):3
-  kan			=	+pc/in(kan)%(v[3]):3
-  mi			=	+pc/mao%(v[3]):3
-  mk			=	+pc/mkd%(v[3]):3
-  ml			=	+pc/in(mal)%(v[3]):3
-  ogham			=	+pc/ie(ogam)%(v[3]):3
-  ori			=	+pc/ie(ori)%(v[3]):3
-  sapmi			=	+pc/no(smi)%(v[3]):3
-  sr			=	+pc/srp%(v[3]):3
-  syr			=	+pc/sy(syc)%(v[3]):3
-  tel			=	+pc/in(tel)%(v[3]):3
-  tml			=	+pc/in(tam)%(v[3]):3
-  yu			=	+pc/srp%(v[3]):3
-  ben(basic)		=	+pc/in(ben):3
-  ben(probhat)		=	+pc/in(ben_probhat):3
-  dev(basic)		=	+pc/in(deva):3
-  dvorak(gb)		=	+pc/gb(dvorak):3
-  dvorak(fr)		=	+pc/fr(dvorak):3
-  dvorak(no)		=	+pc/no(dvorak):3
-  dvorak(se)		=	+pc/se(dvorak):3
-  dvorak(basic)		=	+pc/us(dvorak):3
-  dvorak(pl_basic)	=	+pc/pl(dvorak):3
-  dvorak(pl)		=	+pc/pl(dvorak_quotes):3
-  dvorak(pl_altquotes)	=	+pc/pl(dvorak_altquotes):3
-  dz(basic)		=	+pc/bt(basic):3
-  guj(basic)		=	+pc/in(guj):3
-  gur(basic)		=	+pc/in(guru):3
-  ie(laptop)		=	+pc/ie(basic):3
-  ie(CloGaelachLaptop)	=	+pc/ie(CloGaelach):3
-  iu(basic)		=	+pc/ca(ike):3
-  lo(basic)		=	+pc/la(basic):3
-  kan(basic)		=	+pc/in(kan):3
-  mal(basic)		=	+pc/in(mal):3
-  mal(mlplusnum)	=	+pc/in(mal):3
-  ogham(basic)		=	+pc/ie(ogam):3
-  ogham(laptop)		=	+pc/ie(ogam):3
-  ogham(is434)		=	+pc/ie(ogam_is434):3
-  ogham(is434laptop)	=	+pc/ie(ogam_is434):3
-  ori(basic)		=	+pc/in(ori):3
-  sapmi(basic)		=	+pc/no(smi):3
-  sapmi(nodeadkeys)	=	+pc/no(smi_nodeadkeys):3
-  sapmi(sefi)		=	+pc/fi(smi):3
-  sin(phonetic-static)	=	+pc/in(sin_phonetic):3
-  syr(basic)		=	+pc/sy(syc):3
-  syr(phonetic)		=	+pc/sy(syc_phonetic):3
-  tam(INSCRIPT)		=	+pc/in(tam):3
-  tam(UNI)		=	+pc/in(tam_unicode):3
-  tam(TAB)		=	+pc/in(tam_TAB):3
-  tam(TSCII)		=	+pc/in(tam_TSCII):3
-  tel(basic)		=	+pc/in(tel):3
-  yu(basic)		=	+pc/srp(latin):3
-  yu(unicode)		=	+pc/srp(latinunicode):3
-  yu(yz)		=	+pc/srp(latinyz):3
-  yu(unicodeyz)		=	+pc/srp(latinunicodeyz):3
-  *			=	+pc/%l[3]%(v[3]):3
-
-! layout[4]		=	symbols
-  ar			=	+pc/ara%(v[4]):4
-  ben			=	+pc/in(ben)%(v[4]):4
-  bs			=	+pc/ba%(v[4]):4
-  dev			=	+pc/in(deva)%(v[4]):4
-  dvorak		=	+pc/us(dvorak)%(v[4]):4
-  dz			=	+pc/bt%(v[4]):4
-  el			=	+pc/gr%(v[4]):4
-  ge_la			=	+pc/ge%(v[4]):4
-  ge_ru			=	+pc/ge(ru)%(v[4]):4
-  guj			=	+pc/in(guj)%(v[4]):4
-  gur			=	+pc/in(guru)%(v[4]):4
-  iu			=	+pc/ca(ike)%(v[4]):4
-  lo			=	+pc/la%(v[4]):4
-  kan			=	+pc/in(kan)%(v[4]):4
-  mi			=	+pc/mao%(v[4]):4
-  mk			=	+pc/mkd%(v[4]):4
-  ml			=	+pc/in(mal)%(v[4]):4
-  ogham			=	+pc/ie(ogam)%(v[4]):4
-  ori			=	+pc/ie(ori)%(v[4]):4
-  sapmi			=	+pc/no(smi)%(v[4]):4
-  sr			=	+pc/srp%(v[4]):4
-  syr			=	+pc/sy(syc)%(v[4]):4
-  tel			=	+pc/in(tel)%(v[4]):4
-  tml			=	+pc/in(tam)%(v[4]):4
-  yu			=	+pc/srp%(v[4]):4
-  ben(basic)		=	+pc/in(ben):4
-  ben(probhat)		=	+pc/in(ben_probhat):4
-  dev(basic)		=	+pc/in(deva):4
-  dvorak(gb)		=	+pc/gb(dvorak):4
-  dvorak(fr)		=	+pc/fr(dvorak):4
-  dvorak(no)		=	+pc/no(dvorak):4
-  dvorak(se)		=	+pc/se(dvorak):4
-  dvorak(basic)		=	+pc/us(dvorak):4
-  dvorak(pl_basic)	=	+pc/pl(dvorak):4
-  dvorak(pl)		=	+pc/pl(dvorak_quotes):4
-  dvorak(pl_altquotes)	=	+pc/pl(dvorak_altquotes):4
-  dz(basic)		=	+pc/bt(basic):4
-  guj(basic)		=	+pc/in(guj):4
-  gur(basic)		=	+pc/in(guru):4
-  ie(laptop)		=	+pc/ie(basic):4
-  ie(CloGaelachLaptop)	=	+pc/ie(CloGaelach):4
-  iu(basic)		=	+pc/ca(ike):4
-  lo(basic)		=	+pc/la(basic):4
-  kan(basic)		=	+pc/in(kan):4
-  mal(basic)		=	+pc/in(mal):4
-  mal(mlplusnum)	=	+pc/in(mal):4
-  ogham(basic)		=	+pc/ie(ogam):4
-  ogham(laptop)		=	+pc/ie(ogam):4
-  ogham(is434)		=	+pc/ie(ogam_is434):4
-  ogham(is434laptop)	=	+pc/ie(ogam_is434):4
-  ori(basic)		=	+pc/in(ori):4
-  sapmi(basic)		=	+pc/no(smi):4
-  sapmi(nodeadkeys)	=	+pc/no(smi_nodeadkeys):4
-  sapmi(sefi)		=	+pc/fi(smi):4
-  sin(phonetic-static)	=	+pc/in(sin_phonetic):4
-  syr(basic)		=	+pc/sy(syc):4
-  syr(phonetic)		=	+pc/sy(syc_phonetic):4
-  tam(INSCRIPT)		=	+pc/in(tam):4
-  tam(UNI)		=	+pc/in(tam_unicode):4
-  tam(TAB)		=	+pc/in(tam_TAB):4
-  tam(TSCII)		=	+pc/in(tam_TSCII):4
-  tel(basic)		=	+pc/in(tel):4
-  yu(basic)		=	+pc/srp(latin):4
-  yu(unicode)		=	+pc/srp(latinunicode):4
-  yu(yz)		=	+pc/srp(latinyz):4
-  yu(unicodeyz)		=	+pc/srp(latinunicodeyz):4
-  *			=	+pc/%l[4]%(v[4]):4
-
-! layout[2]	variant[2]	=	symbols
-  ben		basic		=	+pc/in(ben):2
-  ben		probhat		=	+pc/in(ben_probhat):2
-  dev		basic		=	+pc/in(deva):2
-  dvorak	gb		=	+pc/gb(dvorak):2
-  dvorak	fr		=	+pc/fr(dvorak):2
-  dvorak	no		=	+pc/no(dvorak):2
-  dvorak	se		=	+pc/se(dvorak):2
-  dvorak	basic		=	+pc/us(dvorak):2
-  dvorak	pl_basic	=	+pc/pl(dvorak):2
-  dvorak	pl		=	+pc/pl(dvorak_quotes):2
-  dvorak	pl_altquotes	=	+pc/pl(dvorak_altquotes):2
-  dz		basic		=	+pc/bt(basic):2
-  guj		basic		=	+pc/in(guj):2
-  gur		basic		=	+pc/in(guru):2
-  ie		laptop		=	+pc/ie(basic):2
-  ie		CloGaelachLaptop	=	+pc/ie(CloGaelach):2
-  iu		basic		=	+pc/ca(ike):2
-  lo		basic		=	+pc/la(basic):2
-  kan		basic		=	+pc/in(kan):2
-  mal		basic		=	+pc/in(mal):2
-  mal		mlplusnum	=	+pc/in(mal):2
-  ogham		basic		=	+pc/ie(ogam):2
-  ogham		laptop		=	+pc/ie(ogam):2
-  ogham		is434		=	+pc/ie(ogam_is434):2
-  ogham		is434laptop	=	+pc/ie(ogam_is434):2
-  ori		basic		=	+pc/in(ori):2
-  sapmi		basic		=	+pc/no(smi):2
-  sapmi		nodeadkeys	=	+pc/no(smi_nodeadkeys):2
-  sapmi		sefi		=	+pc/fi(smi):2
-  sin		phonetic-static	=	+pc/in(sin_phonetic):2
-  syr		basic		=	+pc/sy(syc):2
-  syr		phonetic	=	+pc/sy(syc_phonetic):2
-  tam		INSCRIPT	=	+pc/in(tam):2
-  tam		UNI		=	+pc/in(tam_unicode):2
-  tam		TAB		=	+pc/in(tam_TAB):2
-  tam		TSCII		=	+pc/in(tam_TSCII):2
-  tel		basic		=	+pc/in(tel):2
-  yu		basic		=	+pc/srp(latin):2
-  yu		unicode		=	+pc/srp(latinunicode):2
-  yu		yz		=	+pc/srp(latinyz):2
-  yu		unicodeyz	=	+pc/srp(latinunicodeyz):2
-
-! layout[3]	variant[3]	=	symbols
-  ben		basic		=	+pc/in(ben):3
-  ben		probhat		=	+pc/in(ben_probhat):3
-  dev		basic		=	+pc/in(deva):3
-  dvorak	gb		=	+pc/gb(dvorak):3
-  dvorak	fr		=	+pc/fr(dvorak):3
-  dvorak	no		=	+pc/no(dvorak):3
-  dvorak	se		=	+pc/se(dvorak):3
-  dvorak	basic		=	+pc/us(dvorak):3
-  dvorak	pl_basic	=	+pc/pl(dvorak):3
-  dvorak	pl		=	+pc/pl(dvorak_quotes):3
-  dvorak	pl_altquotes	=	+pc/pl(dvorak_altquotes):3
-  dz		basic		=	+pc/bt(basic):3
-  guj		basic		=	+pc/in(guj):3
-  gur		basic		=	+pc/in(guru):3
-  ie		laptop		=	+pc/ie(basic):3
-  ie		CloGaelachLaptop	=	+pc/ie(CloGaelach):3
-  iu		basic		=	+pc/ca(ike):3
-  lo		basic		=	+pc/la(basic):3
-  kan		basic		=	+pc/in(kan):3
-  mal		basic		=	+pc/in(mal):3
-  mal		mlplusnum	=	+pc/in(mal):3
-  ogham		basic		=	+pc/ie(ogam):3
-  ogham		laptop		=	+pc/ie(ogam):3
-  ogham		is434		=	+pc/ie(ogam_is434):3
-  ogham		is434laptop	=	+pc/ie(ogam_is434):3
-  ori		basic		=	+pc/in(ori):3
-  sapmi		basic		=	+pc/no(smi):3
-  sapmi		nodeadkeys	=	+pc/no(smi_nodeadkeys):3
-  sapmi		sefi		=	+pc/fi(smi):3
-  sin		phonetic-static	=	+pc/in(sin_phonetic):3
-  syr		basic		=	+pc/sy(syc):3
-  syr		phonetic	=	+pc/sy(syc_phonetic):3
-  tam		INSCRIPT	=	+pc/in(tam):3
-  tam		UNI		=	+pc/in(tam_unicode):3
-  tam		TAB		=	+pc/in(tam_TAB):3
-  tam		TSCII		=	+pc/in(tam_TSCII):3
-  tel		basic		=	+pc/in(tel):3
-  yu		basic		=	+pc/srp(latin):3
-  yu		unicode		=	+pc/srp(latinunicode):3
-  yu		yz		=	+pc/srp(latinyz):3
-  yu		unicodeyz	=	+pc/srp(latinunicodeyz):3
-
-! layout[4]	variant[4]	=	symbols
-  ben		basic		=	+pc/in(ben):4
-  ben		probhat		=	+pc/in(ben_probhat):4
-  dev		basic		=	+pc/in(deva):4
-  dvorak	gb		=	+pc/gb(dvorak):4
-  dvorak	fr		=	+pc/fr(dvorak):4
-  dvorak	no		=	+pc/no(dvorak):4
-  dvorak	se		=	+pc/se(dvorak):4
-  dvorak	basic		=	+pc/us(dvorak):4
-  dvorak	pl_basic	=	+pc/pl(dvorak):4
-  dvorak	pl		=	+pc/pl(dvorak_quotes):4
-  dvorak	pl_altquotes	=	+pc/pl(dvorak_altquotes):4
-  dz		basic		=	+pc/bt(basic):4
-  guj		basic		=	+pc/in(guj):4
-  gur		basic		=	+pc/in(guru):4
-  ie		laptop		=	+pc/ie(basic):4
-  ie		CloGaelachLaptop	=	+pc/ie(CloGaelach):4
-  iu		basic		=	+pc/ca(ike):4
-  lo		basic		=	+pc/la(basic):4
-  kan		basic		=	+pc/in(kan):4
-  mal		basic		=	+pc/in(mal):4
-  mal		mlplusnum	=	+pc/in(mal):4
-  ogham		basic		=	+pc/ie(ogam):4
-  ogham		laptop		=	+pc/ie(ogam):4
-  ogham		is434		=	+pc/ie(ogam_is434):4
-  ogham		is434laptop	=	+pc/ie(ogam_is434):4
-  ori		basic		=	+pc/in(ori):4
-  sapmi		basic		=	+pc/no(smi):4
-  sapmi		nodeadkeys	=	+pc/no(smi_nodeadkeys):4
-  sapmi		sefi		=	+pc/fi(smi):4
-  sin		phonetic-static	=	+pc/in(sin_phonetic):4
-  syr		basic		=	+pc/sy(syc):4
-  syr		phonetic	=	+pc/sy(syc_phonetic):4
-  tam		INSCRIPT	=	+pc/in(tam):4
-  tam		UNI		=	+pc/in(tam_unicode):4
-  tam		TAB		=	+pc/in(tam_TAB):4
-  tam		TSCII		=	+pc/in(tam_TSCII):4
-  tel		basic		=	+pc/in(tel):4
-  yu		basic		=	+pc/srp(latin):4
-  yu		unicode		=	+pc/srp(latinunicode):4
-  yu		yz		=	+pc/srp(latinyz):4
-  yu		unicodeyz	=	+pc/srp(latinunicodeyz):4
-
-! model		layout	=	symbols
-  $inetkbds     *	=       +inet(%m)
-  $sun_type7	jp	=	+sun/solaris(defaults_type7jp)
-  jp106		jp	=	+sun/solaris(defaults_type7jp)
-  *	        *	=       +sun/solaris(defaults)
-
-! model		layout		=	compat
-  $sun_jp	jp		=	+japan(kana_lock)
-  jp106		jp		=	+japan(kana_lock)
-  pc98		nec/jp		=	pc98(basic)
-  *		*		=	complete
-
-! model		layout[1]	=	compat
-  *		*		=	complete
-
-! model		=	types
-  *		=	complete
-
-! option	=	symbols
-  grp:switch		=	+group(switch)
-  grp:lswitch		=	+group(lswitch)
-  grp:win_switch	=	+group(win_switch)
-  grp:lwin_switch	=	+group(lwin_switch)
-  grp:rwin_switch	=	+group(rwin_switch)
-  grp:toggle		=	+group(toggle)
-  grp:shift_toggle	=	+group(shift_toggle)
-  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:caps_toggle	=	+group(caps_toggle)
-  grp:shift_caps_toggle	=	+group(shift_caps_toggle)
-  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
-  grp:alt_shift_toggle	=	+group(alt_shift_toggle)
-  grp:menu_toggle	=	+group(menu_toggle)
-  grp:lwin_toggle	=	+group(lwin_toggle)
-  grp:rwin_toggle	=	+group(rwin_toggle)
-  grp:lshift_toggle	=	+group(lshift_toggle)
-  grp:rshift_toggle	=	+group(rshift_toggle)
-  grp:lctrl_toggle	=	+group(lctrl_toggle)
-  grp:rctrl_toggle	=	+group(rctrl_toggle)
-  grp:lalt_toggle	=	+group(lalt_toggle)
-  lv3:switch		=	+level3(switch)
-  lv3:ralt_switch	=	+level3(ralt_switch)
-  lv3:lalt_switch	=	+level3(lalt_switch)
-  lv3:alt_switch	=	+level3(alt_switch)
-  lv3:menu_switch	=	+level3(menu_switch)
-  lv3:win_switch	=	+level3(win_switch)
-  lv3:lwin_switch	=	+level3(lwin_switch)
-  lv3:rwin_switch	=	+level3(rwin_switch)
-  caps:capslock		=	+capslock(capslock)
-  caps:shiftlock	=	+capslock(shiftlock)
-  caps:grouplock	=	+capslock(grouplock)
-  ctrl:nocaps		=	+ctrl(nocaps)
-  ctrl:swapcaps		=	+ctrl(swapcaps)
-  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
-  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
-  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
-  altwin:menu		=	+altwin(menu)
-  altwin:meta_alt	=	+altwin(meta_alt)
-  altwin:meta_win	=	+altwin(meta_win)
-  altwin:left_meta_win	=	+altwin(left_meta_win)
-  altwin:super_win	=	+altwin(super_win)
-  altwin:hyper_win	=	+altwin(hyper_win)
-  altwin:alt_super_win	=	+altwin(alt_super_win)
-  compose:ralt		=	+compose(ralt)
-  compose:rwin		=	+compose(rwin)
-  compose:menu		=	+compose(menu)
-  compose:rctrl		=	+compose(rctrl)
-  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
-  eurosign:e		=	+eurosign(e)
-  eurosign:5		=	+eurosign(5)
-  eurosign:2		=	+eurosign(2)
-  grp:switch		=	+group(switch)
-  grp:lswitch		=	+group(lswitch)
-  grp:win_switch	=	+group(win_switch)
-  grp:lwin_switch	=	+group(lwin_switch)
-  grp:rwin_switch	=	+group(rwin_switch)
-  grp:toggle		=	+group(toggle)
-  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:caps_toggle	=	+group(caps_toggle)
-  grp:shift_caps_toggle	=	+group(shift_caps_toggle)
-  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
-  grp:alt_shift_toggle	=	+group(alt_shift_toggle)
-  grp:menu_toggle	=	+group(menu_toggle)
-  grp:lwin_toggle	=	+group(lwin_toggle)
-  grp:rwin_toggle	=	+group(rwin_toggle)
-  grp:lshift_toggle	=	+group(lshift_toggle)
-  grp:rshift_toggle	=	+group(rshift_toggle)
-  grp:lctrl_toggle	=	+group(lctrl_toggle)
-  grp:rctrl_toggle	=	+group(rctrl_toggle)
-  grp:lalt_toggle	=	+group(lalt_toggle)
-  lv3:switch		=	+level3(switch)
-  lv3:ralt_switch	=	+level3(ralt_switch)
-  lv3:lalt_switch	=	+level3(lalt_switch)
-  lv3:alt_switch	=	+level3(alt_switch)
-  lv3:menu_switch	=	+level3(menu_switch)
-  lv3:win_switch	=	+level3(win_switch)
-  lv3:lwin_switch	=	+level3(lwin_switch)
-  lv3:rwin_switch	=	+level3(rwin_switch)
-  caps:capslock		=	+capslock(capslock)
-  caps:shiftlock	=	+capslock(shiftlock)
-  caps:grouplock	=	+capslock(grouplock)
-  ctrl:nocaps		=	+ctrl(nocaps)
-  ctrl:swapcaps		=	+ctrl(swapcaps)
-  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
-  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
-  ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
-  altwin:menu		=	+altwin(menu)
-  altwin:meta_alt	=	+altwin(meta_alt)
-  altwin:meta_win	=	+altwin(meta_win)
-  altwin:left_meta_win	=	+altwin(left_meta_win)
-  altwin:super_win	=	+altwin(super_win)
-  altwin:hyper_win	=	+altwin(hyper_win)
-  altwin:alt_super_win	=	+altwin(alt_super_win)
-  compose:ralt		=	+compose(ralt)
-  compose:rwin		=	+compose(rwin)
-  compose:menu		=	+compose(menu)
-  compose:rctrl		=	+compose(rctrl)
-  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
-  eurosign:e		=	+eurosign(e)
-  eurosign:5		=	+eurosign(5)
-  eurosign:2		=	+eurosign(2)
-  solaris:defaults	=	+sun/solaris(defaults)
-  solaris:keynames	=	+sun/solaris(keynames)
-  solaris:xf86keynames	=	+sun/solaris(xf86keynames)
-
-! option	=	compat
-  grp_led:num		=	+lednum(group_lock)
-  grp_led:caps		=	+ledcaps(group_lock)
-  grp_led:scroll	=	+ledscroll(group_lock)
-  grp:caps_toggle	=	+ledcaps(group_lock)
-
-! option	=	types
-  caps:internal			=	+caps(internal)
-  caps:internal_nocancel	=	+caps(internal_nocancel)
-  caps:shift			=	+caps(shift)
-  caps:shift_nocancel		=	+caps(shift_nocancel)
-  numpad:microsoft		=	+numpad(microsoft)
--- a/src/xorg/keytables/sun-src/rules/xorg.lst	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,456 +0,0 @@
-// $XdotOrg: xc/programs/xkbcomp/rules/xorg.lst,v 1.2 2004/04/23 19:54:52 eich Exp $
-// $Xorg: xfree86.lst,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-! model
-  sun_type6_usb		Sun Type 6 or 7 USB
-  sun_type6_euro_usb	Sun Type 6 or 7 USB (European layout)
-  sun_type6_unix_usb	Sun Type 6 or 7 USB (Unix layout)
-  sun_type6_jp_usb	Sun Type 6 USB (Japanese layout)
-  sun_type7_jp_usb	Sun Type 7 USB (Japanese layout) / Japanese 106-key
-  pc101           	Generic 101-key PC
-  pc102           	Generic 102-key (Intl) PC
-  pc104           	Generic 104-key PC
-  pc105           	Generic 105-key (Intl) PC
-  sun_type4		Sun Type 4
-  sun_type4_ca		Sun Type 4 (Canadian  layout)
-  sun_type4_jp		Sun Type 4 (Japanese layout)
-  sun_type4_euro	Sun Type 4 (European layout)
-  sun_type5		Sun Type 5
-  sun_type5_euro	Sun Type 5 (European layout)
-  sun_type5_jp		Sun Type 5 (Japanese layout)
-  sun_type5_unix	Sun Type 5 (Unix layout)
-  sun_type5_hobo	Sun Type 5 Compact 
-  sun_type5_euro_hobo	Sun Type 5 Compact (European layout)
-  sun_type5_jp_hobo	Sun Type 5 Compact (Japanese layout)
-  sun_type6             Sun Type 6
-  sun_type6_euro        Sun Type 6 (European layout)
-  sun_type6_jp		Sun Type 6 (Japanese layout)
-  sun_type6_unix	Sun Type 6 (Unix layout)
-  dell101         	Dell 101-key PC
-  everex          	Everex STEPnote
-  flexpro         	Keytronic FlexPro
-  microsoft       	Microsoft Natural
-  omnikey101      	Northgate OmniKey 101
-  winbook         	Winbook Model XP5
-  jp106           	Japanese 106-key
-  pc98            	PC-98xx Series
-  a4techKB21      	A4Tech KB-21
-  a4techKBS8      	A4Tech KBS-8
-  abnt2           	Brazilian ABNT2
-  airkey          	Acer AirKey V
-  acpi            	ACPI Standard
-  azonaRF2300     	Azona RF2300 wireless Internet Keyboard
-  scorpius        	Advance Scorpius KI
-  brother         	Brother Internet Keyboard
-  btc5113rf       	BTC 5113RF Multimedia
-  btc5126t        	BTC 5126T
-  btc9000         	BTC 9000
-  btc9000a        	BTC 9000A
-  btc9001ah       	BTC 9001AH
-  btc5090         	BTC 5090
-  cherryblue      	Cherry Blue Line CyBo@rd
-  cherryblueb     	Cherry CyMotion Master XPress
-  cherrybluea     	Cherry Blue Line CyBo@rd (alternate option)
-  chicony         	Chicony Internet Keyboard
-  chicony9885     	Chicony KB-9885
-  compaqeak8      	Compaq Easy Access Keyboard
-  compaqik7       	Compaq Internet Keyboard (7 keys)
-  compaqik13      	Compaq Internet Keyboard (13 keys)
-  compaqik18      	Compaq Internet Keyboard (18 keys)
-  cymotionlinux   	Cherry CyMotion Master Linux
-  armada          	Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
-  presario        	Laptop/notebook Compaq (eg. Presario) Internet Keyboard
-  ipaq            	Compaq iPaq Keyboard
-  dell            	Dell
-  inspiron        	Laptop/notebook Dell Inspiron 8xxx
-  dexxa           	Dexxa Wireless Desktop Keyboard
-  diamond         	Diamond 9801 / 9802 series
-  dtk2000         	DTK2000
-  ennyah_dkb1008  	Ennyah DKB-1008
-  genius          	Genius Comfy KB-16M / Genius MM Keyboard KWD-910
-  geniuscomfy2    	Genius Comfy KB-21e-Scroll
-  gyration        	Gyration
-  hpi6            	Hewlett-Packard Internet Keyboard
-  hp2501          	Hewlett-Packard SK-2501 Multimedia Keyboard
-  hp2505          	Hewlett-Packard SK-2505 Internet Keyboard
-  hpxe3gc         	Hewlett-Packard Omnibook XE3 GC
-  hpxe3gf         	Hewlett-Packard Omnibook XE3 GF
-  hpxt1000        	Hewlett-Packard Omnibook XT1000
-  hpzt11xx        	Hewlett-Packard Pavilion ZT11xx
-  hp500fa         	Hewlett-Packard Omnibook 500 FA
-  hp5xx           	Hewlett-Packard Omnibook 5xx
-  hp6000          	Hewlett-Packard Omnibook 6000/6100
-  honeywell_euroboard 	Honeywell Euroboard
-  rapidaccess     	IBM Rapid Access
-  rapidaccess2    	IBM Rapid Access II
-  rapidaccess2a   	IBM Rapid Access II (alternate option)
-  thinkpad        	IBM ThinkPad 560Z/600/600E/A22E
-  logiaccess      	Logitech Access Keyboard
-  ltcd            	Logitech Cordless Desktop
-  logicdit        	Logitech Cordless Desktop iTouch
-  logicdp         	Logitech Cordless Desktop Pro
-  logicdpa        	Logitech Cordless Desktop Pro (alternate option)
-  logicdpa2       	Logitech Cordless Desktop Pro (alternate option2)
-  logicdo         	Logitech Cordless Desktop Optical
-  logicfn         	Logitech Cordless Freedom/Desktop Navigator
-  logicdn         	Logitech Cordless Desktop Navigator
-  logidak         	Logitech Deluxe Access Keyboard
-  logiitc         	Logitech iTouch Cordless Keyboard (model Y-RB6)
-  logiik          	Logitech Internet Keyboard
-  itouch          	Logitech iTouch
-  logiitc         	Logitech iTouch Cordless Keyboard (model Y-RB6)
-  logiik          	Logitech Internet Keyboard
-  logiink         	Logitech Internet Navigator Keyboard
-  itouchin        	Logitech iTouch keyboard Internet Navigator
-  logiultrax      	Logitech Ultra-X Keyboard
-  mx1998          	Memorex MX1998
-  mx2500          	Memorex MX2500 EZ-Access Keyboard
-  mx2750          	Memorex MX2750
-  microsoftinet   	Microsoft Internet Keyboard
-  microsoftpro    	Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
-  microsoftprousb 	Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
-  microsoftprooem 	Microsoft Natural Keyboard Pro OEM
-  microsoftprose  	Microsoft Internet Keyboard Pro, Swedish
-  microsoftoffice 	Microsoft Office Keyboard
-  microsoftmult   	Microsoft Wireless Multimedia Keyboard 1.0A
-  oretec          	Oretec MCK-800 MM/Internet keyboard
-  propeller       	Propeller Voyager (KTEZ-1000)
-  qtronix         	QTronix Scorpius 98N+
-  samsung4500     	Samsung SDM 4500P
-  samsung4510    	Samsung SDM 4510P
-  sk1300          	SK-1300
-  sk2500          	SK-2500
-  sk6200          	SK-6200
-  sk7100 		SK-7100
-  sp_inet         	Super Power Multimedia Keyboard
-  sven            	SVEN Ergonomic 2500
-  symplon         	Symplon PaceBook (tablet PC)
-  toshiba_s3000   	Toshiba Satellite S3000
-  trust           	Trust Wireless Keyboard Classic
-  trustda         	Trust Direct Access Keyboard
-  yahoo           	Yahoo! Internet Keyboard
-  macintosh       	Macintosh
-  macintosh_old   	Macintosh Old
-  powerpcps2      	PowerPC PS/2
-  acer_tm_800     	Acer TravelMate 800
-
-! layout
-  us              U.S. English
-  ar              Arabic
-  al              Albania
-  am              Armenia
-  az              Azerbaijan
-  by              Belarus
-  be              Belgium
-  bd              Bangladesh
-  in              India
-  ba              Bosnia and Herzegovina
-  br              Brazil
-  bg              Bulgaria
-  mm              Myanmar
-  ca              Canada
-  ca_bi		  Canada_bilingual
-  hr              Croatia
-  cz              Czechia
-  dk              Denmark
-  nl              Netherlands
-  bt              Bhutan
-  ee              Estonia
-  ir              Iran
-  fo              Faroe Islands
-  fi              Finland
-  fr              France
-  ge              Georgia
-  de              Germany
-  gr              Greece
-  hu              Hungary
-  is              Iceland
-  il              Israel
-  it              Italy
-  jp              Japan
-  kg              Kyrgyzstan
-  kz              Kazakhstan
-  la              Laos
-  latam           Latin American
-  lt              Lithuania
-  lv              Latvia
-  mao             Maori
-  mkd             Macedonian
-  mt              Malta
-  mn              Mongolia
-  no              Norway
-  pl              Poland
-  pt              Portugal
-  ro              Romania
-  ru              Russia
-  sr             Serbian
-  si              Slovenia
-  sk              Slovakia
-  es              Spain
-  se              Sweden
-  fr_CH           Swiss French
-  de_CH           Swiss German
-  sy              Syria
-  tj              Tajikistan
-  lk              Sri Lanka
-  th              Thailand
-  tr              Turkish 
-  tr_f            Turkish (F)
-  ua              Ukraine
-  gb              United Kingdom
-  uz              Uzbekistan
-  vn              Vietnam
-  nec_vndr/jp     PC-98xx Series
-  ie              Ireland
-  pk              Pakistan
-
-! variant
-  intl            us: International (with dead keys)
-  alt-intl        us: Alternative international (former us_intl)
-  dvorak          us: Dvorak
-  rus             us: Russian phonetic
-  azerty          ar: azerty
-  azerty_digits   ar: azerty/digits
-  digits          ar: digits
-  qwerty          ar: qwerty
-  qwerty_digits   ar: qwerty/digits
-  phonetic        am: Phonetic
-  cyrillic        az: Cyrillic
-  winkeys         by: Winkeys
-  iso-alternate   be: ISO Alternate
-  nodeadkeys      be: Eliminate dead keys
-  sundeadkeys     be: Sun dead keys
-  probhat         bd: Probhat
-  ben             in: Bengali
-  ben_probhat     in: Bengali Probhat
-  guj             in: Gujarati
-  guru            in: Gurmukhi
-  kan             in: Kannada
-  mal             in: Malayalam
-  ori             in: Oriya
-  tam_unicode     in: Tamil Unicode
-  tam_TAB         in: Tamil TAB Typewriter
-  tam_TSCII       in: Tamil TSCII Typewriter
-  tam             in: Tamil
-  tel             in: Telugu
-  urd             in: Urdu
-  nodeadkeys      br: Eliminate dead keys
-  phonetic        bg: Phonetic
-  fr-dvorak       ca: French Dvorak
-  fr-legacy       ca: French (legacy)
-  multi           ca: Multilingual
-  multi-2gr       ca: Multilingual, second part
-  ike             ca: Inuktitut
-  us              hr: US keyboard with Croatian letters
-  bksl            cz: With &lt;\|&gt; key
-  qwerty          cz: qwerty
-  qwerty_bksl     cz: qwerty, extended Backslash
-  nodeadkeys      dk: Eliminate dead keys
-  nodeadkeys      ee: Eliminate dead keys
-  nodeadkeys      fo: Eliminate dead keys
-  nodeadkeys      fi: Eliminate dead keys
-  smi             fi: Northern Saami
-  nodeadkeys      fr: Eliminate dead keys
-  sundeadkeys     fr: Sun dead keys
-  latin9          fr: Alternative
-  latin9_nodeadkeys fr: Alternative, eliminate dead keys
-  latin9_sundeadkeys fr: Alternative, Sun dead keys
-  dvorak          fr: Dvorak
-  ru              ge: Russian
-  deadacute       de: Dead acute
-  deadgraveacute  de: Dead grave acute
-  nodeadkeys      de: Eliminate dead keys
-  ro              de: Romanian keyboard with German letters
-  ro_nodeadkeys   de: Romanian keyboard with German letters, eliminate dead keys
-  dvorak          de: Dvorak
-  extended        gr: Extended
-  nodeadkeys      gr: Eliminate dead keys
-  polytonic       gr: Polytonic
-  standard        hu: Standard
-  nodeadkeys      hu: Eliminate dead keys
-  qwerty          hu: qwerty
-  101_qwertz_comma_dead hu: 101/qwertz/comma/Dead keys
-  101_qwertz_comma_nodead hu: 101/qwertz/comma/Eliminate dead keys
-  101_qwertz_dot_dead hu: 101/qwertz/dot/Dead keys
-  101_qwertz_dot_nodead hu: 101/qwertz/dot/Eliminate dead keys
-  101_qwerty_comma_dead hu: 101/qwerty/comma/Dead keys
-  101_qwerty_comma_nodead hu: 101/qwerty/comma/Eliminate dead keys
-  101_qwerty_dot_dead hu: 101/qwerty/dot/Dead keys
-  101_qwerty_dot_nodead hu: 101/qwerty/dot/Eliminate dead keys
-  102_qwertz_comma_dead hu: 102/qwertz/comma/Dead keys
-  102_qwertz_comma_nodead hu: 102/qwertz/comma/Eliminate dead keys
-  102_qwertz_dot_dead hu: 102/qwertz/dot/Dead keys
-  102_qwertz_dot_nodead hu: 102/qwertz/dot/Eliminate dead keys
-  102_qwerty_comma_dead hu: 102/qwerty/comma/Dead keys
-  102_qwerty_comma_nodead hu: 102/qwerty/comma/Eliminate dead keys
-  102_qwerty_dot_dead hu: 102/qwerty/dot/Dead keys
-  102_qwerty_dot_nodead hu: 102/qwerty/dot/Eliminate dead keys
-  Sundeadkeys     is: Sun dead keys
-  nodeadkeys      is: Eliminate dead keys
-  lyx             il: lyx
-  si1452          il: si1452
-  phonetic        il: Phonetic
-  nodeadkeys      it: Eliminate dead keys
-  nodeadkeys      latam: Eliminate dead keys
-  sundeadkeys     latam: Sun dead keys
-  std             lt: "Standard"
-  us              lt: US keyboard with Lithuanian letters
-  apostrophe      lv: Apostrophe (') variant
-  tilde           lv: Tilde (~) variant
-  fkey            lv: F-letter (F) variant
-  nodeadkeys      mkd: Eliminate dead keys
-  us              mt: US keyboard with Maltian letters
-  nodeadkeys      no: Eliminate dead keys
-  dvorak          no: Dvorak
-  smi             no: Northern Saami
-  smi_nodeadkeys  no: Northern Saami, eliminate dead keys
-  qwertz          pl: qwertz
-  dvorak          pl: Dvorak
-  dvorak_quotes   pl: Dvorak, Polish quotes on quotemark key
-  dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!"
-  nodeadkeys      pt: Eliminate dead keys
-  sundeadkeys     pt: Sun dead keys
-  us              ro: US keyboard with Romanian letters
-  de              ro: Romanian keyboard with German letters
-  phonetic        ru: Phonetic
-  typewriter      ru: Typewriter
-  winkeys         ru: Winkeys
-  yz              sr: Z and ZHE swapped
-  latin           sr: Latin
-  latinunicode    sr: Latin Unicode
-  latinyz         sr: Latin qwerty
-  latinunicodeyz  sr: Latin Unicode qwerty
-  alternatequotes sr: With guillemots
-  latinalternatequotes sr: Latin with guillemots
-  bksl            sk: Extended Backslash
-  qwerty          sk: qwerty
-  qwerty_bksl     sk: qwerty, extended Backslash
-  nodeadkeys      es: Eliminate dead keys
-  sundeadkeys     es: Sun dead keys
-  dvorak          es: Dvorak
-  nodeadkeys      se: Eliminate dead keys
-  dvorak          se: Dvorak
-  rus             se: Russian phonetic
-  rus_nodeadkeys  se: Russian phonetic, eliminate dead keys
-  smi             se: Northern Saami
-  de_nodeadkeys   ch: German, eliminate dead keys
-  de_sundeadkeys  ch: German, Sun dead keys
-  fr              ch: French
-  fr_nodeadkeys   ch: French, eliminate dead keys
-  fr_sundeadkeys  ch: French, Sun dead keys
-  syc             sy: Syriac
-  syc_phonetic    sy: Syriac phonetic
-  tam_unicode     lk: Tamil Unicode
-  tam_TAB         lk: Tamil TAB Typewriter
-  tam_TSCII       lk: Tamil TSCII Typewriter
-  sin_phonetic    lk: Sinhala phonetic
-  tis             th: TIS-820.2538
-  pat             th: Pattachote
-  f               tr: (F)
-  alt             tr: Alt-Q
-  phonetic        ua: Phonetic
-  typewriter      ua: Typewriter
-  winkeys         ua: Winkeys
-  rstu            ua: Standard RSTU
-  rstu_ru         ua: Standard RSTU on Russian layout
-  intl            gb: International (with dead keys)
-  dvorak          gb: Dvorak
-  CloGaelach      ie: CloGaelach
-  UnicodeExpert   ie: UnicodeExpert
-  ogam            ie: Ogham
-  ogam_is434      ie: Ogham IS434
-
-! option
-  grp                  Group Shift/Lock behavior
-  grp:switch           R-Alt switches group while pressed.
-  grp:lswitch          Left Alt key switches group while pressed.
-  grp:lwin_switch      Left Win-key switches group while pressed.
-  grp:rwin_switch      Right Win-key switches group while pressed.
-  grp:win_switch       Both Win-keys switch group while pressed.
-  grp:rctrl_switch     Right Ctrl key switches group while pressed.
-  grp:toggle           Right Alt key changes group.
-  grp:lalt_toggle      Left Alt key changes group.
-  grp:caps_toggle      CapsLock key changes group.
-  grp:shift_caps_toggle Shift+CapsLock changes group.
-  grp:shifts_toggle    Both Shift keys together change group.
-  grp:alts_toggle      Both Alt keys together change group.
-  grp:ctrls_toggle     Both Ctrl keys together change group.
-  grp:ctrl_shift_toggle Control+Shift changes group.
-  grp:ctrl_alt_toggle  Alt+Control changes group.
-  grp:alt_shift_toggle Alt+Shift changes group.
-  grp:menu_toggle      Menu key changes group.
-  grp:lwin_toggle      Left Win-key changes group.
-  grp:rwin_toggle      Right Win-key changes group.
-  grp:lshift_toggle    Left Shift key changes group.
-  grp:rshift_toggle    Right Shift key changes group.
-  grp:lctrl_toggle     Left Ctrl key changes group.
-  grp:rctrl_toggle     Right Ctrl key changes group.
-  lv3                  Third level choosers
-  lv3:switch           Press Right Control to choose 3rd level.
-  lv3:menu_switch      Press Menu key to choose 3rd level.
-  lv3:win_switch       Press any of Win-keys to choose 3rd level.
-  lv3:lwin_switch      Press Left Win-key to choose 3rd level.
-  lv3:rwin_switch      Press Right Win-key to choose 3rd level.
-  lv3:alt_switch       Press any of Alt keys to choose 3rd level.
-  lv3:lalt_switch      Press Left Alt key to choose 3rd level.
-  lv3:ralt_switch      Press Right Alt key to choose 3rd level.
-  ctrl                 Control key position
-  ctrl:nocaps          Make CapsLock an additional Control.
-  ctrl:swapcaps        Swap Control and CapsLock.
-  ctrl:ctrl_ac         Control key at left of 'A'
-  ctrl:ctrl_aa         Control key at bottom left
-  ctrl:ctrl_ra         Right Control key works as Right Alt.
-  grp_led              Use keyboard LED to show alternative group.
-  grp_led:num          NumLock LED shows alternative group.
-  grp_led:caps         CapsLock LED shows alternative group.
-  grp_led:scroll       ScrollLock LED shows alternative group.
-  caps                 CapsLock key behavior
-  caps:internal        CapsLock uses internal capitalization. Shift cancels CapsLock.
-  caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't cancel CapsLock.
-  caps:shift           CapsLock acts as Shift with locking. Shift cancels CapsLock.
-  caps:shift_nocancel  CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock.
-  caps:shift_lock      CapsLock just locks the Shift modifier.
-  caps:capslock        CapsLock toggles normal capitalization of alphabetic characters.
-  caps:shiftlock       CapsLock toggles Shift so all keys are affected.
-  altwin               Alt/Win key behavior
-  altwin:menu          Add the standard behavior to Menu key.
-  altwin:meta_alt      Alt and Meta are on the Alt keys (default).
-  altwin:meta_win      Meta is mapped to the Win-keys.
-  altwin:left_meta_win Meta is mapped to the left Win-key.
-  altwin:super_win     Super is mapped to the Win-keys (default).
-  altwin:hyper_win     Hyper is mapped to the Win-keys.
-  altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.
-  Compose key          Compose key position
-  compose:ralt         Right Alt is Compose.
-  compose:rwin         Right Win-key is Compose.
-  compose:menu         Menu is Compose.
-  compose:rctrl        Right Ctrl is Compose.
-  compat               Miscellaneous compatibility options
-  japan:kana_lock      Kana Lock key is locking
-  numpad:microsoft     Shift with numpad keys works as in MS Windows.
-  srvrkeys:none        Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.
-  eurosign             Adding the EuroSign to certain keys
-  eurosign:e           Add the EuroSign to the E key.
-  eurosign:5           Add the EuroSign to the 5 key.
-  eurosign:2           Add the EuroSign to the 2 key.
--- a/src/xorg/keytables/sun-src/rules/xorg.xml	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8072 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
-<!--
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
--->
-<xkbConfigRegistry>
-  <modelList>
-    <model>
-      <configItem>
-        <name>sun_type4</name>
-        <description>Sun Microsystems Type 4</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type4_ca</name>
-        <description>Sun Microsystems Type 4 (Canadian)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type4_jp</name>
-        <description>Sun Microsystems Type 4 (Japanese)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type4_euro</name>
-        <description>Sun Microsystems Type 4 (European)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type5</name>
-        <description>Sun Microsystems Type 5</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type5_euro</name>
-        <description>Sun Microsystems Type 5 (European)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type5_jp</name>
-        <description>Sun Microsystems Type 5 (Japanese)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type5_unix</name>
-        <description>Sun Microsystems Type 5 (Unix)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type5_hobo</name>
-        <description>Sun Microsystems Type 5 Hobo</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type5_euro_hobo</name>
-        <description>Sun Microsystems Type 5 Hobo (European)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type5_jp_hobo</name>
-        <description>Sun Microsystems Type 5 Hobo (Japanese)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type5_unix_hobo</name>
-        <description>Sun Microsystems Type 5 Hobo (Unix)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type6</name>
-        <description>Sun Microsystems Type 6</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type6_euro</name>
-        <description>Sun Microsystems Type 6 (European)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type6_jp</name>
-        <description>Sun Microsystems Type 6 (Japanese)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type6_unix</name>
-        <description>Sun Microsystems Type 6 (Unix)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type6_usb</name>
-        <description>Sun Microsystems Type 6 or 7 USB</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type6_euro_usb</name>
-        <description>Sun Microsystems Type 6 or 7 USB (European)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type6_jp_usb</name>
-        <description>Sun Microsystems Type 6 USB (Japanese)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type7_jp_usb</name>
-        <description>Sun Microsystems Type 7 USB (Japanese)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sun_type6_unix_usb</name>
-        <description>Sun Microsystems Type 6 or 7 USB (Unix)</description>
-      </configItem>
-    </model>
-
-    <model>
-      <configItem>
-        <name>pc101</name>
-        <description>Generic 101-key PC</description>
-        <description xml:lang="af">Generies 101-sleutel PC</description>
-        <description xml:lang="az">Generic 101-key PC</description>
-        <description xml:lang="bg">Стандартна 101 клавишна PC клавиатура</description>
-        <description xml:lang="cs">Obecné PC 101 kláves</description>
-        <description xml:lang="da">Generisk 101-taster PC</description>
-        <description xml:lang="el">Τυπικός Ηλεκ. Υπολογιστής 101-πλήκτρων</description>
-        <description xml:lang="en_GB">Generic 101-key PC</description>
-        <description xml:lang="fr">clavier Generic 101-key PC</description>
-        <description xml:lang="hu">általános 101 gombos PC</description>
-        <description xml:lang="nl">Algemeen 101-toetsen PC</description>
-        <description xml:lang="ru">Обычный 101-клавишный PC</description>
-        <description xml:lang="rw">Urufunguzo</description>
-        <description xml:lang="sk">Všeobecná PC 101 kláves</description>
-        <description xml:lang="sq">Generic 101-key PC</description>
-        <description xml:lang="sr">Обична са 101 тастером</description>
-        <description xml:lang="sv">Allmän 101-tangenters PC</description>
-        <description xml:lang="tr">Soysal 101 tuşlu PC</description>
-        <description xml:lang="uk">Звичайна 101-клавішна для ПК</description>
-        <description xml:lang="vi">PC chung 101 phím</description>
-        <description xml:lang="zh_CN">通用 101 键电脑</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>pc102</name>
-        <description>Generic 102-key (Intl) PC</description>
-        <description xml:lang="af">Generies 102-sleutel (Intl) PC</description>
-        <description xml:lang="az">Generic 102-key (Intl) PC</description>
-        <description xml:lang="bg">Стандартна 102 клавишна PC клавиатура</description>
-        <description xml:lang="cs">Obecné PC 102 kláves (mez.)</description>
-        <description xml:lang="da">Generisk 102-taster (Intl) PC</description>
-        <description xml:lang="el">Τυπικός Ηλεκ. Υπολογιστής 102-πλήκτρων (Διεθνές)</description>
-        <description xml:lang="en_GB">Generic 102-key (Intl) PC</description>
-        <description xml:lang="fr">clavier Generic 102-key (Intl) PC</description>
-        <description xml:lang="hu">általános 102 gombos (nemzetközi) PC</description>
-        <description xml:lang="nl">Algemeen 102-toetsen (internationaal) PC</description>
-        <description xml:lang="ru">Обычный 102-клавишный PC</description>
-        <description xml:lang="rw">Urufunguzo</description>
-        <description xml:lang="sk">Všeobecná PC 102 kláves (medz.)</description>
-        <description xml:lang="sq">Generic 102-key (Intl) PC</description>
-        <description xml:lang="sr">Обична са 102 тастера (међунар.)</description>
-        <description xml:lang="sv">Allmän 102-tangenters (internationell) PC</description>
-        <description xml:lang="tr">Soysal 102 tuşlu (Uluslararası) PC</description>
-        <description xml:lang="uk">Звичайна 102-клавішна для ПК</description>
-        <description xml:lang="vi">PC chung 102 phím (Intl)</description>
-        <description xml:lang="zh_CN">通用 102 键(国际)电脑</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>pc104</name>
-        <description>Generic 104-key PC</description>
-        <description xml:lang="af">Generies 104-sleutel PC</description>
-        <description xml:lang="az">Generic 104-key PC</description>
-        <description xml:lang="bg">Стандартна 104 клавишна PC клавиатура</description>
-        <description xml:lang="cs">Obecné PC 104 kláves</description>
-        <description xml:lang="da">Generisk 104-taster PC</description>
-        <description xml:lang="el">Τυπικός Ηλεκ. Υπολογιστής 104-πλήκτρων</description>
-        <description xml:lang="en_GB">Generic 104-key PC</description>
-        <description xml:lang="fr">clavier Generic 104-key PC</description>
-        <description xml:lang="hu">általános 104 gombos PC</description>
-        <description xml:lang="nl">Algemeen 104-toetsen PC</description>
-        <description xml:lang="ru">Обычный 104-клавишный PC</description>
-        <description xml:lang="rw">Urufunguzo</description>
-        <description xml:lang="sk">Všeobecná PC 104 kláves</description>
-        <description xml:lang="sq">Generic 104-key PC</description>
-        <description xml:lang="sr">Обична са 104 тастера</description>
-        <description xml:lang="sv">Allmän 104-tangenters PC</description>
-        <description xml:lang="tr">Soysal 104 tuşlu PC</description>
-        <description xml:lang="uk">Звичайна 104-клавішна для ПК</description>
-        <description xml:lang="vi">PC chung 104 phím</description>
-        <description xml:lang="zh_CN">通用 104 键电脑</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>pc105</name>
-        <description>Generic 105-key (Intl) PC</description>
-        <description xml:lang="af">Generies 105-sleutel (Intl) PC</description>
-        <description xml:lang="az">Generic 105-key (Intl) PC</description>
-        <description xml:lang="bg">Стандартна 105 клавишна PC клавиатура</description>
-        <description xml:lang="cs">Obecné PC 105 kláves (mez.)</description>
-        <description xml:lang="da">Generisk 105-taster (Intl) PC</description>
-        <description xml:lang="el">Τυπικός Ηλεκ. Υπολογιστής 105-πλήκτρων (Διεθνές)</description>
-        <description xml:lang="en_GB">Generic 105-key (Intl) PC</description>
-        <description xml:lang="fr">clavier Generic 105-key (Intl) PC</description>
-        <description xml:lang="hu">általános 105 gombos (nemzetközi) PC</description>
-        <description xml:lang="nl">Algemeen 105-toetsen (internationaal) PC</description>
-        <description xml:lang="ru">Обычный 105-клавишный (инт.) РС</description>
-        <description xml:lang="rw">Urufunguzo</description>
-        <description xml:lang="sk">Všeobecná 105-kláv. (medzinár.) PC</description>
-        <description xml:lang="sq">Generic 105-key (Intl) PC</description>
-        <description xml:lang="sr">Обична са 105 тастера (међунар.)</description>
-        <description xml:lang="sv">Allmän 105-tangenters (internationell) PC</description>
-        <description xml:lang="tr">Soysal 105 tuşlu (uluslararası) PC</description>
-        <description xml:lang="uk">Звичайна 105-клавішна для ПК</description>
-        <description xml:lang="vi">PC chung 105 phím (Intl)</description>
-        <description xml:lang="zh_CN">通用 105 键(国际)电脑</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>dell101</name>
-        <description>Dell 101-key PC</description>
-        <description xml:lang="af">Dell 101-key PC</description>
-        <description xml:lang="az">Dell 101-key PC</description>
-        <description xml:lang="bg">101 клавишна PC клавиатура на Dell</description>
-        <description xml:lang="cs">Dell PC 101 kláves</description>
-        <description xml:lang="da">Dell 101-taster PC</description>
-        <description xml:lang="en_GB">Dell 101-key PC</description>
-        <description xml:lang="fr">clavier Dell 101-key PC</description>
-        <description xml:lang="hu">Dell 101-key PC</description>
-        <description xml:lang="nl">Dell 101-toetsen PC</description>
-        <description xml:lang="ru">Dell 101-клавишный PC</description>
-        <description xml:lang="rw">Urufunguzo</description>
-        <description xml:lang="sk">DELL PC 101 kláves</description>
-        <description xml:lang="sq">Dell 101-key PC</description>
-        <description xml:lang="sr">Dell 101-тастер PC</description>
-        <description xml:lang="sv">Dell 101-tangenters PC</description>
-        <description xml:lang="tr">Dell 101 tuşlu PC</description>
-        <description xml:lang="uk">Dell 101-клавішна для ПК</description>
-        <description xml:lang="vi">Dell PC 101 phím</description>
-        <description xml:lang="zh_CN">Dell 101 键电脑</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>everex</name>
-        <description>Everex STEPnote</description>
-        <description xml:lang="af">Everex STEPnote</description>
-        <description xml:lang="az">Everex STEPnote</description>
-        <description xml:lang="bg">Everex STEPnote</description>
-        <description xml:lang="cs">Everex STEPnote</description>
-        <description xml:lang="da">Everex STEPnote</description>
-        <description xml:lang="en_GB">Everex STEPnote</description>
-        <description xml:lang="fr">Everex STEPnote</description>
-        <description xml:lang="hu">Everex STEPnote</description>
-        <description xml:lang="nl">Everex STEPnote</description>
-        <description xml:lang="ru">Everex STEPnote</description>
-        <description xml:lang="sk">Everex STEPnote</description>
-        <description xml:lang="sq">Everex STEPnote</description>
-        <description xml:lang="sr">Everex STEPnote</description>
-        <description xml:lang="sv">Everex STEPnote</description>
-        <description xml:lang="tr">Everex STEPnote</description>
-        <description xml:lang="uk">Everex STEPnote</description>
-        <description xml:lang="vi">Everex STEPnote</description>
-        <description xml:lang="zh_CN">Everex STEPnote</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>flexpro</name>
-        <description>Keytronic FlexPro</description>
-        <description xml:lang="af">Keytronic FlexPro</description>
-        <description xml:lang="az">Keytronic FlexPro</description>
-        <description xml:lang="bg">Keytronic FlexPro</description>
-        <description xml:lang="cs">Keytronic FlexPro</description>
-        <description xml:lang="da">Keytronic FlexPro</description>
-        <description xml:lang="en_GB">Keytronic FlexPro</description>
-        <description xml:lang="fr">Keytronic FlexPro</description>
-        <description xml:lang="hu">Keytronic FlexPro</description>
-        <description xml:lang="nl">Keytronic FlexPro</description>
-        <description xml:lang="ru">Keytronic FlexPro</description>
-        <description xml:lang="sk">Keytronic FlexPro</description>
-        <description xml:lang="sq">Keytronic FlexPro</description>
-        <description xml:lang="sr">Keytronic FlexPro</description>
-        <description xml:lang="sv">Keytronic FlexPro</description>
-        <description xml:lang="tr">Keytronic FlexPro</description>
-        <description xml:lang="uk">Keytronic FlexPro</description>
-        <description xml:lang="vi">Keytronic FlexPro</description>
-        <description xml:lang="zh_CN">Keytronic FlexPro</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>microsoft</name>
-        <description>Microsoft Natural</description>
-        <description xml:lang="af">Microsoft Natuurlik</description>
-        <description xml:lang="az">Microsoft Natural</description>
-        <description xml:lang="bg">Microsoft Natural</description>
-        <description xml:lang="cs">Microsoft Natural</description>
-        <description xml:lang="da">Microsoft Natural</description>
-        <description xml:lang="en_GB">Microsoft Natural</description>
-        <description xml:lang="fr">Microsoft Natural</description>
-        <description xml:lang="hu">Microsoft Natural</description>
-        <description xml:lang="nl">Microsoft Natural</description>
-        <description xml:lang="ru">Microsoft Natural</description>
-        <description xml:lang="sk">Microsoft Natural</description>
-        <description xml:lang="sq">Microsoft Natural</description>
-        <description xml:lang="sr">Микрософт Натурал</description>
-        <description xml:lang="sv">Microsoft Natural</description>
-        <description xml:lang="tr">Microsoft Basit</description>
-        <description xml:lang="uk">Microsoft Natural</description>
-        <description xml:lang="vi">Microsoft Natural</description>
-        <description xml:lang="zh_CN">微软自然键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>omnikey101</name>
-        <description>Northgate OmniKey 101</description>
-        <description xml:lang="af">Northgate OmniKey 101</description>
-        <description xml:lang="az">Northgate OmniKey 101</description>
-        <description xml:lang="bg">Northgate OmniKey 101</description>
-        <description xml:lang="cs">Northgate OmniKey 101</description>
-        <description xml:lang="da">Northgate OmniKey 101</description>
-        <description xml:lang="en_GB">Northgate OmniKey 101</description>
-        <description xml:lang="fr">Northgate OmniKey 101</description>
-        <description xml:lang="hu">Northgate OmniKey 101</description>
-        <description xml:lang="nl">Northgate OmniKey 101</description>
-        <description xml:lang="ru">Northgate OmniKey 101</description>
-        <description xml:lang="sk">Northgate OmniKey 101</description>
-        <description xml:lang="sq">Northgate OmniKey 101</description>
-        <description xml:lang="sr">Northgate OmniKey 101</description>
-        <description xml:lang="sv">Northgate OmniKey 101</description>
-        <description xml:lang="tr">Northgate OmniKey 101</description>
-        <description xml:lang="uk">Northgate OmniKey 101</description>
-        <description xml:lang="vi">Northgate OmniKey 101</description>
-        <description xml:lang="zh_CN">Northgate OmniKey 101</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>winbook</name>
-        <description>Winbook Model XP5</description>
-        <description xml:lang="af">Winbook Model XP5</description>
-        <description xml:lang="az">Winbook Model XP5</description>
-        <description xml:lang="bg">Winbook Model XP5</description>
-        <description xml:lang="cs">Winbook Model XP5</description>
-        <description xml:lang="da">Winbook Model XP5</description>
-        <description xml:lang="en_GB">Winbook Model XP5</description>
-        <description xml:lang="fr">Winbook Model XP5</description>
-        <description xml:lang="hu">Winbook Model XP5</description>
-        <description xml:lang="nl">Winbook Model XP5</description>
-        <description xml:lang="ru">Winbook Model XP5</description>
-        <description xml:lang="sk">Winbook Model XP5</description>
-        <description xml:lang="sq">Winbook Model XP5</description>
-        <description xml:lang="sr">Winbook Model XP5</description>
-        <description xml:lang="sv">Winbook Model XP5</description>
-        <description xml:lang="tr">Winbook Model XP5</description>
-        <description xml:lang="uk">Winbook Model XP5</description>
-        <description xml:lang="vi">Winbook kiểu mẫu XP5</description>
-        <description xml:lang="zh_CN">Winbook Model XP5</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>jp106</name>
-        <description>Japanese 106-key</description>
-        <description xml:lang="af">Japanees 106-sleutel</description>
-        <description xml:lang="az">Yaponca 106-düymə</description>
-        <description xml:lang="bg">японска 106 клавишна</description>
-        <description xml:lang="cs">Japonské 106 kláves</description>
-        <description xml:lang="da">Japansk 106-taster</description>
-        <description xml:lang="en_GB">Japanese 106-key</description>
-        <description xml:lang="fr">Japanese 106-clés</description>
-        <description xml:lang="hu">japán 106 gombos</description>
-        <description xml:lang="nl">Japans 106-toetsen</description>
-        <description xml:lang="ru">Японская 106-клавишная</description>
-        <description xml:lang="rw">Urufunguzo</description>
-        <description xml:lang="sk">Japonskáé106 kláves</description>
-        <description xml:lang="sq">Japoneze 106-pulsantë</description>
-        <description xml:lang="sr">јапански са 106 тастера</description>
-        <description xml:lang="sv">Japansk 106-tangenters</description>
-        <description xml:lang="tr">Japonca 106 tuşlu</description>
-        <description xml:lang="uk">Японська 106-клавішна</description>
-        <description xml:lang="vi">Nhật bản 106 phím</description>
-        <description xml:lang="zh_CN">日语 106 键</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>pc98</name>
-        <description>PC-98xx Series</description>
-        <description xml:lang="af">PC-98xx Reeks</description>
-        <description xml:lang="az">PC-98xx Seriyaları</description>
-        <description xml:lang="bg">PC-98xx серии</description>
-        <description xml:lang="cs">PC-98xx řada</description>
-        <description xml:lang="da">PC-98xx-serien</description>
-        <description xml:lang="en_GB">PC-98xx Series</description>
-        <description xml:lang="fr">PC-98xx Series</description>
-        <description xml:lang="hu">PC-98xx Series</description>
-        <description xml:lang="nl">PC-98xx serie</description>
-        <description xml:lang="ru">PC-98xx</description>
-        <description xml:lang="sk">Séria PC-98xx</description>
-        <description xml:lang="sq">Seritë PC-98xx</description>
-        <description xml:lang="sr">PC-98xx серија</description>
-        <description xml:lang="sv">PC-98xx-serien</description>
-        <description xml:lang="tr">PC-98xx Serisi</description>
-        <description xml:lang="uk">Моделі PC-98xx</description>
-        <description xml:lang="vi">Sê ri PC-98xx</description>
-        <description xml:lang="zh_CN">PC-98xx 系列</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>a4techKB21</name>
-        <description>A4Tech KB-21</description>
-        <description xml:lang="en_GB">A4Tech KB-21</description>
-        <description xml:lang="nl">A4Tech KB-21</description>
-        <description xml:lang="ru">A4Tech KB-21</description>
-        <description xml:lang="rw">21</description>
-        <description xml:lang="vi">A4Tech KB-21</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>a4techKBS8</name>
-        <description>A4Tech KBS-8</description>
-        <description xml:lang="en_GB">A4Tech KBS-8</description>
-        <description xml:lang="nl">A4Tech KBS-8</description>
-        <description xml:lang="ru">A4Tech KBS-8</description>
-        <description xml:lang="rw">8</description>
-        <description xml:lang="vi">A4Tech KBS-8</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>abnt2</name>
-        <description>Brazilian ABNT2</description>
-        <description xml:lang="af">Braziliaans ABNT2</description>
-        <description xml:lang="az">Brazilya düzülüşü ABNT2</description>
-        <description xml:lang="bg">бразилска ABNT2</description>
-        <description xml:lang="cs">Brazilské ABNT2</description>
-        <description xml:lang="da">Brasiliansk ABNT2</description>
-        <description xml:lang="en_GB">Brazilian ABNT2</description>
-        <description xml:lang="fr">Brézilien ABNT2</description>
-        <description xml:lang="hu">brazil ABNT2</description>
-        <description xml:lang="nl">Braziliaans ABNT2</description>
-        <description xml:lang="ru">ABNT2</description>
-        <description xml:lang="sk">Brazílska ABNT2</description>
-        <description xml:lang="sq">Braziliane ABNT2</description>
-        <description xml:lang="sr">бразилски ABNT2</description>
-        <description xml:lang="sv">Brasiliansk ABNT2</description>
-        <description xml:lang="tr">Brazilya dili ABNT2</description>
-        <description xml:lang="uk">Бразильська ABTN2</description>
-        <description xml:lang="vi">ABNT2 của Bra-zil</description>
-        <description xml:lang="zh_CN">巴西 ABNT2</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>airkey</name>
-        <description>Acer AirKey V</description>
-        <description xml:lang="af">Acer AirKey V</description>
-        <description xml:lang="az">Acer AirKey V</description>
-        <description xml:lang="cs">Acer AirKey V</description>
-        <description xml:lang="da">Acer AirKey V</description>
-        <description xml:lang="en_GB">Acer AirKey V</description>
-        <description xml:lang="fr">Acer AirKey V</description>
-        <description xml:lang="hu">Acer AirKey V</description>
-        <description xml:lang="nl">Acer AirKey V</description>
-        <description xml:lang="ru">Acer AirKey V</description>
-        <description xml:lang="rw">V</description>
-        <description xml:lang="sk">Acer AirKey V</description>
-        <description xml:lang="sq">Acer AirKey V</description>
-        <description xml:lang="sr">Acer AirKey V</description>
-        <description xml:lang="sv">Acer AirKey V</description>
-        <description xml:lang="tr">Acer AirKey V</description>
-        <description xml:lang="uk">Acer AirKey V</description>
-        <description xml:lang="vi">Acer AirKey V</description>
-        <description xml:lang="zh_CN">Acer AirKey V</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>acpi</name>
-        <description>ACPI Standard</description>
-        <description xml:lang="af">ACPI Standaard</description>
-        <description xml:lang="az">ACPI Standartı</description>
-        <description xml:lang="cs">Standard ACPI</description>
-        <description xml:lang="da">ACPI-standard</description>
-        <description xml:lang="en_GB">ACPI Standard</description>
-        <description xml:lang="fr">norme ACPI</description>
-        <description xml:lang="hu">ACPI szabvány</description>
-        <description xml:lang="nl">ACPI standaard</description>
-        <description xml:lang="ru">Стандартная ACPI</description>
-        <description xml:lang="sk">Štandard ACPI</description>
-        <description xml:lang="sq">ACPI Standart</description>
-        <description xml:lang="sr">ACPI стандард</description>
-        <description xml:lang="sv">ACPI-standard</description>
-        <description xml:lang="tr">ACPI Standardı</description>
-        <description xml:lang="uk">Типова ACPI</description>
-        <description xml:lang="vi">ACPI Tiêu chuẩn</description>
-        <description xml:lang="zh_CN">ACPI 标准</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>azonaRF2300</name>
-        <description>Azona RF2300 wireless Internet Keyboard</description>
-        <description xml:lang="en_GB">Azona RF2300 wireless Internet Keyboard</description>
-        <description xml:lang="nl">Azona RF2300 draadloos internettoetsenbord</description>
-        <description xml:lang="ru">Azona RF2300 wireless Internet Keyboard</description>
-        <description xml:lang="vi">Bàn phím không dây Internet Azona RF2300</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>scorpius</name>
-        <description>Advance Scorpius KI</description>
-        <description xml:lang="af">Advance Scorpius KI</description>
-        <description xml:lang="az">Advance Scorpius KI</description>
-        <description xml:lang="cs">Advance Scorpius KI</description>
-        <description xml:lang="da">Advance Scorpius KI</description>
-        <description xml:lang="en_GB">Advance Scorpius KI</description>
-        <description xml:lang="fr">Advance Scorpius KI</description>
-        <description xml:lang="hu">Advance Scorpius KI</description>
-        <description xml:lang="nl">Advance Scorpius KI</description>
-        <description xml:lang="ru">Advance Scorpius KI</description>
-        <description xml:lang="sk">Advance Scorpius KI</description>
-        <description xml:lang="sq">Advance Scorpius KI</description>
-        <description xml:lang="sr">Напредни Шкорпион КИ</description>
-        <description xml:lang="sv">Advance Scorpius KI</description>
-        <description xml:lang="tr">Advance Scorpius KI</description>
-        <description xml:lang="uk">Advance Scorpius KI</description>
-        <description xml:lang="vi">Nâng cao Scorpius KI</description>
-        <description xml:lang="zh_CN">高级 Scorpius KI</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>brother</name>
-        <description>Brother Internet Keyboard</description>
-        <description xml:lang="af">Brother Internetsleutelbord</description>
-        <description xml:lang="az">Brother Internet Keyboard</description>
-        <description xml:lang="bg">Logitech Интернет клавиатура</description>
-        <description xml:lang="cs">Brother Internet Keyboard</description>
-        <description xml:lang="da">Brother Internet Keyboard</description>
-        <description xml:lang="en_GB">Brother Internet Keyboard</description>
-        <description xml:lang="fr">clavier Brother Internet</description>
-        <description xml:lang="hu">Brother Internet Keyboard</description>
-        <description xml:lang="nl">Brother internet toetsenbord</description>
-        <description xml:lang="ru">Brother Internet Keyboard</description>
-        <description xml:lang="sk">Brother Internet Keyboard</description>
-        <description xml:lang="sq">Tastiera Internet Brother</description>
-        <description xml:lang="sr">Brother Интернет тастатура</description>
-        <description xml:lang="sv">Brother Internettangentbord</description>
-        <description xml:lang="tr">Brother Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Brother Internet Keyboard</description>
-        <description xml:lang="vi">Bàn phím Internet Brother</description>
-        <description xml:lang="zh_CN">Brother 网际键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>btc5113rf</name>
-        <description>BTC 5113RF Multimedia</description>
-        <description xml:lang="af">BTC 5113RF Multimedia</description>
-        <description xml:lang="az">BTC 5113RF Multimedia</description>
-        <description xml:lang="cs">BTC 5113RF Multimedia</description>
-        <description xml:lang="da">BTC 5113RF-multimedie</description>
-        <description xml:lang="en_GB">BTC 5113RF Multimedia</description>
-        <description xml:lang="fr">BTC 5113RF Multimedia</description>
-        <description xml:lang="hu">BTC 5113RF Multimedia</description>
-        <description xml:lang="nl">BTC 5113RF multimedia</description>
-        <description xml:lang="ru">BTC 5113RF Multimedia</description>
-        <description xml:lang="sk">BTC 5113RF Multimedia</description>
-        <description xml:lang="sq">BTC 5113RF Multimedia</description>
-        <description xml:lang="sr">BTC 5113RF мултимедијална</description>
-        <description xml:lang="sv">BTC 5113RF Multimedia</description>
-        <description xml:lang="tr">BTC 5113RF Çokluortam</description>
-        <description xml:lang="uk">BTC 5113RF мультимедія</description>
-        <description xml:lang="vi">BTC 5113RF Phim nhạc</description>
-        <description xml:lang="zh_CN">BTC 5113RF 多媒体</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>btc5126t</name>
-        <description>BTC 5126T</description>
-        <description xml:lang="af">BTC 5126T</description>
-        <description xml:lang="az">BTC 5126T</description>
-        <description xml:lang="cs">BTC 5126T</description>
-        <description xml:lang="da">BTC 5126T</description>
-        <description xml:lang="en_GB">BTC 5126T</description>
-        <description xml:lang="fr">BTC 5126T</description>
-        <description xml:lang="hu">BTC 5126T</description>
-        <description xml:lang="nl">BTC 5126T</description>
-        <description xml:lang="ru">BTC 5126T</description>
-        <description xml:lang="sk">BTC 5126T</description>
-        <description xml:lang="sq">BTC 5126T</description>
-        <description xml:lang="sr">BTC 5126T</description>
-        <description xml:lang="sv">BTC 5126T</description>
-        <description xml:lang="tr">BTC 5126T</description>
-        <description xml:lang="uk">BTC 5126T</description>
-        <description xml:lang="vi">BTC 5126T</description>
-        <description xml:lang="zh_CN">BTC 5126T</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>btc9000</name>
-        <description>BTC 9000</description>
-        <description xml:lang="af">BTC 9000</description>
-        <description xml:lang="az">BTC 9000</description>
-        <description xml:lang="cs">BTC 9000</description>
-        <description xml:lang="da">BTC 9000</description>
-        <description xml:lang="en_GB">BTC 9000</description>
-        <description xml:lang="fr">BTC 9000</description>
-        <description xml:lang="hu">BTC 9000</description>
-        <description xml:lang="nl">BTC 9000</description>
-        <description xml:lang="ru">BTC 9000</description>
-        <description xml:lang="sk">BTC 9000</description>
-        <description xml:lang="sq">BTC 9000</description>
-        <description xml:lang="sr">BTC 9000</description>
-        <description xml:lang="sv">BTC 9000</description>
-        <description xml:lang="tr">BTC 9000</description>
-        <description xml:lang="uk">BTC 9000</description>
-        <description xml:lang="vi">BTC 9000</description>
-        <description xml:lang="zh_CN">BTC 9000</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>btc9000a</name>
-        <description>BTC 9000A</description>
-        <description xml:lang="af">BTC 9000A</description>
-        <description xml:lang="az">BTC 9000A</description>
-        <description xml:lang="cs">BTC 9000A</description>
-        <description xml:lang="da">BTC 9000A</description>
-        <description xml:lang="en_GB">BTC 9000A</description>
-        <description xml:lang="fr">BTC 9000A</description>
-        <description xml:lang="hu">BTC 9000A</description>
-        <description xml:lang="nl">BTC 9000A</description>
-        <description xml:lang="ru">BTC 9000A</description>
-        <description xml:lang="sk">BTC 9000A</description>
-        <description xml:lang="sq">BTC 9000A</description>
-        <description xml:lang="sr">BTC 9000A</description>
-        <description xml:lang="sv">BTC 9000A</description>
-        <description xml:lang="tr">BTC 9000A</description>
-        <description xml:lang="uk">BTC 9000A</description>
-        <description xml:lang="vi">BTC 9000A</description>
-        <description xml:lang="zh_CN">BTC 9000A</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>btc9001ah</name>
-        <description>BTC 9001AH</description>
-        <description xml:lang="af">BTC 9001AH</description>
-        <description xml:lang="az">BTC 9001AH</description>
-        <description xml:lang="cs">BTC 9001AH</description>
-        <description xml:lang="da">BTC 9001AH</description>
-        <description xml:lang="en_GB">BTC 9001AH</description>
-        <description xml:lang="fr">BTC 9001AH</description>
-        <description xml:lang="hu">BTC 9001AH</description>
-        <description xml:lang="nl">BTC 9001AH</description>
-        <description xml:lang="ru">BTC·9001AH</description>
-        <description xml:lang="sk">BTC 9001AH</description>
-        <description xml:lang="sq">BTC 9001AH</description>
-        <description xml:lang="sr">BTC 9001AH</description>
-        <description xml:lang="sv">BTC 9001AH</description>
-        <description xml:lang="tr">BTC 9001AH</description>
-        <description xml:lang="uk">BTC 9001AH</description>
-        <description xml:lang="vi">BTC 9001AH</description>
-        <description xml:lang="zh_CN">BTC 9001AH</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>btc5090</name>
-        <description>BTC 5090</description>
-        <description xml:lang="af">BTC 5090</description>
-        <description xml:lang="az">BTC 5090</description>
-        <description xml:lang="cs">BTC 5090</description>
-        <description xml:lang="da">BTC 5090</description>
-        <description xml:lang="en_GB">BTC 5090</description>
-        <description xml:lang="fr">BTC 5090</description>
-        <description xml:lang="hu">BTC 5090</description>
-        <description xml:lang="nl">BTC 5090</description>
-        <description xml:lang="ru">BTC 5090</description>
-        <description xml:lang="sk">BTC 5090</description>
-        <description xml:lang="sq">BTC 5090</description>
-        <description xml:lang="sr">BTC 5090</description>
-        <description xml:lang="sv">BTC 5090</description>
-        <description xml:lang="tr">BTC 5090</description>
-        <description xml:lang="uk">BTC 5090</description>
-        <description xml:lang="vi">BTC 5090</description>
-        <description xml:lang="zh_CN">BTC 5090</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>cherryblue</name>
-        <description>Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="af">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="az">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="cs">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="da">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="en_GB">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="fr">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="hu">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="nl">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="ru">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="sk">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="sq">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="sr">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="sv">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="tr">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="uk">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="vi">Cherry Blue Line CyBo@rd</description>
-        <description xml:lang="zh_CN">Cherry Blue Line CyBo@rd</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>cherryblueb</name>
-        <description>Cherry CyMotion Master XPress</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>cherrybluea</name>
-        <description>Cherry Blue Line CyBo@rd (alternate option)</description>
-        <description xml:lang="af">Cherry Blue Line CyBo@rd (alternatief)</description>
-        <description xml:lang="az">Cherry Blue Line CyBo@rd (alternate option)</description>
-        <description xml:lang="cs">Cherry Blue Line CyBo@rd (alternativní volba)</description>
-        <description xml:lang="da">Cherry Blue Line CyBo@rd (alternativ)</description>
-        <description xml:lang="en_GB">Cherry Blue Line CyBo@rd (alternate option)</description>
-        <description xml:lang="fr">Cherry Blue Line CyBo@rd (option alternative)</description>
-        <description xml:lang="hu">Cherry Blue Line CyBo@rd (másik lehetőség)</description>
-        <description xml:lang="nl">Cherry Blue Line CyBo@rd (alternatieve optie)</description>
-        <description xml:lang="ru">Cherry Blue Line CyBo@rd (альтернативный вариант)</description>
-        <description xml:lang="rw">Ihitamo</description>
-        <description xml:lang="sk">Cherry Blue Line CyBo@rd (alternatívna voľba)</description>
-        <description xml:lang="sq">Cherry Blue Line CyBo@rd (opcioni alterno)</description>
-        <description xml:lang="sr">Cherry Blue Line CyBo@rd (друга могућност)</description>
-        <description xml:lang="sv">Cherry Blue Line CyBo@rd (alternativ)</description>
-        <description xml:lang="tr">Cherry Blue Line CyBo@rd (diğer seçenek)</description>
-        <description xml:lang="uk">Cherry Blue Line CyBo@rd (альтернативний варіант)</description>
-        <description xml:lang="vi">Cherry Blue Line CyBo@rd (luân phiên tùy chọn)</description>
-        <description xml:lang="zh_CN">Cherry Blue Line CyBo@rd (替代选项)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>chicony</name>
-        <description>Chicony Internet Keyboard</description>
-        <description xml:lang="af">Chicony Internetsleutelbord</description>
-        <description xml:lang="az">Chicony Internet Keyboard</description>
-        <description xml:lang="bg">Интернет клавиатура на Chicony</description>
-        <description xml:lang="cs">Chicony Internet Keyboard</description>
-        <description xml:lang="da">Chicony Internet Keyboard</description>
-        <description xml:lang="en_GB">Chicony Internet Keyboard</description>
-        <description xml:lang="fr">clavier Chicony Internet</description>
-        <description xml:lang="hu">Chicony Internet Keyboard</description>
-        <description xml:lang="nl">Chicony internet toetsenbord</description>
-        <description xml:lang="ru">Chicony Internet Keyboard</description>
-        <description xml:lang="sk">Chicony Internet Keyboard</description>
-        <description xml:lang="sq">Tastiera Internet Chicony</description>
-        <description xml:lang="sr">Chicony Интернет тастатура</description>
-        <description xml:lang="sv">Chicony Internettangentbord</description>
-        <description xml:lang="tr">Chicony Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Інтернет-клавіатура Chicony</description>
-        <description xml:lang="vi">Bàn phím Internet Chicony</description>
-        <description xml:lang="zh_CN">Chicony Internet 键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>chicony9885</name>
-        <description>Chicony KB-9885</description>
-        <description xml:lang="af">Chicony KB-9885</description>
-        <description xml:lang="az">Chicony KB-9885</description>
-        <description xml:lang="cs">Chicony KB-9885</description>
-        <description xml:lang="da">Chicony KB-9885</description>
-        <description xml:lang="en_GB">Chicony KB-9885</description>
-        <description xml:lang="fr">Chicony KB-9885</description>
-        <description xml:lang="hu">Chicony KB-9885</description>
-        <description xml:lang="nl">Chicony KB-9885</description>
-        <description xml:lang="ru">Chicony KB-9885</description>
-        <description xml:lang="sk">Chicony KB-9885</description>
-        <description xml:lang="sq">Chicony KB-9885</description>
-        <description xml:lang="sr">Chicony KB-9885</description>
-        <description xml:lang="sv">Chicony KB-9885</description>
-        <description xml:lang="tr">Chicony KB-9885</description>
-        <description xml:lang="uk">Chicony KB-9885</description>
-        <description xml:lang="vi">Chicony KB-9885</description>
-        <description xml:lang="zh_CN">Chicony KB-9885</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>compaqeak8</name>
-        <description>Compaq Easy Access Keyboard</description>
-        <description xml:lang="af">Compaq Easy Access Keyboard</description>
-        <description xml:lang="az">Compaq Easy Access Keyboard</description>
-        <description xml:lang="cs">Compaq Easy Access Keyboard</description>
-        <description xml:lang="da">Compaq Easy Access Keyboard</description>
-        <description xml:lang="en_GB">Compaq Easy Access Keyboard</description>
-        <description xml:lang="fr">clavier Compaq Easy Access</description>
-        <description xml:lang="hu">Compaq Easy Access Keyboard</description>
-        <description xml:lang="nl">Compaq Easy Access toetsenbord</description>
-        <description xml:lang="ru">Compaq Easy Access Keyboard</description>
-        <description xml:lang="sk">Compaq Easy Access Keyboard</description>
-        <description xml:lang="sq">Tastiera Compaq Easy Access</description>
-        <description xml:lang="sr">Compaq тастатура за лак приступ</description>
-        <description xml:lang="sv">Compaq Easy Access-tangentbord</description>
-        <description xml:lang="tr">Compaq Kolay Erişim Klavyesi</description>
-        <description xml:lang="uk">Compaq Easy Access Keyboard</description>
-        <description xml:lang="vi">Bàn phím Truy cập Dễ dàng của Compaq</description>
-        <description xml:lang="zh_CN">Compaq Easy Access 键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>compaqik7</name>
-        <description>Compaq Internet Keyboard (7 keys)</description>
-        <description xml:lang="af">Compaq Internet Keyboard (7 sleutels)</description>
-        <description xml:lang="az">Compaq Internet Keyboard (7 düymə)</description>
-        <description xml:lang="bg">Интернет клавиатура на Chicony</description>
-        <description xml:lang="cs">Compaq Internet Keyboard (7 kláves)</description>
-        <description xml:lang="da">Compaq Internet Keyboard (7 taster)</description>
-        <description xml:lang="en_GB">Compaq Internet Keyboard (7 keys)</description>
-        <description xml:lang="fr">clavier Compaq Internet (7 clés)</description>
-        <description xml:lang="hu">Compaq Internet Keyboard (7 gombos)</description>
-        <description xml:lang="nl">Compaq internet toetsenbord (7 toetsen)</description>
-        <description xml:lang="ru">Compaq Internet Keyboard (7 клавиш)</description>
-        <description xml:lang="rw">7 Utubuto</description>
-        <description xml:lang="sk">Compaq Internet Keyboard (7 kláves)</description>
-        <description xml:lang="sq">Tastiera Internet Compaq (7 pulsante)</description>
-        <description xml:lang="sr">Compaq Интернет тастатура (7 тастера)</description>
-        <description xml:lang="sv">Compaq Internettangentbord (7 tangenter)</description>
-        <description xml:lang="tr">Örütbağ Klavyesi (7 tuşlu)</description>
-        <description xml:lang="uk">Compaq Internet Keyboard (7 клавіш)</description>
-        <description xml:lang="vi">Bàn phím Internet Compaq (7 phím)</description>
-        <description xml:lang="zh_CN">Compaq 网际键盘(7键)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>compaqik13</name>
-        <description>Compaq Internet Keyboard (13 keys)</description>
-        <description xml:lang="af">Compaq Internet Keyboard (13 sleutels)</description>
-        <description xml:lang="az">Compaq Internet Keyboard (13 düymə)</description>
-        <description xml:lang="bg">Интернет клавиатура на Chicony</description>
-        <description xml:lang="cs">Compaq Internet Keyboard (13 kláves)</description>
-        <description xml:lang="da">Compaq Internet Keyboard (13 taster)</description>
-        <description xml:lang="en_GB">Compaq Internet Keyboard (13 keys)</description>
-        <description xml:lang="fr">clavier Compaq Internet (13 clés)</description>
-        <description xml:lang="hu">Compaq Internet Keyboard (13 gombos)</description>
-        <description xml:lang="nl">Compaq internet toetsenbord (13 toetsen)</description>
-        <description xml:lang="ru">Compaq Internet Keyboard (13 клавиш)</description>
-        <description xml:lang="rw">Utubuto</description>
-        <description xml:lang="sk">Compaq Internet Keyboard (13 kláves)</description>
-        <description xml:lang="sq">Tatiera Internet Compaq (13 pulsante)</description>
-        <description xml:lang="sr">Compaq Интернет тастатура (13 тастера)</description>
-        <description xml:lang="sv">Compaq Internettangentbord (13 tangenter)</description>
-        <description xml:lang="tr">Compaq Örütbağ Klavyesi (13 tuşlu)</description>
-        <description xml:lang="uk">Compaq Internet Keyboard (13 клавіш)</description>
-        <description xml:lang="vi">Bàn phím Internet Compaq (13 phím)</description>
-        <description xml:lang="zh_CN">Compaq 网际键盘(13键)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>compaqik18</name>
-        <description>Compaq Internet Keyboard (18 keys)</description>
-        <description xml:lang="af">Compaq Internet Keyboard (18 sleutels)</description>
-        <description xml:lang="az">Compaq Internet Keyboard (18 düymə)</description>
-        <description xml:lang="bg">Интернет клавиатура на Chicony</description>
-        <description xml:lang="cs">Compaq Internet Keyboard (18 kláves)</description>
-        <description xml:lang="da">Compaq Internet Keyboard (18 taster)</description>
-        <description xml:lang="en_GB">Compaq Internet Keyboard (18 keys)</description>
-        <description xml:lang="fr">clavier Compaq Internet (18 clés)</description>
-        <description xml:lang="hu">Compaq Internet Keyboard (18 gombos)</description>
-        <description xml:lang="nl">Compaq internet toetsenbord (18 toetsen)</description>
-        <description xml:lang="ru">Compaq Internet Keyboard (18 клавиш)</description>
-        <description xml:lang="rw">Utubuto</description>
-        <description xml:lang="sk">Compaq Internet Keyboard (18 kláves)</description>
-        <description xml:lang="sq">Tastiera Internet Compaq (18 pulsante)</description>
-        <description xml:lang="sr">Compaq Интернет тастатура (18 тастера)</description>
-        <description xml:lang="sv">Compaq Internettangentbord (18 tangenter)</description>
-        <description xml:lang="tr">Compaq Örütbağ Klavyesi (18 tuşlu)</description>
-        <description xml:lang="uk">Compaq Internet Keyboard (18 клавіш)</description>
-        <description xml:lang="vi">Bàn phím Internet Compaq (18 phím)</description>
-        <description xml:lang="zh_CN">Compaq 网际键盘(18键)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>cymotionlinux</name>
-        <description>Cherry CyMotion Master Linux</description>
-        <description xml:lang="ru">Cherry CyMotion Master Linux</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>armada</name>
-        <description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</description>
-        <description xml:lang="af">Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</description>
-        <description xml:lang="az">Laptop/notebook Compaq (məs. Armada) Laptop Klaviaturası</description>
-        <description xml:lang="cs">Laptop/notebook Compaq (např. Armada) Laptop Keyboard</description>
-        <description xml:lang="da">Bærbar Compaq (fx Armada) Laptop Keyboard</description>
-        <description xml:lang="en_GB">Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</description>
-        <description xml:lang="fr">clavier Laptop/notebook Compaq (ie. Armada) Laptop</description>
-        <description xml:lang="hu">Laptop/notebook Compaq (pl. Armada) Laptop Keyboard</description>
-        <description xml:lang="nl">Laptop/notebook Compaq (bijv. Armada) laptop toetsenbord</description>
-        <description xml:lang="ru">Клавиатура для компьютеров Compaq (например Armada)</description>
-        <description xml:lang="sk">Laptop/notebook Compaq (napr. Armada) Laptop Keyboard</description>
-        <description xml:lang="sq">Tastierë laptop për Laptop/notebook Compaq (p.sh. Armada)</description>
-        <description xml:lang="sr">Тастатуре преносних рачунара из Compaq-а (нпр. Armada)</description>
-        <description xml:lang="sv">Laptop-tangentbord för bärbar Compaq-dator (t.ex. Armada)</description>
-        <description xml:lang="tr">Laptop/notebook Compaq (örn. Armada) Dizüstü Klavyesi</description>
-        <description xml:lang="uk">Клавіатура для комп'ютерів Compaq (напр., Armada)</description>
-        <description xml:lang="vi">Bàn phím nhỏ gọn cho máy xách tay/notebook Compaq (ví dụ Armada)</description>
-        <description xml:lang="zh_CN">便携/笔记本 Compaq(如 Armada)便携键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>presario</name>
-        <description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard</description>
-        <description xml:lang="af">Laptop/notebook Compaq (eg. Presario) Internet Keyboard</description>
-        <description xml:lang="az">Laptop/notebook Compaq (məs. Presario) İnternet Klaviaturası</description>
-        <description xml:lang="cs">Laptop/notebook Compaq (např. Presario) Internet Keyboard</description>
-        <description xml:lang="da">Bærbar Compaq (fx Presario) Internet Keyboard</description>
-        <description xml:lang="en_GB">Laptop/notebook Compaq (eg. Presario) Internet Keyboard</description>
-        <description xml:lang="fr">clavier Laptop/notebook Compaq (ie. Presario) Internet</description>
-        <description xml:lang="hu">Laptop/notebook Compaq (pl. Presario) Internet Keyboard</description>
-        <description xml:lang="nl">Laptop/notebook Compaq (bijv. Presario) internet toetsenbord</description>
-        <description xml:lang="ru">"Интернет" клавиатура для компьютеров Compaq (например Presario)</description>
-        <description xml:lang="sk">Laptop/notebook Compaq (napr. Presario) Internet Keyboard</description>
-        <description xml:lang="sq">Tastierë për Internet për Laptop/notebook Compaq (p.sh. Presario)</description>
-        <description xml:lang="sr">Тастатуре преносних рачунара из Compaq-а (нпр. Presario)</description>
-        <description xml:lang="sv">Internettangentbord för bärbar Compaq-dator (t.ex. Presario)</description>
-        <description xml:lang="tr">Laptop/notebook Compaq (örn. Presario) Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Інтернет-клавіатура для ноутбуків Compaq (напр., Presario)</description>
-        <description xml:lang="vi">Bàn phím Internet cho máy xách tay/notebook Compaq (ví dụ Presario)</description>
-        <description xml:lang="zh_CN">便携/笔记本 Compaq(如自由人)网际键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>ipaq</name>
-        <description>Compaq iPaq Keyboard</description>
-        <description xml:lang="af">Compaq iPaq Keyboard</description>
-        <description xml:lang="az">Compaq iPaq Keyboard</description>
-        <description xml:lang="cs">Compaq iPaq Keyboard</description>
-        <description xml:lang="da">Compaq iPaq Keyboard</description>
-        <description xml:lang="en_GB">Compaq iPaq Keyboard</description>
-        <description xml:lang="fr">clavier Compaq iPaq</description>
-        <description xml:lang="hu">Compaq iPaq Keyboard</description>
-        <description xml:lang="nl">Compaq iPaq toetsenbord</description>
-        <description xml:lang="ru">Compaq iPaq Keyboard</description>
-        <description xml:lang="sk">Compaq iPaq Keyboard</description>
-        <description xml:lang="sq">Tastiera Compaq iPaq</description>
-        <description xml:lang="sr">Compaq iPaq тастатура</description>
-        <description xml:lang="sv">Compaq iPaq-tangentbord</description>
-        <description xml:lang="tr">Compaq iPaq Klavyesi</description>
-        <description xml:lang="uk">Compaq iPaq Keyboard</description>
-        <description xml:lang="vi">Bàn phím iPaq Compaq</description>
-        <description xml:lang="zh_CN">Compaq iPaq 键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>dell</name>
-        <description>Dell</description>
-        <description xml:lang="af">Dell</description>
-        <description xml:lang="az">Dell</description>
-        <description xml:lang="cs">Dell</description>
-        <description xml:lang="da">Dell</description>
-        <description xml:lang="en_GB">Dell</description>
-        <description xml:lang="fr">Dell</description>
-        <description xml:lang="hu">Dell</description>
-        <description xml:lang="nl">Dell</description>
-        <description xml:lang="ru">Dell</description>
-        <description xml:lang="sk">Dell</description>
-        <description xml:lang="sq">Dell</description>
-        <description xml:lang="sr">Dell</description>
-        <description xml:lang="sv">Dell</description>
-        <description xml:lang="tr">Dell</description>
-        <description xml:lang="uk">Dell</description>
-        <description xml:lang="vi">Dell</description>
-        <description xml:lang="zh_CN">Dell</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>inspiron</name>
-        <description>Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="af">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="az">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="cs">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="da">Bærbar Dell Inspiron 8xxx</description>
-        <description xml:lang="en_GB">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="fr">clavier Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="hu">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="nl">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="ru">Настольная/портативная для Dell Inspiron 8xxx</description>
-        <description xml:lang="sk">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="sq">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="sr">Тастатуре преносних рачунара Dell Inspiron 8xxx</description>
-        <description xml:lang="sv">Bärbar Dell Inspiron 8xxx</description>
-        <description xml:lang="tr">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="uk">Для ноутбуків Dell Inspiron 8xxx</description>
-        <description xml:lang="vi">Laptop/notebook Dell Inspiron 8xxx</description>
-        <description xml:lang="zh_CN">便携/笔记本 Dell Inspiron 8xxx</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>dexxa</name>
-        <description>Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="af">Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="az">Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="cs">Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="da">Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="en_GB">Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="fr">clavier Dexxa Wireless Desktop</description>
-        <description xml:lang="hu">Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="nl">Dexxa Wireless Desktop toetsenbord</description>
-        <description xml:lang="ru">Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="sk">Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="sq">Tastierë Dexxa Wireless Desktop</description>
-        <description xml:lang="sr">Dexxa бежична тастатура</description>
-        <description xml:lang="sv">Dexxa trådlöst skrivbordstangentbord</description>
-        <description xml:lang="tr">Dexxa Kablosuz Masaüstü Klavyesi</description>
-        <description xml:lang="uk">Dexxa Wireless Desktop Keyboard</description>
-        <description xml:lang="vi">Bàn phím Không dây Dexxa cho Desktop</description>
-        <description xml:lang="zh_CN">Dexxa 无线桌面键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>diamond</name>
-        <description>Diamond 9801 / 9802 series</description>
-        <description xml:lang="af">Diamond 9801 / 9802 series</description>
-        <description xml:lang="az">Diamond 9801 / 9802 seryaları</description>
-        <description xml:lang="cs">Diamond řada 9801 / 9802</description>
-        <description xml:lang="da">Diamond 9801 / 9802-serien</description>
-        <description xml:lang="en_GB">Diamond 9801 / 9802 series</description>
-        <description xml:lang="fr">clavier Diamond 9801 / 9802 series</description>
-        <description xml:lang="hu">Diamond 9801 / 9802 series</description>
-        <description xml:lang="nl">Diamond 9801 / 9802 serie</description>
-        <description xml:lang="ru">Модели Diamond 9801/9802</description>
-        <description xml:lang="rw">Ibyiciro</description>
-        <description xml:lang="sk">Diamond séria 9801 / 9802</description>
-        <description xml:lang="sq">Seritë Diamond 9801 / 9802</description>
-        <description xml:lang="sr">Diamond 9801 / 9802 серија</description>
-        <description xml:lang="sv">Diamond 9801/9802-serien</description>
-        <description xml:lang="tr">Diamond 9801 / 9802 serileri</description>
-        <description xml:lang="uk">Моделі Diamond 9801/9802</description>
-        <description xml:lang="vi">Sê ri Diamond 9801 / 9802</description>
-        <description xml:lang="zh_CN">Diamond 9801 / 9802 系列</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>dtk2000</name>
-        <description>DTK2000</description>
-        <description xml:lang="en_GB">DTK2000</description>
-        <description xml:lang="nl">DTK2000</description>
-        <description xml:lang="ru">DTK2000</description>
-        <description xml:lang="vi">DTK2000</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>ennyah_dkb1008</name>
-        <description>Ennyah DKB-1008</description>
-        <description xml:lang="af">Ennyah DKB-1008</description>
-        <description xml:lang="az">Ennyah DKB-1008</description>
-        <description xml:lang="cs">Ennyah DKB-1008</description>
-        <description xml:lang="da">Ennyah DKB-1008</description>
-        <description xml:lang="en_GB">Ennyah DKB-1008</description>
-        <description xml:lang="fr">Ennyah DKB-1008</description>
-        <description xml:lang="hu">Ennyah DKB-1008</description>
-        <description xml:lang="nl">Ennyah DKB-1008</description>
-        <description xml:lang="ru">Ennyah DKB-1008</description>
-        <description xml:lang="sk">Ennyah DKB-1008</description>
-        <description xml:lang="sq">Ennyah DKB-1008</description>
-        <description xml:lang="sr">Ennyah DKB-1008</description>
-        <description xml:lang="sv">Ennyah DKB-1008</description>
-        <description xml:lang="tr">Ennyah DKB-1008</description>
-        <description xml:lang="uk">Ennyah DKB-1008</description>
-        <description xml:lang="vi">Ennyah DKB-1008</description>
-        <description xml:lang="zh_CN">Ennyah DKB-1008</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>genius</name>
-        <description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="af">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="az">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="cs">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="da">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="en_GB">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="fr">clavier Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="hu">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="nl">Genius Comfy KB-16M / Genius MM toetsenbord KWD-910</description>
-        <description xml:lang="ru">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="sk">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="sq">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="sr">Genius Comfy KB-16M / Genius ММ тастатура KWD-910</description>
-        <description xml:lang="sv">Genius Comfy KB-16M / Genius MM-tangentbord KWD-910</description>
-        <description xml:lang="tr">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="uk">Genius Comfy KB-16M / Genius MM Keyboard KWD-910</description>
-        <description xml:lang="vi">Genius Tiện lợi KB-16M / Bàn phím Genius MM KWD-910</description>
-        <description xml:lang="zh_CN">通用 Comfy KB-16M / Genius MM 键盘 KWD-910</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>geniuscomfy2</name>
-        <description>Genius Comfy KB-21e-Scroll</description>
-        <description xml:lang="en_GB">Genius Comfy KB-21e-Scroll</description>
-        <description xml:lang="nl">Genius Comfy KB-21e-Scroll</description>
-        <description xml:lang="ru">Genius Comfy KB-21e-Scroll</description>
-        <description xml:lang="vi">Genius Comfy KB-21e-Scroll</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>gyration</name>
-        <description>Gyration</description>
-        <description xml:lang="en_GB">Gyration</description>
-        <description xml:lang="nl">Kroatisch</description>
-        <description xml:lang="ru">Гирашн</description>
-        <description xml:lang="vi">Sự chuyển hồi</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hpi6</name>
-        <description>Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="af">Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="az">Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="bg">Интернет клавиатура на Dell</description>
-        <description xml:lang="cs">Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="da">Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="en_GB">Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="fr">clavier Hewlett-Packard Internet</description>
-        <description xml:lang="hu">Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="nl">Hewlett-Packard internet toetsenbord</description>
-        <description xml:lang="ru">Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="sk">Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="sq">Tastierë për Internet Hewlett-Packard</description>
-        <description xml:lang="sr">Hewlett-Packard Интернет тастатура</description>
-        <description xml:lang="sv">Hewlett-Packard Internettangentbord</description>
-        <description xml:lang="tr">Hewlett-Packard Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Hewlett-Packard Internet Keyboard</description>
-        <description xml:lang="vi">Bàn phím Internet Hewlett-Packard</description>
-        <description xml:lang="zh_CN">惠普网际键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hp2501</name>
-        <description>Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="af">Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="az">Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="cs">Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="da">Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="en_GB">Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="fr">clavier Hewlett-Packard SK-2501 Multimedia</description>
-        <description xml:lang="hu">Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="nl">Hewlett-Packard SK-2501 multimedia toetsenbord</description>
-        <description xml:lang="ru">Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="sk">Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="sq">Tastierë multimediale Hewlett-Packard SK-2501</description>
-        <description xml:lang="sr">Hewlett-Packard SK-2501 мултимедијална тастатура</description>
-        <description xml:lang="sv">Hewlett-Packard SK-2501 multimediatangentbord</description>
-        <description xml:lang="tr">Hewlett-Packard SK-2501 Çokluortam Klavyesi</description>
-        <description xml:lang="uk">Hewlett-Packard SK-2501 Multimedia Keyboard</description>
-        <description xml:lang="vi">Bàn phím phim nhạc Hewlett-Packard SK-2501</description>
-        <description xml:lang="zh_CN">惠普 SK-2501 多媒体键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hp2505</name>
-        <description>Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="af">Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="az">Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="bg">Интернет клавиатура на Dell</description>
-        <description xml:lang="cs">Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="da">Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="en_GB">Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="fr">clavier Hewlett-Packard SK-2505 Internet</description>
-        <description xml:lang="hu">Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="nl">Hewlett-Packard SK-2505 internet toetsenbord</description>
-        <description xml:lang="ru">Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="sk">Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="sq">Tastierë për Internet Hewlett-Packard SK-2505</description>
-        <description xml:lang="sr">Hewlett-Packard SK-2505 Интернет тастатура</description>
-        <description xml:lang="sv">Hewlett-Packard SK-2505 Internettangentbord</description>
-        <description xml:lang="tr">Hewlett-Packard SK-2505 Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Hewlett-Packard SK-2505 Internet Keyboard</description>
-        <description xml:lang="vi">Bàn phím Internet Hewlett-Packard SK-2505</description>
-        <description xml:lang="zh_CN">惠普 SK-2505 网际键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hpxe3gc</name>
-        <description>Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="af">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="az">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="cs">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="da">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="en_GB">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="fr">clavier Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="hu">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="nl">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="ru">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="sk">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="sq">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="sr">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="sv">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="tr">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="uk">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="vi">Hewlett-Packard Omnibook XE3 GC</description>
-        <description xml:lang="zh_CN">惠普 Omnibook XE3 GC</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hpxe3gf</name>
-        <description>Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="af">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="az">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="cs">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="da">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="en_GB">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="fr">clavier Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="hu">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="nl">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="ru">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="sk">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="sq">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="sr">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="sv">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="tr">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="uk">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="vi">Hewlett-Packard Omnibook XE3 GF</description>
-        <description xml:lang="zh_CN">惠普 Omnibook XE3 CF</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hpxt1000</name>
-        <description>Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="af">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="az">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="cs">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="da">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="en_GB">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="fr">clavier Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="hu">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="nl">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="ru">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="sk">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="sq">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="sr">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="sv">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="tr">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="uk">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="vi">Hewlett-Packard Omnibook XT1000</description>
-        <description xml:lang="zh_CN">惠普 Omnibook XT1000</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hpzt11xx</name>
-        <description>Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="af">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="az">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="cs">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="da">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="en_GB">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="fr">clavier Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="hu">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="nl">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="ru">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="sk">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="sq">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="sr">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="sv">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="tr">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="uk">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="vi">Hewlett-Packard Pavilion ZT11xx</description>
-        <description xml:lang="zh_CN">惠普 Pavilion ZT11xx</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hp500fa</name>
-        <description>Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="af">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="az">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="cs">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="da">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="en_GB">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="fr">clavier Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="hu">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="nl">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="ru">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="rw">500</description>
-        <description xml:lang="sk">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="sq">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="sr">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="sv">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="tr">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="uk">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="vi">Hewlett-Packard Omnibook 500 FA</description>
-        <description xml:lang="zh_CN">惠普 Omnibook 500 FA</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hp5xx</name>
-        <description>Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="af">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="az">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="bg">Интернет клавиатура на Dell</description>
-        <description xml:lang="cs">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="da">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="en_GB">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="fr">clavier Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="hu">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="nl">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="ru">Hewlett-Packard·Omnibook·5xx</description>
-        <description xml:lang="sk">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="sq">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="sr">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="sv">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="tr">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="uk">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="vi">Hewlett-Packard Omnibook 5xx</description>
-        <description xml:lang="zh_CN">惠普 Omnibook 5xx</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>hp6000</name>
-        <description>Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="af">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="az">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="cs">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="da">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="en_GB">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="fr">clavier Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="hu">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="nl">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="ru">Hewlett-Packard·Omnibook·6000/6100</description>
-        <description xml:lang="sk">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="sq">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="sr">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="sv">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="tr">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="uk">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="vi">Hewlett-Packard Omnibook 6000/6100</description>
-        <description xml:lang="zh_CN">惠普 Omnibook 6000/6100</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>honeywell_euroboard</name>
-        <description>Honeywell Euroboard</description>
-        <description xml:lang="af">Honeywell Euroboard</description>
-        <description xml:lang="az">Honeywell Euroboard</description>
-        <description xml:lang="cs">Honeywell Euroboard</description>
-        <description xml:lang="da">Honeywell Euroboard</description>
-        <description xml:lang="en_GB">Honeywell Euroboard</description>
-        <description xml:lang="fr">Honeywell Euroboard</description>
-        <description xml:lang="hu">Honeywell Euroboard</description>
-        <description xml:lang="nl">Honeywell Euroboard</description>
-        <description xml:lang="ru">Honeywell Euroboard</description>
-        <description xml:lang="sk">Honeywell Euroboard</description>
-        <description xml:lang="sq">Honeywell Euroboard</description>
-        <description xml:lang="sr">Honeywell Euroboard</description>
-        <description xml:lang="sv">Honeywell Euroboard</description>
-        <description xml:lang="tr">Honeywell Euroboard</description>
-        <description xml:lang="uk">Honeywell Euroboard</description>
-        <description xml:lang="vi">Honeywell Euroboard</description>
-        <description xml:lang="zh_CN">Honeywell 欧洲键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>rapidaccess</name>
-        <description>IBM Rapid Access</description>
-        <description xml:lang="af">IBM Rapid Access</description>
-        <description xml:lang="az">IBM Rapid Access</description>
-        <description xml:lang="bg">IBM Rapid Access</description>
-        <description xml:lang="cs">IBM Rapid Access</description>
-        <description xml:lang="da">IBM Rapid Access</description>
-        <description xml:lang="en_GB">IBM Rapid Access</description>
-        <description xml:lang="fr">clavier IBM Rapid Access</description>
-        <description xml:lang="hu">IBM Rapid Access</description>
-        <description xml:lang="nl">IBM Rapid Access</description>
-        <description xml:lang="ru">IBM Rapid Access</description>
-        <description xml:lang="sk">IBM Rapid Access</description>
-        <description xml:lang="sq">IBM Rapid Access</description>
-        <description xml:lang="sr">IBM Rapid Access</description>
-        <description xml:lang="sv">IBM Rapid Access</description>
-        <description xml:lang="tr">IBM Hızlı Erişim</description>
-        <description xml:lang="uk">IBM Rapid Access</description>
-        <description xml:lang="vi">Truy cập nhanh IBM</description>
-        <description xml:lang="zh_CN">IBM Rapid Access</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>rapidaccess2</name>
-        <description>IBM Rapid Access II</description>
-        <description xml:lang="af">IBM Rapid Access II</description>
-        <description xml:lang="az">IBM Rapid Access II</description>
-        <description xml:lang="bg">IBM Rapid Access II</description>
-        <description xml:lang="cs">IBM Rapid Access II</description>
-        <description xml:lang="da">IBM Rapid Access II</description>
-        <description xml:lang="en_GB">IBM Rapid Access II</description>
-        <description xml:lang="fr">clavier IBM Rapid Access II</description>
-        <description xml:lang="hu">IBM Rapid Access II</description>
-        <description xml:lang="nl">IBM Rapid Access II</description>
-        <description xml:lang="ru">IBM Rapid Access II</description>
-        <description xml:lang="sk">IBM Rapid Access II</description>
-        <description xml:lang="sq">IBM Rapid Access II</description>
-        <description xml:lang="sr">IBM Rapid Access II</description>
-        <description xml:lang="sv">IBM Rapid Access II</description>
-        <description xml:lang="tr">IBM Hızlı Erişim II</description>
-        <description xml:lang="uk">IBM Rapid Access II</description>
-        <description xml:lang="vi">Truy cập nhanh IBM II</description>
-        <description xml:lang="zh_CN">IBM Rapid Access II</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>rapidaccess2a</name>
-        <description>IBM Rapid Access II (alternate option)</description>
-        <description xml:lang="af">IBM Rapid Access II (alternate option)</description>
-        <description xml:lang="az">IBM Rapid Access II (alternate option)</description>
-        <description xml:lang="bg">IBM Rapid Access II</description>
-        <description xml:lang="cs">IBM Rapid Access II (alternativní volba)</description>
-        <description xml:lang="da">IBM Rapid Access II (alternativ)</description>
-        <description xml:lang="en_GB">IBM Rapid Access II (alternate option)</description>
-        <description xml:lang="fr">clavier IBM Rapid Access II (option alternative)</description>
-        <description xml:lang="hu">IBM Rapid Access II (másik lehetőség)</description>
-        <description xml:lang="nl">IBM Rapid Access II (alternatieve optie)</description>
-        <description xml:lang="ru">IBM Rapid Access II (альтернативный вариант)</description>
-        <description xml:lang="rw">Ihitamo</description>
-        <description xml:lang="sk">IBM Rapid Access II (alternatívna voľba)</description>
-        <description xml:lang="sq">IBM Rapid Access II (opcioni alternativ)</description>
-        <description xml:lang="sr">IBM Rapid Access II (друга могућност)</description>
-        <description xml:lang="sv">IBM Rapid Access II (alternativ)</description>
-        <description xml:lang="tr">IBM Hızlı Erişim II (diğer seçenek)</description>
-        <description xml:lang="uk">IBM Rapid Access II (альтернативний варіант)</description>
-        <description xml:lang="vi">Truy cập nhanh IBM II (luân phiên tùy chọn)</description>
-        <description xml:lang="zh_CN">IBM Rapid Access II(替代选项)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>thinkpad</name>
-        <description>IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="af">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="az">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="cs">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="da">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="en_GB">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="fr">clavier IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="hu">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="nl">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="ru">IBM·ThinkPad·560Z/600/600E/A22E</description>
-        <description xml:lang="rw">600</description>
-        <description xml:lang="sk">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="sq">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="sr">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="sv">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="tr">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="uk">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="vi">IBM ThinkPad 560Z/600/600E/A22E</description>
-        <description xml:lang="zh_CN">IBM ThinkPad 560Z/600/600E/A22E</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logiaccess</name>
-        <description>Logitech Access Keyboard</description>
-        <description xml:lang="en_GB">Logitech Access Keyboard</description>
-        <description xml:lang="nl">Logitech Access toetsenbord</description>
-        <description xml:lang="ru">Logitech Access Keyboard</description>
-        <description xml:lang="vi">Bàn phím Truy cập Logitech</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>ltcd</name>
-        <description>Logitech Cordless Desktop</description>
-        <description xml:lang="af">Logitech Cordless Desktop</description>
-        <description xml:lang="az">Logitech Cordless Desktop</description>
-        <description xml:lang="bg">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="cs">Logitech Cordless Desktop</description>
-        <description xml:lang="da">Logitech Cordless Desktop</description>
-        <description xml:lang="en_GB">Logitech Cordless Desktop</description>
-        <description xml:lang="fr">Logitech Cordless Desktop</description>
-        <description xml:lang="hu">Logitech Cordless Desktop</description>
-        <description xml:lang="nl">Logitech Cordless Desktop</description>
-        <description xml:lang="ru">Logitech Cordless Desktop</description>
-        <description xml:lang="sk">Logitech Cordless Desktop</description>
-        <description xml:lang="sq">Logitech Cordless Desktop</description>
-        <description xml:lang="sr">Logitech Cordless Desktop</description>
-        <description xml:lang="sv">Logitech Cordless Desktop</description>
-        <description xml:lang="tr">Logitech Kablosuz Masaüstü</description>
-        <description xml:lang="uk">Logitech Cordless Desktop</description>
-        <description xml:lang="vi">Logitech Cordless Desktop</description>
-        <description xml:lang="zh_CN">罗技无影手</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logicdit</name>
-        <description>Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="af">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="az">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="bg">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="cs">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="da">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="en_GB">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="fr">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="hu">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="nl">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="ru">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="sk">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="sq">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="sr">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="sv">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="tr">Logitech Kablosuz Masaüstü iTouch</description>
-        <description xml:lang="uk">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="vi">Logitech Cordless Desktop iTouch</description>
-        <description xml:lang="zh_CN">罗技网际无影手</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logicdp</name>
-        <description>Logitech Cordless Desktop Pro</description>
-        <description xml:lang="af">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="az">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="bg">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="cs">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="da">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="en_GB">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="fr">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="hu">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="nl">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="ru">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="sk">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="sq">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="sr">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="sv">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="tr">Logitech Kablosuz Masaüstü Pro</description>
-        <description xml:lang="uk">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="vi">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="zh_CN">罗技无影手高级版</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logicdpa</name>
-        <description>Logitech Cordless Desktop Pro (alternate option)</description>
-        <description xml:lang="af">Logitech Cordless Desktop Pro (alternatiewe opsie)</description>
-        <description xml:lang="az">Logitech Cordless Desktop Pro (alternate option)</description>
-        <description xml:lang="bg">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="cs">Logitech Cordless Desktop Pro (alternativní volba)</description>
-        <description xml:lang="da">Logitech Cordless Desktop Pro (alternativ)</description>
-        <description xml:lang="en_GB">Logitech Cordless Desktop Pro (alternate option)</description>
-        <description xml:lang="fr">Logitech Cordless Desktop Pro (option alternative)</description>
-        <description xml:lang="hu">Logitech Cordless Desktop Pro (másik lehetőség)</description>
-        <description xml:lang="nl">Logitech Cordless Desktop Pro (alternatieve optie)</description>
-        <description xml:lang="ru">Logitech Cordless Desktop Pro (альтернативный вариант)</description>
-        <description xml:lang="rw">Ihitamo</description>
-        <description xml:lang="sk">Logitech Cordless Desktop Pro (alternatívna voľba)</description>
-        <description xml:lang="sq">Logitech Cordless Desktop Pro (opcioni alternativ)</description>
-        <description xml:lang="sr">Logitech Cordless Desktop Pro (додатна могућност)</description>
-        <description xml:lang="sv">Logitech Cordless Desktop Pro (alternativ)</description>
-        <description xml:lang="tr">Logitech Kablosuz Masaüstü Pro (diğer seçenek)</description>
-        <description xml:lang="uk">Logitech Cordless Desktop Pro (альтернативний варіант)</description>
-        <description xml:lang="vi">Logitech Cordless Desktop Pro (luân phiên tùy chọn)</description>
-        <description xml:lang="zh_CN">罗技无影手高级版(替代选项)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logicdpa2</name>
-        <description>Logitech Cordless Desktop Pro (alternate option2)</description>
-        <description xml:lang="af">Logitech Cordless Desktop Pro (alternatiewe opsie2)</description>
-        <description xml:lang="az">Logitech Cordless Desktop Pro (alternate option2)</description>
-        <description xml:lang="bg">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="cs">Logitech Cordless Desktop Pro (alternativní volba 2)</description>
-        <description xml:lang="da">Logitech Cordless Desktop Pro (alternativ 2)</description>
-        <description xml:lang="en_GB">Logitech Cordless Desktop Pro (alternate option2)</description>
-        <description xml:lang="fr">Logitech Cordless Desktop Pro (option2 alternative)</description>
-        <description xml:lang="hu">Logitech Cordless Desktop Pro (harmadik lehetőség)</description>
-        <description xml:lang="nl">Logitech Cordless Desktop Pro (alternatieve optie2)</description>
-        <description xml:lang="ru">Logitech Cordless Desktop Pro (альтернативный вариант 2)</description>
-        <description xml:lang="sk">Logitech Cordless Desktop Pro (alternatívna voľba2)</description>
-        <description xml:lang="sq">Logitech Cordless Desktop Pro (opcioni i dytë alternativ)</description>
-        <description xml:lang="sr">Logitech Cordless Desktop Pro (додатна могућност 2)</description>
-        <description xml:lang="sv">Logitech Cordless Desktop Pro (alternativ2)</description>
-        <description xml:lang="tr">Logitech Kablosuz Masaüstü Pro (diğer 2. seçenek)</description>
-        <description xml:lang="uk">Logitech Cordless Desktop Pro (альтернативний варіант 2)</description>
-        <description xml:lang="vi">Logitech Cordless Desktop Pro (luân phiên tùy chọn2)</description>
-        <description xml:lang="zh_CN">罗技无影手高级版(替代选项)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logicdo</name>
-        <description>Logitech Cordless Desktop Optical</description>
-        <description xml:lang="af">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="az">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="bg">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="cs">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="da">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="en_GB">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="fr">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="hu">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="nl">Logitech Cordless Desktop Optisch</description>
-        <description xml:lang="ru">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="sk">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="sq">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="sr">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="sv">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="tr">Logitech Kablosuz Masaüstü Optik</description>
-        <description xml:lang="uk">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="vi">Logitech Cordless Desktop Optical</description>
-        <description xml:lang="zh_CN">罗技无影手光学组合</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logicfn</name>
-        <description>Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="af">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="az">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="bg">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="cs">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="da">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="en_GB">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="fr">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="hu">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="nl">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="ru">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="sk">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="sq">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="sr">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="sv">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="tr">Logitech Kablosuz Özgür/Masaüstü Tarayıcı</description>
-        <description xml:lang="uk">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="vi">Logitech Cordless Freedom/Desktop Navigator</description>
-        <description xml:lang="zh_CN">罗技极光无影手组合/桌面导航器</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logicdn</name>
-        <description>Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="af">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="az">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="bg">Logitech Cordless Desktop Pro</description>
-        <description xml:lang="cs">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="da">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="en_GB">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="fr">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="hu">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="nl">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="ru">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="sk">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="sq">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="sr">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="sv">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="tr">Logitech Kablosuz Masaüstü Tarayıcı</description>
-        <description xml:lang="uk">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="vi">Logitech Cordless Desktop Navigator</description>
-        <description xml:lang="zh_CN">罗技无影手桌面导航器</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logidak</name>
-        <description>Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="af">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="az">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="bg">Logitech Интернет клавиатура</description>
-        <description xml:lang="cs">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="da">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="en_GB">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="fr">clavier Logitech Deluxe Access</description>
-        <description xml:lang="hu">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="nl">Logitech Deluxe Access toetsenbord</description>
-        <description xml:lang="ru">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="sk">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="sq">Tastierë Logitech Deluxe Access</description>
-        <description xml:lang="sr">Logitech Deluxe Access тастатура</description>
-        <description xml:lang="sv">Logitech Deluxe Access-tangentbord</description>
-        <description xml:lang="tr">Logitech Deluxe Erişim Klavyesi</description>
-        <description xml:lang="uk">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="vi">Logitech Deluxe Access Keyboard</description>
-        <description xml:lang="zh_CN">罗技强手键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logiitc</name>
-        <description>Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="af">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="az">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="cs">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="da">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="en_GB">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="fr">clavier Logitech iTouch Cordless (model Y-RB6)</description>
-        <description xml:lang="hu">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="nl">Logitech iTouch draadloos toetsenbord (model Y-RB6)</description>
-        <description xml:lang="ru">Logitech iTouch Cordless Keyboard (модель Y-RB6)</description>
-        <description xml:lang="rw">Urugero</description>
-        <description xml:lang="sk">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="sq">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="sr">Logitech iTouch Cordless тастатура (модел Y-RB6)</description>
-        <description xml:lang="sv">Logitech iTouch Cordless Keyboard (modell Y-RB6)</description>
-        <description xml:lang="tr">Logitech iTouch Kablosuz Klavyesi (model Y-RB6)</description>
-        <description xml:lang="uk">Logitech iTouch Cordless Keyboard (модель Y-RB6)</description>
-        <description xml:lang="vi">Bàn phím Không dây Logitech iTouch (mẫu mã Y-RB6)</description>
-        <description xml:lang="zh_CN">罗技 iTouch 无影手键盘(型号 Y-RB6)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logiik</name>
-        <description>Logitech Internet Keyboard</description>
-        <description xml:lang="af">Logitech Internet Keyboard</description>
-        <description xml:lang="az">Logitech Internet Keyboard</description>
-        <description xml:lang="bg">Logitech Интернет клавиатура</description>
-        <description xml:lang="cs">Logitech Internet Keyboard</description>
-        <description xml:lang="da">Logitech Internet Keyboard</description>
-        <description xml:lang="en_GB">Logitech Internet Keyboard</description>
-        <description xml:lang="fr">clavier Logitech Internet</description>
-        <description xml:lang="hu">Logitech Internet Keyboard</description>
-        <description xml:lang="nl">Logitech internet toetsenbord</description>
-        <description xml:lang="ru">Logitech Internet Keyboard</description>
-        <description xml:lang="sk">Logitech Internet Keyboard</description>
-        <description xml:lang="sq">Tastierë për Internet Logitech</description>
-        <description xml:lang="sr">Logitech Интернет тастатура</description>
-        <description xml:lang="sv">Logitech Internettangentbord</description>
-        <description xml:lang="tr">Logitech Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Logitech Internet Keyboard</description>
-        <description xml:lang="vi">Bàn phím Internet Logitech</description>
-        <description xml:lang="zh_CN">罗技网际键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>itouch</name>
-        <description>Logitech iTouch</description>
-        <description xml:lang="af">Logitech iTouch</description>
-        <description xml:lang="az">Logitech iTouch</description>
-        <description xml:lang="bg">Logitech iTouch</description>
-        <description xml:lang="cs">Logitech iTouch</description>
-        <description xml:lang="da">Logitech iTouch</description>
-        <description xml:lang="en_GB">Logitech iTouch</description>
-        <description xml:lang="fr">Logitech iTouch</description>
-        <description xml:lang="hu">Logitech iTouch</description>
-        <description xml:lang="nl">Logitech iTouch</description>
-        <description xml:lang="ru">Logitech iTouch</description>
-        <description xml:lang="sk">Logitech iTouch</description>
-        <description xml:lang="sq">Logitech iTouch</description>
-        <description xml:lang="sr">Logitech iTouch</description>
-        <description xml:lang="sv">Logitech iTouch</description>
-        <description xml:lang="tr">Logitech iTouch</description>
-        <description xml:lang="uk">Logitech iTouch</description>
-        <description xml:lang="vi">Logitech iTouch</description>
-        <description xml:lang="zh_CN">罗技 iTouch</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logiitc</name>
-        <description>Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="af">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="az">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="cs">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="da">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="en_GB">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="fr">clavier Logitech iTouch Cordless (model Y-RB6)</description>
-        <description xml:lang="hu">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="nl">Logitech iTouch draadloos toetsenbord (model Y-RB6)</description>
-        <description xml:lang="ru">Logitech iTouch Cordless Keyboard (модель Y-RB6)</description>
-        <description xml:lang="rw">Urugero</description>
-        <description xml:lang="sk">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="sq">Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
-        <description xml:lang="sr">Logitech iTouch Cordless тастатура (модел Y-RB6)</description>
-        <description xml:lang="sv">Logitech iTouch Cordless Keyboard (modell Y-RB6)</description>
-        <description xml:lang="tr">Logitech iTouch Kablosuz Klavyesi (model Y-RB6)</description>
-        <description xml:lang="uk">Logitech iTouch Cordless Keyboard (модель Y-RB6)</description>
-        <description xml:lang="vi">Bàn phím Không dây Logitech iTouch (mẫu mã Y-RB6)</description>
-        <description xml:lang="zh_CN">罗技 iTouch 无影手键盘(型号 Y-RB6)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logiik</name>
-        <description>Logitech Internet Keyboard</description>
-        <description xml:lang="af">Logitech Internet Keyboard</description>
-        <description xml:lang="az">Logitech Internet Keyboard</description>
-        <description xml:lang="bg">Logitech Интернет клавиатура</description>
-        <description xml:lang="cs">Logitech Internet Keyboard</description>
-        <description xml:lang="da">Logitech Internet Keyboard</description>
-        <description xml:lang="en_GB">Logitech Internet Keyboard</description>
-        <description xml:lang="fr">clavier Logitech Internet</description>
-        <description xml:lang="hu">Logitech Internet Keyboard</description>
-        <description xml:lang="nl">Logitech internet toetsenbord</description>
-        <description xml:lang="ru">Logitech Internet Keyboard</description>
-        <description xml:lang="sk">Logitech Internet Keyboard</description>
-        <description xml:lang="sq">Tastierë për Internet Logitech</description>
-        <description xml:lang="sr">Logitech Интернет тастатура</description>
-        <description xml:lang="sv">Logitech Internettangentbord</description>
-        <description xml:lang="tr">Logitech Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Logitech Internet Keyboard</description>
-        <description xml:lang="vi">Bàn phím Internet Logitech</description>
-        <description xml:lang="zh_CN">罗技网际键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logiink</name>
-        <description>Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="af">Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="az">Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="bg">Logitech клавиатура за Интернет навигация</description>
-        <description xml:lang="cs">Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="da">Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="en_GB">Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="fr">clavier Logitech Internet Navigator</description>
-        <description xml:lang="hu">Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="nl">Logitech Internet Navigator toetsenbord</description>
-        <description xml:lang="ru">Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="sk">Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="sq">Tastierë Logitech Internet Navigator</description>
-        <description xml:lang="sr">Logitech Интернет навигатор тастатура</description>
-        <description xml:lang="sv">Logitech Internet Navigator-tangentbord</description>
-        <description xml:lang="tr">Logitech Örütbağ Tarayıcı Klavyesi</description>
-        <description xml:lang="uk">Logitech Internet Navigator Keyboard</description>
-        <description xml:lang="vi">Bàn phím Logitech Internet Navigator</description>
-        <description xml:lang="zh_CN">罗技网际导航键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>itouchin</name>
-        <description>Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="af">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="az">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="bg">Logitech клавиатура за Интернет навигация</description>
-        <description xml:lang="cs">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="da">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="en_GB">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="fr">clavier Logitech iTouch Internet Navigator</description>
-        <description xml:lang="hu">Logitech iTouch Keyboard Internet Navigator</description>
-        <description xml:lang="nl">Logitech iTouch toetsenbord Internet Navigator</description>
-        <description xml:lang="ru">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="rw">Mwandikisho</description>
-        <description xml:lang="sk">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="sq">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="sr">Logitech iTouch тастатура Интернет навигатор</description>
-        <description xml:lang="sv">Logitech iTouch-tangentbord Internet Navigator</description>
-        <description xml:lang="tr">Logitech iTouch klavyesi Örütbağ Tarayıcı</description>
-        <description xml:lang="uk">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="vi">Logitech iTouch keyboard Internet Navigator</description>
-        <description xml:lang="zh_CN">罗技 iTouch 键盘网际导航器</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>logiultrax</name>
-        <description>Logitech Ultra-X Keyboard</description>
-        <description xml:lang="ru">Logitech Ultra-X Keyboard</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>mx1998</name>
-        <description>Memorex MX1998</description>
-        <description xml:lang="af">Memorex MX1998</description>
-        <description xml:lang="az">Memorex MX1998</description>
-        <description xml:lang="cs">Memorex MX1998</description>
-        <description xml:lang="da">Memorex MX1998</description>
-        <description xml:lang="en_GB">Memorex MX1998</description>
-        <description xml:lang="fr">Memorex MX1998</description>
-        <description xml:lang="hu">Memorex MX1998</description>
-        <description xml:lang="nl">Memorex MX1998</description>
-        <description xml:lang="ru">Memorex MX1998</description>
-        <description xml:lang="sk">Memorex MX1998</description>
-        <description xml:lang="sq">Memorex MX1998</description>
-        <description xml:lang="sr">Memorex MX1998</description>
-        <description xml:lang="sv">Memorex MX1998</description>
-        <description xml:lang="tr">Memorex MX1998</description>
-        <description xml:lang="uk">Memorex MX1998</description>
-        <description xml:lang="vi">Memorex MX1998</description>
-        <description xml:lang="zh_CN">Memorex MX1998</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>mx2500</name>
-        <description>Memorex MX2500 EZ-Access Keyboard</description>
-        <description xml:lang="af">Memorex MX2500 EZ-Access Keyboard</description>
-        <description xml:lang="az">Memorex MX2500 EZ-Access Keyboard</description>
-        <description xml:lang="cs">Memorex MX2500 EZ-Access Keyboard</description>
-        <description xml:lang="da">Memorex MX2500 EZ-Access Keyboard</description>
-        <description xml:lang="en_GB">Memorex MX2500 EZ-Access Keyboard</description>
-        <description xml:lang="fr">clavier Memorex MX2500 EZ-Access</description>
-        <description xml:lang="hu">Memorex MX2500 EZ-Access billentyűzet</description>
-        <description xml:lang="nl">Memorex MX2500 EZ-Access toetsenbord</description>
-        <description xml:lang="ru">Memorex MX2500 EZ-Access Keyboard</description>
-        <description xml:lang="sk">Memorex MX2500 EZ-Access Keyboard</description>
-        <description xml:lang="sq">Tastierë Memorex MX2500 EZ-Access</description>
-        <description xml:lang="sr">Memorex MX2500 EZ-Access тастатура</description>
-        <description xml:lang="sv">Memorex MX2500 EZ-Access-tangentbord</description>
-        <description xml:lang="tr">Memorex MX2500 EZ Erişim Klavyesi</description>
-        <description xml:lang="uk">Memorex MX2500 EZ-Access Keyboard</description>
-        <description xml:lang="vi">Bàn phím Memorex MX2500 EZ-Access</description>
-        <description xml:lang="zh_CN">Memorex MX2500 EZ-Access 键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>mx2750</name>
-        <description>Memorex MX2750</description>
-        <description xml:lang="af">Memorex MX2750</description>
-        <description xml:lang="az">Memorex MX2750</description>
-        <description xml:lang="cs">Memorex MX2750</description>
-        <description xml:lang="da">Memorex MX2750</description>
-        <description xml:lang="en_GB">Memorex MX2750</description>
-        <description xml:lang="fr">Memorex MX2750</description>
-        <description xml:lang="hu">Memorex MX2750</description>
-        <description xml:lang="nl">Memorex MX2750</description>
-        <description xml:lang="ru">Memorex MX2750</description>
-        <description xml:lang="sk">Memorex MX2750</description>
-        <description xml:lang="sq">Memorex MX2750</description>
-        <description xml:lang="sr">Memorex MX2750</description>
-        <description xml:lang="sv">Memorex MX2750</description>
-        <description xml:lang="tr">Memorex MX2750</description>
-        <description xml:lang="uk">Memorex MX2750</description>
-        <description xml:lang="vi">Memorex MX2750</description>
-        <description xml:lang="zh_CN">Memorex MX2750</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>microsoftinet</name>
-        <description>Microsoft Internet Keyboard</description>
-        <description xml:lang="af">Microsoft Internetsleutelbord</description>
-        <description xml:lang="az">Microsoft Internet Keyboard</description>
-        <description xml:lang="bg">Интернет клавиатура на Chicony</description>
-        <description xml:lang="cs">Microsoft Internet Keyboard</description>
-        <description xml:lang="da">Microsoft Internet Keyboard</description>
-        <description xml:lang="en_GB">Microsoft Internet Keyboard</description>
-        <description xml:lang="fr">clavier Microsoft Internet</description>
-        <description xml:lang="hu">Microsoft Internet Keyboard</description>
-        <description xml:lang="nl">Microsoft internet toetsenbord</description>
-        <description xml:lang="ru">Microsoft Internet Keyboard</description>
-        <description xml:lang="sk">Microsoft Internet Keyboard</description>
-        <description xml:lang="sq">Tastierë Microsoft Internet</description>
-        <description xml:lang="sr">Микрософтова Интернет тастатура</description>
-        <description xml:lang="sv">Microsoft Internet Keyboard</description>
-        <description xml:lang="tr">Microsoft Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Microsoft Internet Keyboard</description>
-        <description xml:lang="vi">Bàn phím Internet Microsoft</description>
-        <description xml:lang="zh_CN">微软网际键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>microsoftpro</name>
-        <description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="af">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="az">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="cs">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="da">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="en_GB">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="fr">clavier Microsoft Natural Pro / Microsoft Internet Pro</description>
-        <description xml:lang="hu">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="nl">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="ru">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="sk">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="sq">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="sr">Микрософт Натурал тастатура Про / Микрософт Интернет тастатура Про </description>
-        <description xml:lang="sv">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="tr">Microsoft Basit Klavye Pro / Microsoft Örütbağ Klavyesi Pro</description>
-        <description xml:lang="uk">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="vi">Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="zh_CN">微软自然键盘增强版/微软网际键盘增强版</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>microsoftprousb</name>
-        <description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="en_GB">Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="nl">Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="ru">Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</description>
-        <description xml:lang="vi">Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>microsoftprooem</name>
-        <description>Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="af">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="az">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="bg">Microsoft Natural Pro</description>
-        <description xml:lang="cs">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="da">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="en_GB">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="fr">clavier Microsoft Natural Pro OEM</description>
-        <description xml:lang="hu">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="nl">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="ru">Microsoft·Natural·Keyboard·Pro·OEM</description>
-        <description xml:lang="sk">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="sq">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="sr">Микрософт Натурал тастатура Про ОЕМ</description>
-        <description xml:lang="sv">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="tr">Microsoft Basit Klavye Pro OEM</description>
-        <description xml:lang="uk">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="vi">Microsoft Natural Keyboard Pro OEM</description>
-        <description xml:lang="zh_CN">微软自然键盘增强版 OEM</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>microsoftprose</name>
-        <description>Microsoft Internet Keyboard Pro, Swedish</description>
-        <description xml:lang="af">Microsoft Internet Keyboard Pro, Sweeds</description>
-        <description xml:lang="az">Microsoft Internet Keyboard Pro, Swedish</description>
-        <description xml:lang="bg">Интернет клавиатура на Chicony</description>
-        <description xml:lang="cs">Microsoft Internet Keyboard Pro, Švédská</description>
-        <description xml:lang="da">Microsoft Internet Keyboard Pro, svensk</description>
-        <description xml:lang="en_GB">Microsoft Internet Keyboard Pro, Swedish</description>
-        <description xml:lang="fr">clavier Microsoft Internet Pro, Suédois</description>
-        <description xml:lang="hu">Microsoft Internet Keyboard Pro, svéd</description>
-        <description xml:lang="nl">Microsoft Internet Keyboard Pro, Zweeds</description>
-        <description xml:lang="ru">Microsoft Internet Keyboard Pro, шведская</description>
-        <description xml:lang="sk">Microsoft Internet Keyboard Pro, Švédska</description>
-        <description xml:lang="sq">Microsoft Internet Keyboard Pro, Suedeze</description>
-        <description xml:lang="sr">Микрософтова Интернет Про тастатура, шведски</description>
-        <description xml:lang="sv">Microsoft Internet Keyboard Pro, svensk</description>
-        <description xml:lang="tr">Microsoft Örütbağ Klavyesi Pro, İsveçce</description>
-        <description xml:lang="uk">Microsoft Internet Keyboard Pro, шведська</description>
-        <description xml:lang="vi">Bàn phím Internet Microsoft Pro, Thụy Điển</description>
-        <description xml:lang="zh_CN">微软网际键盘增强版,瑞典</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>microsoftoffice</name>
-        <description>Microsoft Office Keyboard</description>
-        <description xml:lang="af">Microsoft Office sleutelbord</description>
-        <description xml:lang="az">Microsoft Office Keyboard</description>
-        <description xml:lang="cs">Microsoft Office Keyboard</description>
-        <description xml:lang="da">Microsoft Office Keyboard</description>
-        <description xml:lang="en_GB">Microsoft Office Keyboard</description>
-        <description xml:lang="fr">clavier Microsoft Office</description>
-        <description xml:lang="hu">Microsoft Office billentyűzet</description>
-        <description xml:lang="nl">Microsoft Office toetsenbord</description>
-        <description xml:lang="ru">Microsoft Office Keyboard</description>
-        <description xml:lang="sk">Microsoft Office Keyboard</description>
-        <description xml:lang="sq">Tastierë Microsoft Office</description>
-        <description xml:lang="sr">Микрософтова канцеларијска тастатура</description>
-        <description xml:lang="sv">Microsoft Office-tangentbord</description>
-        <description xml:lang="tr">Microsoft Ofis Klavyesi</description>
-        <description xml:lang="uk">Microsoft Office Keyboard</description>
-        <description xml:lang="vi">Bàn phím Văn phòng Microsoft</description>
-        <description xml:lang="zh_CN">微软 Office 键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>microsoftmult</name> 
-        <description>Microsoft Wireless Multimedia Keyboard 1.0A</description>
-        <description xml:lang="en_GB">Microsoft Wireless Multimedia Keyboard 1.0A</description>
-        <description xml:lang="nl">Microsoft draadloos multimediatoetsenbord 1.0A</description>
-        <description xml:lang="ru">Microsoft Wireless Multimedia Keyboard 1.0A</description>
-        <description xml:lang="rw">1.</description>
-        <description xml:lang="vi">Microsoft Wireless Multimedia Keyboard 1.0A</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>oretec</name>
-        <description>Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="af">Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="az">Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="bg">Logitech Интернет клавиатура</description>
-        <description xml:lang="cs">Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="da">Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="en_GB">Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="fr">Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="hu">Oretec MCK-800 MM/Internet billentyűzet</description>
-        <description xml:lang="nl">Oretec MCK-800 MM/Internet toetsenbord</description>
-        <description xml:lang="ru">Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="rw">Mwandikisho</description>
-        <description xml:lang="sk">Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="sq">Tastierë Oretec MCK-800 MM/Internet</description>
-        <description xml:lang="sr">Oretec MCK-800 ММ/Интернет тастатура</description>
-        <description xml:lang="sv">Oretec MCK-800 MM/Internet-tangentbord</description>
-        <description xml:lang="tr">Oretec MCK-800 MM/Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Oretec MCK-800 MM/Internet keyboard</description>
-        <description xml:lang="vi">Bàn phím Oretec MCK-800 MM/Internet</description>
-        <description xml:lang="zh_CN">Oretec MCK-800 MM/网际键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>propeller</name>
-        <description>Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="af">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="az">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="cs">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="da">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="en_GB">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="fr">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="hu">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="nl">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="ru">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="rw">1000</description>
-        <description xml:lang="sk">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="sq">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="sr">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="sv">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="tr">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="uk">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="vi">Propeller Voyager (KTEZ-1000)</description>
-        <description xml:lang="zh_CN">Propeller Voyager (KTEZ-1000)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>qtronix</name>
-        <description>QTronix Scorpius 98N+</description>
-        <description xml:lang="af">QTronix Scorpius 98N+</description>
-        <description xml:lang="az">QTronix Scorpius 98N+</description>
-        <description xml:lang="cs">QTronix Scorpius 98N+</description>
-        <description xml:lang="da">QTronix Scorpius 98N+</description>
-        <description xml:lang="en_GB">QTronix Scorpius 98N+</description>
-        <description xml:lang="fr">QTronix Scorpius 98N+</description>
-        <description xml:lang="hu">QTronix Scorpius 98N+</description>
-        <description xml:lang="nl">QTronix Scorpius 98N+</description>
-        <description xml:lang="ru">QTronix Scorpius 98N+</description>
-        <description xml:lang="sk">QTronix Scorpius 98N+</description>
-        <description xml:lang="sq">QTronix Scorpius 98N+</description>
-        <description xml:lang="sr">QTronix Scorpius 98N+</description>
-        <description xml:lang="sv">QTronix Scorpius 98N+</description>
-        <description xml:lang="tr">QTronix Scorpius 98N+</description>
-        <description xml:lang="uk">QTronix Scorpius 98N+</description>
-        <description xml:lang="vi">QTronix Scorpius 98N+</description>
-        <description xml:lang="zh_CN">QTronix Scorpius 98N+</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>samsung4500</name>
-        <description>Samsung SDM 4500P</description>
-        <description xml:lang="af">Samsung SDM 4500P</description>
-        <description xml:lang="az">Samsung SDM 4500P</description>
-        <description xml:lang="cs">Samsung SDM 4500P</description>
-        <description xml:lang="da">Samsung SDM 4500P</description>
-        <description xml:lang="en_GB">Samsung SDM 4500P</description>
-        <description xml:lang="fr">Samsung SDM 4500P</description>
-        <description xml:lang="hu">Samsung SDM 4500P</description>
-        <description xml:lang="nl">Samsung SDM 4500P</description>
-        <description xml:lang="ru">Samsung SDM 4500P</description>
-        <description xml:lang="sk">Samsung SDM 4500P</description>
-        <description xml:lang="sq">Samsung SDM 4500P</description>
-        <description xml:lang="sr">Samsung SDM 4500P</description>
-        <description xml:lang="sv">Samsung SDM 4500P</description>
-        <description xml:lang="tr">Samsung SDM 4500P</description>
-        <description xml:lang="uk">Samsung SDM 4500P</description>
-        <description xml:lang="vi">Samsung SDM 4500P</description>
-        <description xml:lang="zh_CN">三星 SDM 4500P</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>samsung4510</name>
-        <description>Samsung SDM 4510P</description>
-        <description xml:lang="af">Samsung SDM 4510P</description>
-        <description xml:lang="az">Samsung SDM 4510P</description>
-        <description xml:lang="cs">Samsung SDM 4510P</description>
-        <description xml:lang="da">Samsung SDM 4510P</description>
-        <description xml:lang="en_GB">Samsung SDM 4510P</description>
-        <description xml:lang="fr">Samsung SDM 4510P</description>
-        <description xml:lang="hu">Samsung SDM 4510P</description>
-        <description xml:lang="nl">Samsung SDM 4510P</description>
-        <description xml:lang="ru">Samsung SDM 4510P</description>
-        <description xml:lang="sk">Samsung SDM 4510P</description>
-        <description xml:lang="sq">Samsung SDM 4510P</description>
-        <description xml:lang="sr">Samsung SDM 4510P</description>
-        <description xml:lang="sv">Samsung SDM 4510P</description>
-        <description xml:lang="tr">Samsung SDM 4510P</description>
-        <description xml:lang="uk">Samsung SDM 4510P</description>
-        <description xml:lang="vi">Samsung SDM 4510P</description>
-        <description xml:lang="zh_CN">三星 SDM 4510P</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sk1300</name>
-        <description>SK-1300</description>
-        <description xml:lang="af">SK-1300</description>
-        <description xml:lang="az">SK-1300</description>
-        <description xml:lang="cs">SK-1300</description>
-        <description xml:lang="da">SK-1300</description>
-        <description xml:lang="en_GB">SK-1300</description>
-        <description xml:lang="fr">SK-1300</description>
-        <description xml:lang="hu">SK-1300</description>
-        <description xml:lang="nl">SK-1300</description>
-        <description xml:lang="ru">SK-1300</description>
-        <description xml:lang="sk">SK-1300</description>
-        <description xml:lang="sq">SK-1300</description>
-        <description xml:lang="sr">SK-1300</description>
-        <description xml:lang="sv">SK-1300</description>
-        <description xml:lang="tr">SK-1300</description>
-        <description xml:lang="uk">SK-1300</description>
-        <description xml:lang="vi">SK-1300</description>
-        <description xml:lang="zh_CN">SK-1300</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sk2500</name>
-        <description>SK-2500</description>
-        <description xml:lang="af">SK-2500</description>
-        <description xml:lang="az">SK-2500</description>
-        <description xml:lang="cs">SK-2500</description>
-        <description xml:lang="da">SK-2500</description>
-        <description xml:lang="en_GB">SK-2500</description>
-        <description xml:lang="fr">SK-2500</description>
-        <description xml:lang="hu">SK-2500</description>
-        <description xml:lang="nl">SK-2500</description>
-        <description xml:lang="ru">SK-2500</description>
-        <description xml:lang="sk">SK-2500</description>
-        <description xml:lang="sq">SK-2500</description>
-        <description xml:lang="sr">SK-2500</description>
-        <description xml:lang="sv">SK-2500</description>
-        <description xml:lang="tr">SK-2500</description>
-        <description xml:lang="uk">SK-2500</description>
-        <description xml:lang="vi">SK-2500</description>
-        <description xml:lang="zh_CN">SK-2500</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sk6200</name>
-        <description>SK-6200</description>
-        <description xml:lang="af">SK-6200</description>
-        <description xml:lang="az">SK-6200</description>
-        <description xml:lang="cs">SK-6200</description>
-        <description xml:lang="da">SK-6200</description>
-        <description xml:lang="en_GB">SK-6200</description>
-        <description xml:lang="fr">SK-6200</description>
-        <description xml:lang="hu">SK-6200</description>
-        <description xml:lang="nl">SK-6200</description>
-        <description xml:lang="ru">SK-6200</description>
-        <description xml:lang="sk">SK-6200</description>
-        <description xml:lang="sq">SK-6200</description>
-        <description xml:lang="sr">SK-6200</description>
-        <description xml:lang="sv">SK-6200</description>
-        <description xml:lang="tr">SK-6200</description>
-        <description xml:lang="uk">SK-6200</description>
-        <description xml:lang="vi">SK-6200</description>
-        <description xml:lang="zh_CN">SK-6200</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sk7100</name>
-        <description>SK-7100</description>
-        <description xml:lang="af">SK-7100</description>
-        <description xml:lang="az">SK-7100</description>
-        <description xml:lang="cs">SK-7100</description>
-        <description xml:lang="da">SK-7100</description>
-        <description xml:lang="en_GB">SK-7100</description>
-        <description xml:lang="fr">SK-7100</description>
-        <description xml:lang="hu">SK-7100</description>
-        <description xml:lang="nl">SK-7100</description>
-        <description xml:lang="ru">SK-7100</description>
-        <description xml:lang="sk">SK-7100</description>
-        <description xml:lang="sq">SK-7100</description>
-        <description xml:lang="sr">SK-7100</description>
-        <description xml:lang="sv">SK-7100</description>
-        <description xml:lang="tr">SK-7100</description>
-        <description xml:lang="uk">SK-7100</description>
-        <description xml:lang="vi">SK-7100</description>
-        <description xml:lang="zh_CN">SK-7100</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sp_inet</name>
-        <description>Super Power Multimedia Keyboard</description>
-        <description xml:lang="en_GB">Super Power Multimedia Keyboard</description>
-        <description xml:lang="nl">Super Power multimediatoetsenbord</description>
-        <description xml:lang="ru">Super Power Multimedia Keyboard</description>
-        <description xml:lang="vi">Bàn phím Phim nhạc Siêu Năng Lực</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>sven</name>
-        <description>SVEN Ergonomic 2500</description>
-        <description xml:lang="af">SVEN Ergonomic 2500</description>
-        <description xml:lang="az">SVEN Ergonomic 2500</description>
-        <description xml:lang="cs">SVEN Ergonomic 2500</description>
-        <description xml:lang="da">SVEN Ergonomic 2500</description>
-        <description xml:lang="en_GB">SVEN Ergonomic 2500</description>
-        <description xml:lang="fr">SVEN Ergonomic 2500</description>
-        <description xml:lang="hu">SVEN Ergonomic 2500</description>
-        <description xml:lang="nl">SVEN Ergonomic 2500</description>
-        <description xml:lang="ru">SVEN Ergonomic 2500</description>
-        <description xml:lang="sk">SVEN Ergonomic 2500</description>
-        <description xml:lang="sq">SVEN Ergonomic 2500</description>
-        <description xml:lang="sr">SVEN ергономска 2500</description>
-        <description xml:lang="sv">SVEN Ergonomic 2500</description>
-        <description xml:lang="tr">SVEN Ergonomik 2500</description>
-        <description xml:lang="uk">SVEN Ergonomic 2500</description>
-        <description xml:lang="vi">SVEN Ergonomic 2500</description>
-        <description xml:lang="zh_CN">SVEN Ergonomic 2500</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>symplon</name>
-        <description>Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="af">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="az">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="cs">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="da">Symplon PaceBook (tablet-pc)</description>
-        <description xml:lang="en_GB">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="fr">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="hu">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="nl">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="ru">Symplon PaceBook (карманный ПК)</description>
-        <description xml:lang="sk">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="sq">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="sr">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="sv">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="tr">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="uk">Symplon PaceBook (переносний ПК)</description>
-        <description xml:lang="vi">Symplon PaceBook (tablet PC)</description>
-        <description xml:lang="zh_CN">Symplon PaceBook(平板电脑)</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>toshiba_s3000</name>
-        <description>Toshiba Satellite S3000</description>
-        <description xml:lang="af">Toshiba Satellite S3000</description>
-        <description xml:lang="az">Toshiba Satellite S3000</description>
-        <description xml:lang="cs">Toshiba Satellite S3000</description>
-        <description xml:lang="da">Toshiba Satellite S3000</description>
-        <description xml:lang="en_GB">Toshiba Satellite S3000</description>
-        <description xml:lang="fr">Toshiba Satellite S3000</description>
-        <description xml:lang="hu">Toshiba Satellite S3000</description>
-        <description xml:lang="nl">Toshiba Satellite S3000</description>
-        <description xml:lang="ru">Toshiba Satellite S3000</description>
-        <description xml:lang="sk">Toshiba Satellite S3000</description>
-        <description xml:lang="sq">Toshiba Satellite S3000</description>
-        <description xml:lang="sr">Toshiba Satellite S3000</description>
-        <description xml:lang="sv">Toshiba Satellite S3000</description>
-        <description xml:lang="tr">Toshiba Satellite S3000</description>
-        <description xml:lang="uk">Toshiba Satellite S3000</description>
-        <description xml:lang="vi">Toshiba Satellite S3000</description>
-        <description xml:lang="zh_CN">东芝 Satellite S3000</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>trust</name>
-        <description>Trust Wireless Keyboard Classic</description>
-        <description xml:lang="af">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="az">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="cs">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="da">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="en_GB">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="fr">clavier classique Trust Wireless</description>
-        <description xml:lang="hu">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="nl">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="ru">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="sk">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="sq">Tastierë klasike Trust Wireless</description>
-        <description xml:lang="sr">Trust класична бежична тастатура</description>
-        <description xml:lang="sv">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="tr">Trust Kablosuz Klasik Klavye</description>
-        <description xml:lang="uk">Trust Wireless Keyboard Classic</description>
-        <description xml:lang="vi">Bàn Phím Cổ điển Không dây Tin tưởng</description>
-        <description xml:lang="zh_CN">Trust 无线经典键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>trustda</name>
-        <description>Trust Direct Access Keyboard</description>
-        <description xml:lang="af">Trust Direct Access Keyboard</description>
-        <description xml:lang="az">Trust Direct Access Keyboard</description>
-        <description xml:lang="cs">Trust Direct Access Keyboard</description>
-        <description xml:lang="da">Trust Direct Access Keyboard</description>
-        <description xml:lang="en_GB">Trust Direct Access Keyboard</description>
-        <description xml:lang="fr">clavier Trust Direct Access</description>
-        <description xml:lang="hu">Trust Direct Access billentyűzet</description>
-        <description xml:lang="nl">Trust Direct Access toetsenbord</description>
-        <description xml:lang="ru">Trust Direct Access Keyboard</description>
-        <description xml:lang="sk">Trust Direct Access Keyboard</description>
-        <description xml:lang="sq">Tastierë Trust Direct Access</description>
-        <description xml:lang="sr">Trust Direct Access тастатура</description>
-        <description xml:lang="sv">Trust Direct Access-tangentbord</description>
-        <description xml:lang="tr">Trust Doğrudan Erişimli Klavye</description>
-        <description xml:lang="uk">Trust Direct Access Keyboard</description>
-        <description xml:lang="vi">Bàn phím Truy cập Thẳng Tin tưởng</description>
-        <description xml:lang="zh_CN">Trust Direct Access 键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>yahoo</name>
-        <description>Yahoo! Internet Keyboard</description>
-        <description xml:lang="af">Yahoo! Internetsleutelbord</description>
-        <description xml:lang="az">Yahoo! Internet Keyboard</description>
-        <description xml:lang="bg">Интернет клавиатура на Chicony</description>
-        <description xml:lang="cs">Yahoo! Internet Keyboard</description>
-        <description xml:lang="da">Yahoo! Internet Keyboard</description>
-        <description xml:lang="en_GB">Yahoo! Internet Keyboard</description>
-        <description xml:lang="fr">clavier Yahoo! Internet</description>
-        <description xml:lang="hu">Yahoo! Internet billentyűzet</description>
-        <description xml:lang="nl">Yahoo! internet toetsenbord</description>
-        <description xml:lang="ru">Yahoo! Internet Keyboard</description>
-        <description xml:lang="sk">Yahoo! Internet Keyboard</description>
-        <description xml:lang="sq">Tastierë Yahoo! Internet</description>
-        <description xml:lang="sr">Yahoo! Интернет тастатура</description>
-        <description xml:lang="sv">Yahoo! Internettangentbord</description>
-        <description xml:lang="tr">Yahoo! Örütbağ Klavyesi</description>
-        <description xml:lang="uk">Yahoo! Internet Keyboard</description>
-        <description xml:lang="vi">Bàn phím Internet Yahoo! </description>
-        <description xml:lang="zh_CN">雅虎网际键盘</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>macintosh</name>
-        <description>Macintosh</description>
-        <description xml:lang="af">Macintosh</description>
-        <description xml:lang="az">Macintosh</description>
-        <description xml:lang="cs">Macintosh</description>
-        <description xml:lang="da">Macintosh</description>
-        <description xml:lang="en_GB">Macintosh</description>
-        <description xml:lang="fr">Macintosh</description>
-        <description xml:lang="hu">Macintosh</description>
-        <description xml:lang="nl">Macintosh</description>
-        <description xml:lang="ru">Macintosh</description>
-        <description xml:lang="rw">masinitoshi</description>
-        <description xml:lang="sk">Macintosh</description>
-        <description xml:lang="sq">Macintosh</description>
-        <description xml:lang="sr">Мекинтош</description>
-        <description xml:lang="sv">Macintosh</description>
-        <description xml:lang="tr">Macintosh</description>
-        <description xml:lang="uk">Macintosh</description>
-        <description xml:lang="vi">Macintosh</description>
-        <description xml:lang="zh_CN">Macintosh</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>macintosh_old</name>
-        <description>Macintosh Old</description>
-        <description xml:lang="af">Macintosh (oud)</description>
-        <description xml:lang="az">Macintosh Old</description>
-        <description xml:lang="cs">Macintosh staré</description>
-        <description xml:lang="da">Macintosh gammel</description>
-        <description xml:lang="en_GB">Macintosh Old</description>
-        <description xml:lang="fr">Macintosh ancien</description>
-        <description xml:lang="hu">Macintosh Old</description>
-        <description xml:lang="nl">Macintosh oud</description>
-        <description xml:lang="ru">Старый Macintosh</description>
-        <description xml:lang="sk">Macintosh staré</description>
-        <description xml:lang="sq">Macintosh i vjetër</description>
-        <description xml:lang="sr">Стари Мекинтош</description>
-        <description xml:lang="sv">Macintosh gammal</description>
-        <description xml:lang="tr">Eski Macintosh</description>
-        <description xml:lang="uk">Старий Macintosh</description>
-        <description xml:lang="vi">Macintosh Cũ</description>
-        <description xml:lang="zh_CN">Macintosh 旧产品</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>powerpcps2</name>
-        <description>PowerPC PS/2</description>
-        <description xml:lang="af">PowerPC PS/2</description>
-        <description xml:lang="az">PowerPC PS/2</description>
-        <description xml:lang="cs">PowerPC PS/2</description>
-        <description xml:lang="da">PowerPC PS/2</description>
-        <description xml:lang="en_GB">PowerPC PS/2</description>
-        <description xml:lang="fr">PowerPC PS/2</description>
-        <description xml:lang="hu">PowerPC PS/2</description>
-        <description xml:lang="nl">PowerPC PS/2</description>
-        <description xml:lang="ru">PowerPC PS/2</description>
-        <description xml:lang="rw">2.</description>
-        <description xml:lang="sk">PowerPC PS/2</description>
-        <description xml:lang="sq">PowerPC PS/2</description>
-        <description xml:lang="sr">PowerPC PS/2</description>
-        <description xml:lang="sv">PowerPC PS/2</description>
-        <description xml:lang="tr">PowerPC PS/2</description>
-        <description xml:lang="uk">PowerPC PS/2</description>
-        <description xml:lang="vi">PowerPC PS/2</description>
-        <description xml:lang="zh_CN">PowerPC PS/2</description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-        <name>acer_tm_800</name>
-        <description>Acer TravelMate 800</description>
-        <description xml:lang="en_GB">Acer TravelMate 800</description>
-        <description xml:lang="ru">Acer TravelMate 800</description>
-      </configItem>
-    </model>
-  </modelList>
-  <layoutList>
-    <layout>
-      <configItem>
-        <name>us</name>
-        <shortDescription>USA</shortDescription>
-        <shortDescription xml:lang="af">VSA</shortDescription>
-        <shortDescription xml:lang="az">ABŞ</shortDescription>
-        <shortDescription xml:lang="cs">USA</shortDescription>
-        <shortDescription xml:lang="da">USA</shortDescription>
-        <shortDescription xml:lang="el">ΗΠΑ</shortDescription>
-        <shortDescription xml:lang="en_GB">USA</shortDescription>
-        <shortDescription xml:lang="fr">USA</shortDescription>
-        <shortDescription xml:lang="hu">USA</shortDescription>
-        <shortDescription xml:lang="nl">USA</shortDescription>
-        <shortDescription xml:lang="ru">США</shortDescription>
-        <shortDescription xml:lang="rw">Amerika</shortDescription>
-        <shortDescription xml:lang="sk">USA</shortDescription>
-        <shortDescription xml:lang="sq">USA</shortDescription>
-        <shortDescription xml:lang="sr">САД</shortDescription>
-        <shortDescription xml:lang="sv">USA</shortDescription>
-        <shortDescription xml:lang="tr">ABD</shortDescription>
-        <shortDescription xml:lang="uk">США</shortDescription>
-        <shortDescription xml:lang="vi">Mỹ</shortDescription>
-        <shortDescription xml:lang="zh_CN">USA</shortDescription>
-        <description>U.S. English</description>
-        <description xml:lang="af">VSA Engels</description>
-        <description xml:lang="az">A.B.Ş. İngiliscəsi</description>
-        <description xml:lang="bg">американска английска</description>
-        <description xml:lang="cs">Anglické (US)</description>
-        <description xml:lang="da">U.S. Engelsk</description>
-        <description xml:lang="el">Αγγλικά ΗΠΑ</description>
-        <description xml:lang="en_GB">U.S. English</description>
-        <description xml:lang="fr">Anglais U.S.</description>
-        <description xml:lang="hu">amerikai angol</description>
-        <description xml:lang="nl">Amerikaans-Engels</description>
-        <description xml:lang="ru">Английская (США)</description>
-        <description xml:lang="rw">U.</description>
-        <description xml:lang="sk">U.S.A. anglické</description>
-        <description xml:lang="sq">U.S. Anglisht</description>
-        <description xml:lang="sr">амерички енглески</description>
-        <description xml:lang="sv">Engelskamerikansk</description>
-        <description xml:lang="tr">Amerikan ingilizcesi</description>
-        <description xml:lang="uk">Англійська (США)</description>
-        <description xml:lang="vi">Anh Mỹ</description>
-        <description xml:lang="zh_CN">美国英语</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>intl</name>
-            <description>International (with dead keys)</description>
-            <description xml:lang="en_GB">International (with dead keys)</description>
-            <description xml:lang="nl">Internationaal (met dode toetsen)</description>
-            <description xml:lang="ru">Международная, со спец. клавишами (dead keys)</description>
-            <description xml:lang="rw">Na: Utubuto</description>
-            <description xml:lang="vi">Quốc tế (với phím chết)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>alt-intl</name>
-            <description>Alternative international (former us_intl)</description>
-            <description xml:lang="en_GB">Alternative international (former us_intl)</description>
-            <description xml:lang="nl">Alternatief internationaal (voormalig us_intl)</description>
-            <description xml:lang="ru">Альтернативная международная (бывшая us_intl)</description>
-            <description xml:lang="rw">Mpuzamahanga</description>
-            <description xml:lang="vi">Quốc tế tương đương (cũ us_intl)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak</name>
-            <description>Dvorak</description>
-            <description xml:lang="af">Dvorak</description>
-            <description xml:lang="az">Dvorak</description>
-            <description xml:lang="bg">Дворак</description>
-            <description xml:lang="cs">Dvorak</description>
-            <description xml:lang="da">Dvorak</description>
-            <description xml:lang="en_GB">Dvorak</description>
-            <description xml:lang="fr">Dvorak</description>
-            <description xml:lang="hu">Dvorak-féle</description>
-            <description xml:lang="nl">Dvorak</description>
-            <description xml:lang="ru">Дворак</description>
-            <description xml:lang="sk">Dvorak</description>
-            <description xml:lang="sq">Dvorak</description>
-            <description xml:lang="sr">дворак</description>
-            <description xml:lang="sv">Dvorak</description>
-            <description xml:lang="tr">Dvorak</description>
-            <description xml:lang="uk">Дворак</description>
-            <description xml:lang="vi">Dvorak</description>
-            <description xml:lang="zh_CN">Dvorak</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>rus</name>
-            <description>Russian phonetic</description>
-            <description xml:lang="ru">Русская фонетическая</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ara</name>
-        <shortDescription>Ara</shortDescription>
-        <shortDescription xml:lang="el">Αρα</shortDescription>
-        <shortDescription xml:lang="en_GB">Ara</shortDescription>
-        <shortDescription xml:lang="nl">Fra</shortDescription>
-        <shortDescription xml:lang="ru">Ара</shortDescription>
-        <shortDescription xml:lang="vi">Ara</shortDescription>
-        <description>Arabic</description>
-        <description xml:lang="af">Arabies</description>
-        <description xml:lang="az">Ərəbcə</description>
-        <description xml:lang="bg">арабска</description>
-        <description xml:lang="cs">Arabské</description>
-        <description xml:lang="da">Arabisk</description>
-        <description xml:lang="el">Αραβικό</description>
-        <description xml:lang="en_GB">Arabic</description>
-        <description xml:lang="fr">Arabe</description>
-        <description xml:lang="hu">arab</description>
-        <description xml:lang="nl">Arabisch</description>
-        <description xml:lang="ru">Арабская</description>
-        <description xml:lang="rw">Icyarabu</description>
-        <description xml:lang="sk">Arabsky</description>
-        <description xml:lang="sq">Arabe</description>
-        <description xml:lang="sr">арапски</description>
-        <description xml:lang="sv">Arabisk</description>
-        <description xml:lang="tr">Arapça</description>
-        <description xml:lang="uk">Арабська</description>
-        <description xml:lang="vi">Ả Rập</description>
-        <description xml:lang="zh_CN">阿拉伯</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>azerty</name>
-            <description>azerty</description>
-            <description xml:lang="af">azerty</description>
-            <description xml:lang="az">azerty</description>
-            <description xml:lang="cs">azerty</description>
-            <description xml:lang="da">azerty</description>
-            <description xml:lang="en_GB">azerty</description>
-            <description xml:lang="fr">azerty</description>
-            <description xml:lang="hu">azerty</description>
-            <description xml:lang="nl">azerty</description>
-            <description xml:lang="ru">azerty</description>
-            <description xml:lang="sk">azerty</description>
-            <description xml:lang="sq">azerty</description>
-            <description xml:lang="sr">azerty</description>
-            <description xml:lang="sv">azerty</description>
-            <description xml:lang="tr">azerty</description>
-            <description xml:lang="uk">azerty</description>
-            <description xml:lang="vi">azerty</description>
-            <description xml:lang="zh_CN">azerty</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>azerty_digits</name>
-            <description>azerty/digits</description>
-            <description xml:lang="af">azerty/syfers</description>
-            <description xml:lang="az">azerty/ədədlər</description>
-            <description xml:lang="cs">azerty/číslice</description>
-            <description xml:lang="da">azerty/cifre</description>
-            <description xml:lang="en_GB">azerty/digits</description>
-            <description xml:lang="fr">azerty/chiffres</description>
-            <description xml:lang="hu">azerty/számjegyek</description>
-            <description xml:lang="nl">azerty/cijfers</description>
-            <description xml:lang="ru">azerty/цифры</description>
-            <description xml:lang="sk">azerty/číslice</description>
-            <description xml:lang="sq">azerty/digits</description>
-            <description xml:lang="sr">azerty/цифре</description>
-            <description xml:lang="sv">azerty/siffror</description>
-            <description xml:lang="tr">azerty/rakamlar</description>
-            <description xml:lang="uk">azerty/цифри</description>
-            <description xml:lang="vi">azerty/chữ số</description>
-            <description xml:lang="zh_CN">azerty/数字</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>digits</name>
-            <description>digits</description>
-            <description xml:lang="af">syfers</description>
-            <description xml:lang="az">ədədlər</description>
-            <description xml:lang="cs">číslice</description>
-            <description xml:lang="da">cifre</description>
-            <description xml:lang="en_GB">digits</description>
-            <description xml:lang="fr">chiffres</description>
-            <description xml:lang="hu">számjegyek</description>
-            <description xml:lang="nl">cijfers</description>
-            <description xml:lang="ru">цифры</description>
-            <description xml:lang="sk">číslice</description>
-            <description xml:lang="sq">numra</description>
-            <description xml:lang="sr">цифре</description>
-            <description xml:lang="sv">siffror</description>
-            <description xml:lang="tr">rakamlar</description>
-            <description xml:lang="uk">цифри</description>
-            <description xml:lang="vi">chữ số</description>
-            <description xml:lang="zh_CN">数字</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>qwerty</name>
-            <description>qwerty</description>
-            <description xml:lang="af">qwerty</description>
-            <description xml:lang="az">qwerty</description>
-            <description xml:lang="bg">чешка (qwerty)</description>
-            <description xml:lang="cs">qwerty</description>
-            <description xml:lang="da">qwerty</description>
-            <description xml:lang="en_GB">qwerty</description>
-            <description xml:lang="fr">qwerty</description>
-            <description xml:lang="hu">qwerty</description>
-            <description xml:lang="nl">qwerty</description>
-            <description xml:lang="ru">qwerty</description>
-            <description xml:lang="sk">qwerty</description>
-            <description xml:lang="sq">qwerty</description>
-            <description xml:lang="sr">qwerty</description>
-            <description xml:lang="sv">qwerty</description>
-            <description xml:lang="tr">qwerty</description>
-            <description xml:lang="uk">qwerty</description>
-            <description xml:lang="vi">qwerty</description>
-            <description xml:lang="zh_CN">qwerty</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>qwerty_digits</name>
-            <description>qwerty/digits</description>
-            <description xml:lang="af">qwerty/syfers</description>
-            <description xml:lang="az">qwerty/ədədlər</description>
-            <description xml:lang="cs">qwerty/číslice</description>
-            <description xml:lang="da">qwerty/cifre</description>
-            <description xml:lang="en_GB">qwerty/digits</description>
-            <description xml:lang="fr">qwerty/chiffres</description>
-            <description xml:lang="hu">qwerty/számjegyek</description>
-            <description xml:lang="nl">qwerty/cijfers</description>
-            <description xml:lang="ru">qwerty/цифры</description>
-            <description xml:lang="sk">qwerty/číslice</description>
-            <description xml:lang="sq">qwerty/numra</description>
-            <description xml:lang="sr">qwerty/цифре</description>
-            <description xml:lang="sv">qwerty/siffror</description>
-            <description xml:lang="tr">qwerty/rakamlar</description>
-            <description xml:lang="uk">qwerty/цифри</description>
-            <description xml:lang="vi">qwerty/chữ số</description>
-            <description xml:lang="zh_CN">qwerty/digits</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>al</name>
-        <shortDescription>Alb</shortDescription>
-        <shortDescription xml:lang="af">Alb</shortDescription>
-        <shortDescription xml:lang="az">Alb</shortDescription>
-        <shortDescription xml:lang="cs">Alb</shortDescription>
-        <shortDescription xml:lang="da">Alb</shortDescription>
-        <shortDescription xml:lang="en_GB">Alb</shortDescription>
-        <shortDescription xml:lang="fr">Alb</shortDescription>
-        <shortDescription xml:lang="hu">Alb</shortDescription>
-        <shortDescription xml:lang="nl">Alb</shortDescription>
-        <shortDescription xml:lang="ru">Алб</shortDescription>
-        <shortDescription xml:lang="sk">Alb</shortDescription>
-        <shortDescription xml:lang="sq">Alb</shortDescription>
-        <shortDescription xml:lang="sr">алб</shortDescription>
-        <shortDescription xml:lang="sv">Alb</shortDescription>
-        <shortDescription xml:lang="tr">Arn</shortDescription>
-        <shortDescription xml:lang="uk">Алб</shortDescription>
-        <shortDescription xml:lang="vi">Alb</shortDescription>
-        <shortDescription xml:lang="zh_CN">Alb</shortDescription>
-        <description>Albania</description>
-        <description xml:lang="en_GB">Albania</description>
-        <description xml:lang="nl">Albanië</description>
-        <description xml:lang="ru">Албания</description>
-        <description xml:lang="rw">Alubaniya</description>
-        <description xml:lang="vi">Al-ba-ni-a</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>am</name>
-        <shortDescription>Arm</shortDescription>
-        <shortDescription xml:lang="af">Arm</shortDescription>
-        <shortDescription xml:lang="az">Erm</shortDescription>
-        <shortDescription xml:lang="bg">арабска</shortDescription>
-        <shortDescription xml:lang="cs">Arm</shortDescription>
-        <shortDescription xml:lang="da">Arm</shortDescription>
-        <shortDescription xml:lang="el">Αρμ</shortDescription>
-        <shortDescription xml:lang="en_GB">Arm</shortDescription>
-        <shortDescription xml:lang="fr">Arm</shortDescription>
-        <shortDescription xml:lang="hu">Arm</shortDescription>
-        <shortDescription xml:lang="nl">Arm</shortDescription>
-        <shortDescription xml:lang="ru">Арм</shortDescription>
-        <shortDescription xml:lang="sk">Arm</shortDescription>
-        <shortDescription xml:lang="sq">Arm</shortDescription>
-        <shortDescription xml:lang="sr">јрм</shortDescription>
-        <shortDescription xml:lang="sv">Arm</shortDescription>
-        <shortDescription xml:lang="tr">Erm</shortDescription>
-        <shortDescription xml:lang="uk">Вірм</shortDescription>
-        <shortDescription xml:lang="vi">Arm</shortDescription>
-        <shortDescription xml:lang="zh_CN">Arm</shortDescription>
-        <description>Armenia</description>
-        <description xml:lang="en_GB">Armenia</description>
-        <description xml:lang="nl">Armenië</description>
-        <description xml:lang="ru">Армения</description>
-        <description xml:lang="rw">Arumeniya</description>
-        <description xml:lang="vi">Ác-mê-ni</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>phonetic</name>
-            <description>Phonetic</description>
-            <description xml:lang="af">Foneties</description>
-            <description xml:lang="az">Fonetik</description>
-            <description xml:lang="cs">Fonetické</description>
-            <description xml:lang="da">Fonetisk</description>
-            <description xml:lang="el">Φωνητικά</description>
-            <description xml:lang="en_GB">Phonetic</description>
-            <description xml:lang="fr">Phonétique</description>
-            <description xml:lang="hu">fonetikus</description>
-            <description xml:lang="nl">Fonetisch</description>
-            <description xml:lang="ru">Фонетическая</description>
-            <description xml:lang="rw">Nyigamvugo:</description>
-            <description xml:lang="sk">Fonetické</description>
-            <description xml:lang="sq">Phonetic</description>
-            <description xml:lang="sr">фонетски</description>
-            <description xml:lang="sv">Fonetisk</description>
-            <description xml:lang="tr">Fonetik</description>
-            <description xml:lang="uk">Фонетична</description>
-            <description xml:lang="vi">Ngữ âm</description>
-            <description xml:lang="zh_CN">Phonetic</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>az</name>
-        <shortDescription>Aze</shortDescription>
-        <shortDescription xml:lang="af">Aze</shortDescription>
-        <shortDescription xml:lang="az">Azə</shortDescription>
-        <shortDescription xml:lang="cs">Aze</shortDescription>
-        <shortDescription xml:lang="da">Ase</shortDescription>
-        <shortDescription xml:lang="el">Αζε</shortDescription>
-        <shortDescription xml:lang="en_GB">Aze</shortDescription>
-        <shortDescription xml:lang="fr">Aze</shortDescription>
-        <shortDescription xml:lang="hu">Aze</shortDescription>
-        <shortDescription xml:lang="nl">Aze</shortDescription>
-        <shortDescription xml:lang="ru">Азер</shortDescription>
-        <shortDescription xml:lang="sk">Aze</shortDescription>
-        <shortDescription xml:lang="sq">Aze</shortDescription>
-        <shortDescription xml:lang="sr">азб</shortDescription>
-        <shortDescription xml:lang="sv">Aze</shortDescription>
-        <shortDescription xml:lang="tr">Aze</shortDescription>
-        <shortDescription xml:lang="uk">Азер</shortDescription>
-        <shortDescription xml:lang="vi">Aze</shortDescription>
-        <shortDescription xml:lang="zh_CN">Aze</shortDescription>
-        <description>Azerbaijan</description>
-        <description xml:lang="en_GB">Azerbaijan</description>
-        <description xml:lang="nl">Azerbeidzjan</description>
-        <description xml:lang="ru">Азербайджан</description>
-        <description xml:lang="rw">Azeribayijani</description>
-        <description xml:lang="vi">A-zéc-bai-gian</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>cyrillic</name>
-            <description>Cyrillic</description>
-            <description xml:lang="af">Kirrillies</description>
-            <description xml:lang="az">Kiril</description>
-            <description xml:lang="cs">Cyrilika</description>
-            <description xml:lang="da">Kyrillisk</description>
-            <description xml:lang="el">Κυριλλικά</description>
-            <description xml:lang="en_GB">Cyrillic</description>
-            <description xml:lang="fr">Cérillique</description>
-            <description xml:lang="hu">cirill</description>
-            <description xml:lang="nl">Cyrillisch</description>
-            <description xml:lang="ru">Кириллическая</description>
-            <description xml:lang="rw">Nyasilike</description>
-            <description xml:lang="sk">Cyrilika</description>
-            <description xml:lang="sq">Cyrillic</description>
-            <description xml:lang="sr">ћирилични</description>
-            <description xml:lang="sv">Kyrillisk</description>
-            <description xml:lang="tr">Kril</description>
-            <description xml:lang="uk">Кирилична</description>
-            <description xml:lang="vi">Cyrillic</description>
-            <description xml:lang="zh_CN">西里尔</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>by</name>
-        <shortDescription>Blr</shortDescription>
-        <shortDescription xml:lang="af">Blr</shortDescription>
-        <shortDescription xml:lang="az">Blr</shortDescription>
-        <shortDescription xml:lang="cs">Běl</shortDescription>
-        <shortDescription xml:lang="da">Blr</shortDescription>
-        <shortDescription xml:lang="en_GB">Blr</shortDescription>
-        <shortDescription xml:lang="fr">Blr</shortDescription>
-        <shortDescription xml:lang="hu">Blr</shortDescription>
-        <shortDescription xml:lang="nl">Blr</shortDescription>
-        <shortDescription xml:lang="ru">Бел</shortDescription>
-        <shortDescription xml:lang="sk">Blr</shortDescription>
-        <shortDescription xml:lang="sq">Blr</shortDescription>
-        <shortDescription xml:lang="sr">блр</shortDescription>
-        <shortDescription xml:lang="sv">Blr</shortDescription>
-        <shortDescription xml:lang="tr">Blr</shortDescription>
-        <shortDescription xml:lang="uk">Біл</shortDescription>
-        <shortDescription xml:lang="vi">Blr</shortDescription>
-        <shortDescription xml:lang="zh_CN">Blr</shortDescription>
-        <description>Belarus</description>
-        <description xml:lang="en_GB">Belarus</description>
-        <description xml:lang="nl">Wit-Rusland</description>
-        <description xml:lang="ru">Беларусь</description>
-        <description xml:lang="rw">Belarusi</description>
-        <description xml:lang="vi">Bê-la-rút</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>winkeys</name>
-            <description>Winkeys</description>
-            <description xml:lang="af">Winkeys</description>
-            <description xml:lang="az">Winkeys</description>
-            <description xml:lang="cs">Winkeys</description>
-            <description xml:lang="da">Win-taster</description>
-            <description xml:lang="en_GB">Winkeys</description>
-            <description xml:lang="fr">Winkeys</description>
-            <description xml:lang="hu">Winkeys</description>
-            <description xml:lang="nl">Win-toetsen</description>
-            <description xml:lang="ru">Клавиатура Windows</description>
-            <description xml:lang="sk">Win klávesy</description>
-            <description xml:lang="sq">Winkeys</description>
-            <description xml:lang="sr">Windows тастери</description>
-            <description xml:lang="sv">Wintangenter</description>
-            <description xml:lang="tr">Win tuşları</description>
-            <description xml:lang="uk">Розкладка Windows</description>
-            <description xml:lang="vi">Phím Win</description>
-            <description xml:lang="zh_CN">Winkeys</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>be</name>
-        <shortDescription>Bel</shortDescription>
-        <shortDescription xml:lang="af">Bel</shortDescription>
-        <shortDescription xml:lang="az">Bel</shortDescription>
-        <shortDescription xml:lang="cs">Bel</shortDescription>
-        <shortDescription xml:lang="da">Bel</shortDescription>
-        <shortDescription xml:lang="el">Λευ</shortDescription>
-        <shortDescription xml:lang="en_GB">Bel</shortDescription>
-        <shortDescription xml:lang="fr">Bel</shortDescription>
-        <shortDescription xml:lang="hu">Bel</shortDescription>
-        <shortDescription xml:lang="nl">Bel</shortDescription>
-        <shortDescription xml:lang="ru">Бельг</shortDescription>
-        <shortDescription xml:lang="sk">Bel</shortDescription>
-        <shortDescription xml:lang="sq">Bel</shortDescription>
-        <shortDescription xml:lang="sr">блг</shortDescription>
-        <shortDescription xml:lang="sv">Bel</shortDescription>
-        <shortDescription xml:lang="tr">Bel</shortDescription>
-        <shortDescription xml:lang="uk">Бельг</shortDescription>
-        <shortDescription xml:lang="vi">Bel</shortDescription>
-        <shortDescription xml:lang="zh_CN">Bel</shortDescription>
-        <description>Belgium</description>
-        <description xml:lang="en_GB">Belgium</description>
-        <description xml:lang="nl">België</description>
-        <description xml:lang="ru">Бельгия</description>
-        <description xml:lang="rw">Ububiligi</description>
-        <description xml:lang="vi">Bỉ</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>iso-alternate</name>
-            <description>ISO Alternate</description>
-            <description xml:lang="af">ISO Alternatief</description>
-            <description xml:lang="az">ISO Alternate</description>
-            <description xml:lang="cs">ISO alternativní</description>
-            <description xml:lang="da">ISO-alternativ</description>
-            <description xml:lang="en_GB">ISO Alternate</description>
-            <description xml:lang="fr">ISO alternative</description>
-            <description xml:lang="hu">ISO Alternate</description>
-            <description xml:lang="nl">ISO alternatief</description>
-            <description xml:lang="ru">Дополнительная ISO</description>
-            <description xml:lang="sk">ISO alternatívne</description>
-            <description xml:lang="sq">ISO Alternative</description>
-            <description xml:lang="sr">Додатни ИСО</description>
-            <description xml:lang="sv">ISO-alternativ</description>
-            <description xml:lang="tr">ISO diğer</description>
-            <description xml:lang="uk">Додаткова ISO</description>
-            <description xml:lang="vi">ISO Xen kẽ</description>
-            <description xml:lang="zh_CN">ISO 替代</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>sundeadkeys</name>
-            <description>Sun dead keys</description>
-            <description xml:lang="af">Sun (dooie sleutels)</description>
-            <description xml:lang="az">Sun ölü düymələr</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Mrtvé klávesy Sun</description>
-            <description xml:lang="da">Sun døde taster</description>
-            <description xml:lang="en_GB">Sun dead keys</description>
-            <description xml:lang="fr">clés mortes Sun</description>
-            <description xml:lang="hu">Sun halott billentyűk</description>
-            <description xml:lang="nl">Sun dode toetsen</description>
-            <description xml:lang="ru">Специальные клавиши (dead keys) Sun</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Mŕtve klávesy Sun</description>
-            <description xml:lang="sq">Pulsantë të vdekur Sun</description>
-            <description xml:lang="sr">Sun-ови акценти</description>
-            <description xml:lang="sv">Sun stumma tangenter</description>
-            <description xml:lang="tr">Sun ölü tuşlar</description>
-            <description xml:lang="uk">Спеціальні клавіші (dead keys) Sun</description>
-            <description xml:lang="vi">Phím chết Sun</description>
-            <description xml:lang="zh_CN">Sun 死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>bd</name>
-        <shortDescription>Ban</shortDescription>
-        <shortDescription xml:lang="ru">Бан</shortDescription>
-        <description>Bangladesh</description>
-        <description xml:lang="ru">Бангладеш</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>probhat</name>
-            <description>Probhat</description>
-            <description xml:lang="en_GB">Probhat</description>
-            <description xml:lang="nl">Prt</description>
-            <description xml:lang="ru">Пробат</description>
-            <description xml:lang="vi">Probhat</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>in</name>
-        <shortDescription>Ind</shortDescription>
-        <shortDescription xml:lang="ru">Инд</shortDescription>
-        <description>India</description>
-        <description xml:lang="ru">Индия</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>ben</name>
-            <description>Bengali</description>
-            <description xml:lang="af">Bengaals</description>
-            <description xml:lang="az">Benqalca</description>
-            <description xml:lang="bg">бенгалска</description>
-            <description xml:lang="cs">Bengálské</description>
-            <description xml:lang="da">Bengali</description>
-            <description xml:lang="en_GB">Bengali</description>
-            <description xml:lang="fr">Bengali</description>
-            <description xml:lang="hu">bengáli</description>
-            <description xml:lang="nl">Bengaals</description>
-            <description xml:lang="ru">Бенгальская</description>
-            <description xml:lang="rw">Bengali</description>
-            <description xml:lang="sk">Bengálska</description>
-            <description xml:lang="sq">Bengali</description>
-            <description xml:lang="sr">бенгалски</description>
-            <description xml:lang="sv">Bengalisk</description>
-            <description xml:lang="tr">Bengalce</description>
-            <description xml:lang="uk">Бенгальська</description>
-            <description xml:lang="vi">Băng-gan</description>
-            <description xml:lang="zh_CN">孟加拉</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ben_probhat</name>
-            <description>Bengali Probhat</description>
-            <description xml:lang="ru">Бенгальская Пробат</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>guj</name>
-            <description>Gujarati</description>
-            <description xml:lang="af">Gujarati</description>
-            <description xml:lang="az">Gujaraticə</description>
-            <description xml:lang="bg">гуджарати</description>
-            <description xml:lang="cs">Gujarati</description>
-            <description xml:lang="da">Gujarati</description>
-            <description xml:lang="en_GB">Gujarati</description>
-            <description xml:lang="fr">Gujarati</description>
-            <description xml:lang="hu">gudzsarati</description>
-            <description xml:lang="nl">Gujarati</description>
-            <description xml:lang="ru">Гуджарати</description>
-            <description xml:lang="rw">Gujarati</description>
-            <description xml:lang="sk">Gudžarati</description>
-            <description xml:lang="sq">Gujarati</description>
-            <description xml:lang="sr">гујарати</description>
-            <description xml:lang="sv">Gujaratisk</description>
-            <description xml:lang="tr">Batı Hint dili</description>
-            <description xml:lang="uk">Гуяраті</description>
-            <description xml:lang="vi">Gujarati</description>
-            <description xml:lang="zh_CN">古吉拉特</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>guru</name>
-            <description>Gurmukhi</description>
-            <description xml:lang="af">Gurmukhi</description>
-            <description xml:lang="az">Gurmukhi</description>
-            <description xml:lang="bg">гурмуки</description>
-            <description xml:lang="cs">Gurmukhi</description>
-            <description xml:lang="da">Gurmukhi</description>
-            <description xml:lang="en_GB">Gurmukhi</description>
-            <description xml:lang="fr">Gurmukhi</description>
-            <description xml:lang="hu">gurmukhi</description>
-            <description xml:lang="nl">Gurmukhi</description>
-            <description xml:lang="ru">Гурмукхи</description>
-            <description xml:lang="rw">Gurumuki</description>
-            <description xml:lang="sk">Gurmuchské</description>
-            <description xml:lang="sq">Gurmukhi</description>
-            <description xml:lang="sr">гурмуки</description>
-            <description xml:lang="sv">Gurmukhisk</description>
-            <description xml:lang="tr">Gurmukhi</description>
-            <description xml:lang="uk">Гурмукхі</description>
-            <description xml:lang="vi">Gurmukhi</description>
-            <description xml:lang="zh_CN">旁遮普</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>kan</name>
-            <description>Kannada</description>
-            <description xml:lang="af">Kannada</description>
-            <description xml:lang="az">Kannada</description>
-            <description xml:lang="bg">канадска</description>
-            <description xml:lang="cs">Kannadské</description>
-            <description xml:lang="da">Kannada</description>
-            <description xml:lang="en_GB">Kannada</description>
-            <description xml:lang="fr">Kannada</description>
-            <description xml:lang="hu">kannada</description>
-            <description xml:lang="nl">Kannada</description>
-            <description xml:lang="ru">Каннада</description>
-            <description xml:lang="rw">Kannada</description>
-            <description xml:lang="sk">Kannadské</description>
-            <description xml:lang="sq">Kanadeze</description>
-            <description xml:lang="sr">канада (јужна индија)</description>
-            <description xml:lang="sv">Kannada</description>
-            <description xml:lang="tr">Güney Hint dili</description>
-            <description xml:lang="uk">Канадська</description>
-            <description xml:lang="vi">Kannada</description>
-            <description xml:lang="zh_CN">埃纳德</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>mal</name>
-            <description>Malayalam</description>
-            <description xml:lang="af">Malayalam</description>
-            <description xml:lang="az">Malayalamca</description>
-            <description xml:lang="cs">Malajské</description>
-            <description xml:lang="da">Malayalam</description>
-            <description xml:lang="en_GB">Malayalam</description>
-            <description xml:lang="fr">Malayalam</description>
-            <description xml:lang="hu">malajalam</description>
-            <description xml:lang="nl">Malayalamees</description>
-            <description xml:lang="ru">Малайaлам</description>
-            <description xml:lang="rw">Malayalamu</description>
-            <description xml:lang="sk">Malajalamské</description>
-            <description xml:lang="sq">Malayalam</description>
-            <description xml:lang="sr">малајамски</description>
-            <description xml:lang="sv">Malayalam</description>
-            <description xml:lang="tr">Malayalam dili</description>
-            <description xml:lang="uk">Малайська</description>
-            <description xml:lang="vi">Malayalam</description>
-            <description xml:lang="zh_CN">马来西亚</description>
-         </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ori</name>
-            <description>Oriya</description>
-            <description xml:lang="af">Oriya</description>
-            <description xml:lang="az">Oriya</description>
-            <description xml:lang="cs">Oriya</description>
-            <description xml:lang="da">Oriya</description>
-            <description xml:lang="en_GB">Oriya</description>
-            <description xml:lang="fr">Oriya</description>
-            <description xml:lang="hu">orija</description>
-            <description xml:lang="nl">Oriya</description>
-            <description xml:lang="ru">Орийя</description>
-            <description xml:lang="rw">Oriya</description>
-            <description xml:lang="sk">Oriya</description>
-            <description xml:lang="sq">Oriya</description>
-            <description xml:lang="sr">орија</description>
-            <description xml:lang="sv">Oriya</description>
-            <description xml:lang="tr">Orissa dili</description>
-            <description xml:lang="uk">Орія</description>
-            <description xml:lang="vi">Oriya</description>
-            <description xml:lang="zh_CN">Oriya</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_unicode</name>
-            <description>Tamil Unicode</description>
-            <description xml:lang="ru">Тамильская Unicode</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_TAB</name>
-            <description>Tamil TAB Typewriter</description>
-            <description xml:lang="ru">Тамильская "Печатная машинка" TAB</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_TSCII</name>
-            <description>Tamil TSCII Typewriter</description>
-            <description xml:lang="ru">Тамильская "Печатная машинка" TSCII</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam</name>
-            <description>Tamil</description>
-            <description xml:lang="af">Tamilees</description>
-            <description xml:lang="az">Tamilcə</description>
-            <description xml:lang="bg">тамилска</description>
-            <description xml:lang="cs">Tamilské</description>
-            <description xml:lang="da">Tamil</description>
-            <description xml:lang="el">Ταμίλ</description>
-            <description xml:lang="en_GB">Tamil</description>
-            <description xml:lang="fr">Tamoul</description>
-            <description xml:lang="hu">tamil</description>
-            <description xml:lang="nl">Tamil</description>
-            <description xml:lang="ru">Тамильская</description>
-            <description xml:lang="rw">Tamili</description>
-            <description xml:lang="sk">Tamilské</description>
-            <description xml:lang="sq">Tamil</description>
-            <description xml:lang="sr">тамил</description>
-            <description xml:lang="sv">Tamilsk</description>
-            <description xml:lang="tr">Tamil dili</description>
-            <description xml:lang="uk">Тамільська</description>
-            <description xml:lang="vi">Tamil</description>
-            <description xml:lang="zh_CN">泰米尔</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tel</name>
-            <description>Telugu</description>
-            <description xml:lang="af">Telugu</description>
-            <description xml:lang="az">Telugu</description>
-            <description xml:lang="cs">Telugu</description>
-            <description xml:lang="da">Telugu</description>
-            <description xml:lang="el">Τελούγκου</description>
-            <description xml:lang="en_GB">Telugu</description>
-            <description xml:lang="fr">Telugu</description>
-            <description xml:lang="hu">telugu</description>
-            <description xml:lang="nl">Telugu</description>
-            <description xml:lang="ru">Телугу</description>
-            <description xml:lang="rw">Tegulu</description>
-            <description xml:lang="sk">Telugské</description>
-            <description xml:lang="sq">Telugu</description>
-            <description xml:lang="sr">телугу</description>
-            <description xml:lang="sv">Telugo</description>
-            <description xml:lang="tr">Telugu dili</description>
-            <description xml:lang="uk">Телугу</description>
-            <description xml:lang="vi">Telugu</description>
-            <description xml:lang="zh_CN">泰卢固</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>urd</name>
-            <description>Urdu</description>
-            <description xml:lang="el">Ούρντου</description>
-            <description xml:lang="en_GB">Urdu</description>
-            <description xml:lang="nl">Urdu</description>
-            <description xml:lang="ru">Урду</description>
-            <description xml:lang="rw">Urudu</description>
-            <description xml:lang="vi">Ur-du</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ba</name>
-        <shortDescription>Bih</shortDescription>
-        <shortDescription xml:lang="af">Bih</shortDescription>
-        <shortDescription xml:lang="az">Bih</shortDescription>
-        <shortDescription xml:lang="cs">Bos</shortDescription>
-        <shortDescription xml:lang="da">Bih</shortDescription>
-        <shortDescription xml:lang="en_GB">Bih</shortDescription>
-        <shortDescription xml:lang="fr">Bih</shortDescription>
-        <shortDescription xml:lang="hu">Bih</shortDescription>
-        <shortDescription xml:lang="nl">Bih</shortDescription>
-        <shortDescription xml:lang="ru">Босн</shortDescription>
-        <shortDescription xml:lang="sk">Bih</shortDescription>
-        <shortDescription xml:lang="sq">Bih</shortDescription>
-        <shortDescription xml:lang="sr">бос</shortDescription>
-        <shortDescription xml:lang="sv">Bih</shortDescription>
-        <shortDescription xml:lang="tr">Bih</shortDescription>
-        <shortDescription xml:lang="uk">Босн</shortDescription>
-        <shortDescription xml:lang="vi">Bih</shortDescription>
-        <shortDescription xml:lang="zh_CN">Bih</shortDescription>
-        <description>Bosnia and Herzegovina</description>
-        <description xml:lang="en_GB">Bosnia and Herzegovina</description>
-        <description xml:lang="nl">Bosnië-Hercegovina</description>
-        <description xml:lang="ru">Босния и Герцеговина</description>
-        <description xml:lang="rw">Bosiniya na Herizegovina</description>
-        <description xml:lang="vi">Bosnia và Herzegovina</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>br</name>
-        <shortDescription>Bra</shortDescription>
-        <shortDescription xml:lang="af">Bra</shortDescription>
-        <shortDescription xml:lang="az">Bra</shortDescription>
-        <shortDescription xml:lang="cs">Bra</shortDescription>
-        <shortDescription xml:lang="da">Bra</shortDescription>
-        <shortDescription xml:lang="en_GB">Bra</shortDescription>
-        <shortDescription xml:lang="fr">Bra</shortDescription>
-        <shortDescription xml:lang="hu">Bra</shortDescription>
-        <shortDescription xml:lang="nl">Bra</shortDescription>
-        <shortDescription xml:lang="ru">Браз</shortDescription>
-        <shortDescription xml:lang="sk">Bra</shortDescription>
-        <shortDescription xml:lang="sq">Bra</shortDescription>
-        <shortDescription xml:lang="sr">бра</shortDescription>
-        <shortDescription xml:lang="sv">Bra</shortDescription>
-        <shortDescription xml:lang="tr">Bra</shortDescription>
-        <shortDescription xml:lang="uk">Браз</shortDescription>
-        <shortDescription xml:lang="vi">Bra</shortDescription>
-        <shortDescription xml:lang="zh_CN">Bra</shortDescription>
-        <description>Brazil</description>
-        <description xml:lang="en_GB">Brazil</description>
-        <description xml:lang="nl">Brazilië</description>
-        <description xml:lang="ru">Бразилия</description>
-        <description xml:lang="rw">Burezile</description>
-        <description xml:lang="vi">Bra-zil</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>bg</name>
-        <shortDescription>Bgr</shortDescription>
-        <shortDescription xml:lang="af">Bgr</shortDescription>
-        <shortDescription xml:lang="az">Bgr</shortDescription>
-        <shortDescription xml:lang="cs">Bul</shortDescription>
-        <shortDescription xml:lang="da">Bgr</shortDescription>
-        <shortDescription xml:lang="en_GB">Bgr</shortDescription>
-        <shortDescription xml:lang="fr">Bgr</shortDescription>
-        <shortDescription xml:lang="hu">Bgr</shortDescription>
-        <shortDescription xml:lang="nl">Bgr</shortDescription>
-        <shortDescription xml:lang="ru">Болг</shortDescription>
-        <shortDescription xml:lang="sk">Bgr</shortDescription>
-        <shortDescription xml:lang="sq">Bgr</shortDescription>
-        <shortDescription xml:lang="sr">буг</shortDescription>
-        <shortDescription xml:lang="sv">Bgr</shortDescription>
-        <shortDescription xml:lang="tr">Bgr</shortDescription>
-        <shortDescription xml:lang="uk">Болг</shortDescription>
-        <shortDescription xml:lang="vi">Bgr</shortDescription>
-        <shortDescription xml:lang="zh_CN">Bgr</shortDescription>
-        <description>Bulgaria</description>
-        <description xml:lang="en_GB">Bulgaria</description>
-        <description xml:lang="nl">Bulgarije</description>
-        <description xml:lang="ru">Болгария</description>
-        <description xml:lang="rw">Buligariya</description>
-        <description xml:lang="vi">Bun-ga-ri</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>phonetic</name>
-            <description>Phonetic</description>
-            <description xml:lang="af">Foneties</description>
-            <description xml:lang="az">Fonetik</description>
-            <description xml:lang="cs">Fonetické</description>
-            <description xml:lang="da">Fonetisk</description>
-            <description xml:lang="el">Φωνητικά</description>
-            <description xml:lang="en_GB">Phonetic</description>
-            <description xml:lang="fr">Phonétique</description>
-            <description xml:lang="hu">fonetikus</description>
-            <description xml:lang="nl">Fonetisch</description>
-            <description xml:lang="ru">Фонетическая</description>
-            <description xml:lang="rw">Nyigamvugo:</description>
-            <description xml:lang="sk">Fonetické</description>
-            <description xml:lang="sq">Phonetic</description>
-            <description xml:lang="sr">фонетски</description>
-            <description xml:lang="sv">Fonetisk</description>
-            <description xml:lang="tr">Fonetik</description>
-            <description xml:lang="uk">Фонетична</description>
-            <description xml:lang="vi">Ngữ âm</description>
-            <description xml:lang="zh_CN">Phonetic</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>mm</name>
-        <shortDescription>Mmr</shortDescription>
-        <shortDescription xml:lang="af">Mmr</shortDescription>
-        <shortDescription xml:lang="az">Mmr</shortDescription>
-        <shortDescription xml:lang="cs">Mmr</shortDescription>
-        <shortDescription xml:lang="da">Mmr</shortDescription>
-        <shortDescription xml:lang="en_GB">Mmr</shortDescription>
-        <shortDescription xml:lang="fr">Mmr</shortDescription>
-        <shortDescription xml:lang="hu">Mmr</shortDescription>
-        <shortDescription xml:lang="nl">Mmr</shortDescription>
-        <shortDescription xml:lang="ru">Мьянм</shortDescription>
-        <shortDescription xml:lang="sk">Mmr</shortDescription>
-        <shortDescription xml:lang="sq">Mmr</shortDescription>
-        <shortDescription xml:lang="sr">ммр</shortDescription>
-        <shortDescription xml:lang="sv">Mmr</shortDescription>
-        <shortDescription xml:lang="tr">Mmr</shortDescription>
-        <shortDescription xml:lang="uk">Мьянм</shortDescription>
-        <shortDescription xml:lang="vi">Mmr</shortDescription>
-        <shortDescription xml:lang="zh_CN">Mmr</shortDescription>
-        <description>Myanmar</description>
-        <description xml:lang="en_GB">Myanmar</description>
-        <description xml:lang="nl">Myanmar</description>
-        <description xml:lang="ru">Мьянмар</description>
-        <description xml:lang="rw">Myanmar</description>
-        <description xml:lang="vi">Myanmar</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ca</name>
-        <shortDescription>Can</shortDescription>
-        <shortDescription xml:lang="af">Kan</shortDescription>
-        <shortDescription xml:lang="az">Kan</shortDescription>
-        <shortDescription xml:lang="cs">Kan</shortDescription>
-        <shortDescription xml:lang="da">Can</shortDescription>
-        <shortDescription xml:lang="el">Καν</shortDescription>
-        <shortDescription xml:lang="en_GB">Can</shortDescription>
-        <shortDescription xml:lang="fr">Can</shortDescription>
-        <shortDescription xml:lang="hu">Can</shortDescription>
-        <shortDescription xml:lang="nl">Can</shortDescription>
-        <shortDescription xml:lang="ru">Кан</shortDescription>
-        <shortDescription xml:lang="sk">Can</shortDescription>
-        <shortDescription xml:lang="sq">Can</shortDescription>
-        <shortDescription xml:lang="sr">кан</shortDescription>
-        <shortDescription xml:lang="sv">Can</shortDescription>
-        <shortDescription xml:lang="tr">Kan</shortDescription>
-        <shortDescription xml:lang="uk">Кан</shortDescription>
-        <shortDescription xml:lang="vi">Can</shortDescription>
-        <shortDescription xml:lang="zh_CN">Can</shortDescription>
-        <description>Canada</description>
-        <description xml:lang="en_GB">Canada</description>
-        <description xml:lang="nl">Canada</description>
-        <description xml:lang="ru">Канада</description>
-        <description xml:lang="rw">Kanada</description>
-        <description xml:lang="vi">Ca-na-da</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>fr-dvorak</name>
-            <description>French Dvorak</description>
-            <description xml:lang="en_GB">French Dvorak</description>
-            <description xml:lang="nl">Frans-Dvorak</description>
-            <description xml:lang="ru">Французская Dvorak</description>
-            <description xml:lang="vi">Pháp Dvorak</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>fr-legacy</name>
-            <description>French (legacy)</description>
-            <description xml:lang="en_GB">French (legacy)</description>
-            <description xml:lang="nl">Frans (oud)</description>
-            <description xml:lang="ru">Французская (унаследованная)</description>
-            <description xml:lang="vi">Pháp (di sản)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>multi</name>
-            <description>Multilingual</description>
-            <description xml:lang="en_GB">Multilingual</description>
-            <description xml:lang="nl">Meertalig</description>
-            <description xml:lang="ru">Многоязычная</description>
-            <description xml:lang="vi">Đa ngôn ngữ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>multi-2gr</name>
-            <description>Multilingual, second part</description>
-            <description xml:lang="en_GB">Multilingual, second part</description>
-            <description xml:lang="nl">Meertalig, tweede deel</description>
-            <description xml:lang="ru">Многоязычная, вторая часть</description>
-            <description xml:lang="rw">ISEGONDA</description>
-            <description xml:lang="vi">Đa ngôn ngữ, phần hai</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ike</name>
-            <description>Inuktitut</description>
-            <description xml:lang="af">Inuktitut</description>
-            <description xml:lang="az">İnuktitut</description>
-            <description xml:lang="bg">ескимоска</description>
-            <description xml:lang="cs">Inuitské</description>
-            <description xml:lang="da">Inuktitut</description>
-            <description xml:lang="en_GB">Inuktitut</description>
-            <description xml:lang="fr">Inuktitut</description>
-            <description xml:lang="hu">inuktitut</description>
-            <description xml:lang="nl">Inuktitut</description>
-            <description xml:lang="ru">Иннуитская</description>
-            <description xml:lang="rw">Ikinukititutu</description>
-            <description xml:lang="sk">Inuktitutské</description>
-            <description xml:lang="sq">Inuktitut</description>
-            <description xml:lang="sr">инуктитут</description>
-            <description xml:lang="sv">Inuktitut</description>
-            <description xml:lang="tr">Inuktitut</description>
-            <description xml:lang="uk">Іннуітська</description>
-            <description xml:lang="vi">Inuktitut</description>
-            <description xml:lang="zh_CN">因纽特</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>hr</name>
-        <shortDescription>Hrv</shortDescription>
-        <shortDescription xml:lang="af">Hrv</shortDescription>
-        <shortDescription xml:lang="az">Xrv</shortDescription>
-        <shortDescription xml:lang="cs">Chor</shortDescription>
-        <shortDescription xml:lang="da">Hrv</shortDescription>
-        <shortDescription xml:lang="en_GB">Hrv</shortDescription>
-        <shortDescription xml:lang="fr">Hrv</shortDescription>
-        <shortDescription xml:lang="hu">Hrv</shortDescription>
-        <shortDescription xml:lang="nl">Hrv</shortDescription>
-        <shortDescription xml:lang="ru">Хорв</shortDescription>
-        <shortDescription xml:lang="sk">Chor</shortDescription>
-        <shortDescription xml:lang="sq">Hrv</shortDescription>
-        <shortDescription xml:lang="sr">хрв</shortDescription>
-        <shortDescription xml:lang="sv">Hrv</shortDescription>
-        <shortDescription xml:lang="tr">Hrv</shortDescription>
-        <shortDescription xml:lang="uk">Хорв</shortDescription>
-        <shortDescription xml:lang="vi">Hrv</shortDescription>
-        <shortDescription xml:lang="zh_CN">Hrv</shortDescription>
-        <description>Croatia</description>
-        <description xml:lang="en_GB">Croatia</description>
-        <description xml:lang="nl">Kroatië</description>
-        <description xml:lang="ru">Хорватия</description>
-        <description xml:lang="rw">Korowatiya</description>
-        <description xml:lang="vi">Croátia</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>us</name>
-            <description>US keyboard with Croatian letters</description>
-            <description xml:lang="en_GB">US keyboard with Croatian letters</description>
-            <description xml:lang="nl">Amerikaans toetsenbord met Kroatische letters</description>
-            <description xml:lang="ru">Клавиатура США с хорватскими буквами</description>
-            <description xml:lang="rw">Mwandikisho Na:</description>
-            <description xml:lang="vi">Bàn phím Mỹ với các chữ cái Croát-chi-a</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>cz</name>
-        <shortDescription>Cze</shortDescription>
-        <shortDescription xml:lang="af">Cze</shortDescription>
-        <shortDescription xml:lang="az">Çex</shortDescription>
-        <shortDescription xml:lang="bg">чехшка</shortDescription>
-        <shortDescription xml:lang="cs">Čes</shortDescription>
-        <shortDescription xml:lang="da">Tje</shortDescription>
-        <shortDescription xml:lang="el">Τσε</shortDescription>
-        <shortDescription xml:lang="en_GB">Cze</shortDescription>
-        <shortDescription xml:lang="fr">Cze</shortDescription>
-        <shortDescription xml:lang="hu">Cze</shortDescription>
-        <shortDescription xml:lang="nl">Cze</shortDescription>
-        <shortDescription xml:lang="ru">Чех</shortDescription>
-        <shortDescription xml:lang="sk">Čes</shortDescription>
-        <shortDescription xml:lang="sq">Cze</shortDescription>
-        <shortDescription xml:lang="sr">чеш</shortDescription>
-        <shortDescription xml:lang="sv">Cze</shortDescription>
-        <shortDescription xml:lang="tr">Çek</shortDescription>
-        <shortDescription xml:lang="uk">Чес</shortDescription>
-        <shortDescription xml:lang="vi">Séc</shortDescription>
-        <shortDescription xml:lang="zh_CN">Cze</shortDescription>
-        <description>Czechia</description>
-        <description xml:lang="en_GB">Czechia</description>
-        <description xml:lang="nl">Tsjechië</description>
-        <description xml:lang="ru">Чехия</description>
-        <description xml:lang="vi">Czechia</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>bksl</name>
-            <description>With &lt;\|&gt; key</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>qwerty</name>
-            <description>qwerty</description>
-            <description xml:lang="af">qwerty</description>
-            <description xml:lang="az">qwerty</description>
-            <description xml:lang="bg">чешка (qwerty)</description>
-            <description xml:lang="cs">qwerty</description>
-            <description xml:lang="da">qwerty</description>
-            <description xml:lang="en_GB">qwerty</description>
-            <description xml:lang="fr">qwerty</description>
-            <description xml:lang="hu">qwerty</description>
-            <description xml:lang="nl">qwerty</description>
-            <description xml:lang="ru">qwerty</description>
-            <description xml:lang="sk">qwerty</description>
-            <description xml:lang="sq">qwerty</description>
-            <description xml:lang="sr">qwerty</description>
-            <description xml:lang="sv">qwerty</description>
-            <description xml:lang="tr">qwerty</description>
-            <description xml:lang="uk">qwerty</description>
-            <description xml:lang="vi">qwerty</description>
-            <description xml:lang="zh_CN">qwerty</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>qwerty_bksl</name>
-            <description>qwerty, extended Backslash</description>
-            <description xml:lang="en_GB">qwerty, extended Backslash</description>
-            <description xml:lang="nl">qwerty, uitgebreide backslash</description>
-            <description xml:lang="ru">qwerty, расширенные функции Backslash</description>
-            <description xml:lang="rw">Byongerewe...</description>
-            <description xml:lang="vi">qwerty, Gạch ngược mở rộng</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>dk</name>
-        <shortDescription>Dnk</shortDescription>
-        <shortDescription xml:lang="af">Dnk</shortDescription>
-        <shortDescription xml:lang="az">Dnk</shortDescription>
-        <shortDescription xml:lang="cs">Dán</shortDescription>
-        <shortDescription xml:lang="da">Dnk</shortDescription>
-        <shortDescription xml:lang="en_GB">Dnk</shortDescription>
-        <shortDescription xml:lang="fr">Dnk</shortDescription>
-        <shortDescription xml:lang="hu">Dnk</shortDescription>
-        <shortDescription xml:lang="nl">Dnk</shortDescription>
-        <shortDescription xml:lang="ru">Дат</shortDescription>
-        <shortDescription xml:lang="sk">Dán</shortDescription>
-        <shortDescription xml:lang="sq">Dnk</shortDescription>
-        <shortDescription xml:lang="sr">дан</shortDescription>
-        <shortDescription xml:lang="sv">Dnk</shortDescription>
-        <shortDescription xml:lang="tr">Dnk</shortDescription>
-        <shortDescription xml:lang="uk">Дат</shortDescription>
-        <shortDescription xml:lang="vi">Dnk</shortDescription>
-        <shortDescription xml:lang="zh_CN">Dnk</shortDescription>
-        <description>Denmark</description>
-        <description xml:lang="en_GB">Denmark</description>
-        <description xml:lang="nl">Denemarken</description>
-        <description xml:lang="ru">Дания</description>
-        <description xml:lang="rw">Danimarike</description>
-        <description xml:lang="vi">Đan Mạch</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>nl</name>
-        <shortDescription>Nld</shortDescription>
-        <shortDescription xml:lang="af">Nld</shortDescription>
-        <shortDescription xml:lang="az">Nld</shortDescription>
-        <shortDescription xml:lang="cs">Nld</shortDescription>
-        <shortDescription xml:lang="da">Hollandsk</shortDescription>
-        <shortDescription xml:lang="en_GB">Nld</shortDescription>
-        <shortDescription xml:lang="fr">Nld</shortDescription>
-        <shortDescription xml:lang="hu">Nld</shortDescription>
-        <shortDescription xml:lang="nl">Nld</shortDescription>
-        <shortDescription xml:lang="ru">Флам</shortDescription>
-        <shortDescription xml:lang="sk">Nld</shortDescription>
-        <shortDescription xml:lang="sq">Nld</shortDescription>
-        <shortDescription xml:lang="sr">хол</shortDescription>
-        <shortDescription xml:lang="sv">Nld</shortDescription>
-        <shortDescription xml:lang="tr">Hol</shortDescription>
-        <shortDescription xml:lang="uk">Флам</shortDescription>
-        <shortDescription xml:lang="vi">Nld</shortDescription>
-        <shortDescription xml:lang="zh_CN">Nld</shortDescription>
-        <description>Netherlands</description>
-        <description xml:lang="en_GB">Netherlands</description>
-        <description xml:lang="nl">Nederland</description>
-        <description xml:lang="ru">Нидерланды</description>
-        <description xml:lang="rw">Nederilande</description>
-        <description xml:lang="vi">Hà Lan</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>bt</name>
-        <shortDescription>Bhu</shortDescription>
-        <shortDescription xml:lang="ru">Бут</shortDescription>
-        <description>Bhutan</description>
-        <description xml:lang="ru">Бутан</description>
-      </configItem>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ee</name>
-        <shortDescription>Est</shortDescription>
-        <shortDescription xml:lang="af">Est</shortDescription>
-        <shortDescription xml:lang="az">Est</shortDescription>
-        <shortDescription xml:lang="cs">Est</shortDescription>
-        <shortDescription xml:lang="da">Est</shortDescription>
-        <shortDescription xml:lang="en_GB">Est</shortDescription>
-        <shortDescription xml:lang="fr">Est</shortDescription>
-        <shortDescription xml:lang="hu">Est</shortDescription>
-        <shortDescription xml:lang="nl">Est</shortDescription>
-        <shortDescription xml:lang="ru">Эст</shortDescription>
-        <shortDescription xml:lang="sk">Est</shortDescription>
-        <shortDescription xml:lang="sq">Est</shortDescription>
-        <shortDescription xml:lang="sr">ест</shortDescription>
-        <shortDescription xml:lang="sv">Est</shortDescription>
-        <shortDescription xml:lang="tr">Est</shortDescription>
-        <shortDescription xml:lang="uk">Ест</shortDescription>
-        <shortDescription xml:lang="vi">Est</shortDescription>
-        <shortDescription xml:lang="zh_CN">Est</shortDescription>
-        <description>Estonia</description>
-        <description xml:lang="en_GB">Estonia</description>
-        <description xml:lang="nl">Estland</description>
-        <description xml:lang="ru">Эстония</description>
-        <description xml:lang="rw">Esitoniya</description>
-        <description xml:lang="vi">Ex-tô-nhia</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ir</name>
-        <shortDescription>Irn</shortDescription>
-        <shortDescription xml:lang="af">Irn</shortDescription>
-        <shortDescription xml:lang="az">İrn</shortDescription>
-        <shortDescription xml:lang="cs">Irn</shortDescription>
-        <shortDescription xml:lang="da">Irn</shortDescription>
-        <shortDescription xml:lang="en_GB">Irn</shortDescription>
-        <shortDescription xml:lang="fr">Irn</shortDescription>
-        <shortDescription xml:lang="hu">Irn</shortDescription>
-        <shortDescription xml:lang="nl">Irn</shortDescription>
-        <shortDescription xml:lang="ru">Перс</shortDescription>
-        <shortDescription xml:lang="sk">Irn</shortDescription>
-        <shortDescription xml:lang="sq">Irn</shortDescription>
-        <shortDescription xml:lang="sr">ирн</shortDescription>
-        <shortDescription xml:lang="sv">Irn</shortDescription>
-        <shortDescription xml:lang="tr">Irn</shortDescription>
-        <shortDescription xml:lang="uk">Перс</shortDescription>
-        <shortDescription xml:lang="vi">Irn</shortDescription>
-        <shortDescription xml:lang="zh_CN">Irn</shortDescription>
-        <description>Iran</description>
-        <description xml:lang="en_GB">Iran</description>
-        <description xml:lang="nl">Iran</description>
-        <description xml:lang="ru">Иран</description>
-        <description xml:lang="vi">Iran</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>fo</name>
-        <shortDescription>Fao</shortDescription>
-        <shortDescription xml:lang="af">Fao</shortDescription>
-        <shortDescription xml:lang="az">Fao</shortDescription>
-        <shortDescription xml:lang="cs">Fao</shortDescription>
-        <shortDescription xml:lang="da">Fær</shortDescription>
-        <shortDescription xml:lang="en_GB">Fao</shortDescription>
-        <shortDescription xml:lang="fr">Fao</shortDescription>
-        <shortDescription xml:lang="hu">Fao</shortDescription>
-        <shortDescription xml:lang="nl">Fao</shortDescription>
-        <shortDescription xml:lang="ru">Фар</shortDescription>
-        <shortDescription xml:lang="sk">Fao</shortDescription>
-        <shortDescription xml:lang="sq">Fao</shortDescription>
-        <shortDescription xml:lang="sr">фар</shortDescription>
-        <shortDescription xml:lang="sv">Fao</shortDescription>
-        <shortDescription xml:lang="tr">Fao</shortDescription>
-        <shortDescription xml:lang="uk">Фарер</shortDescription>
-        <shortDescription xml:lang="vi">Fao</shortDescription>
-        <shortDescription xml:lang="zh_CN">Fao</shortDescription>
-        <description>Faroe Islands</description>
-        <description xml:lang="en_GB">Faroe Islands</description>
-        <description xml:lang="nl">Faröer-eilanden</description>
-        <description xml:lang="ru">Острова Фаро</description>
-        <description xml:lang="rw">Ibirwa bya Farowe</description>
-        <description xml:lang="vi">Faroe Islands</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>fi</name>
-        <shortDescription>Fin</shortDescription>
-        <shortDescription xml:lang="af">Fin</shortDescription>
-        <shortDescription xml:lang="az">Fin</shortDescription>
-        <shortDescription xml:lang="cs">Fin</shortDescription>
-        <shortDescription xml:lang="da">Fin</shortDescription>
-        <shortDescription xml:lang="el">Φιν</shortDescription>
-        <shortDescription xml:lang="en_GB">Fin</shortDescription>
-        <shortDescription xml:lang="fr">Fin</shortDescription>
-        <shortDescription xml:lang="hu">Fin</shortDescription>
-        <shortDescription xml:lang="nl">Fin</shortDescription>
-        <shortDescription xml:lang="ru">Фин</shortDescription>
-        <shortDescription xml:lang="sk">Fín</shortDescription>
-        <shortDescription xml:lang="sq">Fin</shortDescription>
-        <shortDescription xml:lang="sr">фин</shortDescription>
-        <shortDescription xml:lang="sv">Fin</shortDescription>
-        <shortDescription xml:lang="tr">Fin</shortDescription>
-        <shortDescription xml:lang="uk">Фін</shortDescription>
-        <shortDescription xml:lang="vi">Fin</shortDescription>
-        <shortDescription xml:lang="zh_CN">Fin</shortDescription>
-        <description>Finland</description>
-        <description xml:lang="en_GB">Finland</description>
-        <description xml:lang="nl">Finland</description>
-        <description xml:lang="ru">Финляндия</description>
-        <description xml:lang="rw">Finilande</description>
-        <description xml:lang="vi">Phần Lan</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>smi</name>
-            <description>Northern Saami</description>
-            <description xml:lang="en_GB">Northern Saami</description>
-            <description xml:lang="nl">Noord-Lapland</description>
-            <description xml:lang="ru">Северная Саамская</description>
-            <description xml:lang="rw">Sami y'Amajyaruguru</description>
-            <description xml:lang="vi">Bắc Saami</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>fr</name>
-        <shortDescription>Fra</shortDescription>
-        <shortDescription xml:lang="af">Fra</shortDescription>
-        <shortDescription xml:lang="az">Fra</shortDescription>
-        <shortDescription xml:lang="cs">Fra</shortDescription>
-        <shortDescription xml:lang="da">Fra</shortDescription>
-        <shortDescription xml:lang="el">Γαλ</shortDescription>
-        <shortDescription xml:lang="en_GB">Fra</shortDescription>
-        <shortDescription xml:lang="fr">Fra</shortDescription>
-        <shortDescription xml:lang="hu">Fra</shortDescription>
-        <shortDescription xml:lang="nl">Fra</shortDescription>
-        <shortDescription xml:lang="ru">Фр</shortDescription>
-        <shortDescription xml:lang="sk">Fra</shortDescription>
-        <shortDescription xml:lang="sq">Fra</shortDescription>
-        <shortDescription xml:lang="sr">фра</shortDescription>
-        <shortDescription xml:lang="sv">Fra</shortDescription>
-        <shortDescription xml:lang="tr">Fra</shortDescription>
-        <shortDescription xml:lang="uk">Фра</shortDescription>
-        <shortDescription xml:lang="vi">Fra</shortDescription>
-        <shortDescription xml:lang="zh_CN">Fra</shortDescription>
-        <description>France</description>
-        <description xml:lang="en_GB">France</description>
-        <description xml:lang="nl">Frankrijk</description>
-        <description xml:lang="ru">Франция</description>
-        <description xml:lang="rw">Ubufaransa</description>
-        <description xml:lang="vi">Pháp</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>sundeadkeys</name>
-            <description>Sun dead keys</description>
-            <description xml:lang="af">Sun (dooie sleutels)</description>
-            <description xml:lang="az">Sun ölü düymələr</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Mrtvé klávesy Sun</description>
-            <description xml:lang="da">Sun døde taster</description>
-            <description xml:lang="en_GB">Sun dead keys</description>
-            <description xml:lang="fr">clés mortes Sun</description>
-            <description xml:lang="hu">Sun halott billentyűk</description>
-            <description xml:lang="nl">Sun dode toetsen</description>
-            <description xml:lang="ru">Специальные клавиши (dead keys) Sun</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Mŕtve klávesy Sun</description>
-            <description xml:lang="sq">Pulsantë të vdekur Sun</description>
-            <description xml:lang="sr">Sun-ови акценти</description>
-            <description xml:lang="sv">Sun stumma tangenter</description>
-            <description xml:lang="tr">Sun ölü tuşlar</description>
-            <description xml:lang="uk">Спеціальні клавіші (dead keys) Sun</description>
-            <description xml:lang="vi">Phím chết Sun</description>
-            <description xml:lang="zh_CN">Sun 死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>latin9</name>
-            <description>Alternative</description>
-            <description xml:lang="el">Ενναλακτικό</description>
-            <description xml:lang="en_GB">Alternative</description>
-            <description xml:lang="nl">Alternatief</description>
-            <description xml:lang="ru">Альтернативная</description>
-            <description xml:lang="vi">Tương đương</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>latin9_nodeadkeys</name>
-            <description>Alternative, eliminate dead keys</description>
-            <description xml:lang="en_GB">Alternative, eliminate dead keys</description>
-            <description xml:lang="nl">Alternatief, zonder dode toetsen</description>
-            <description xml:lang="ru">Альтернативная, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="vi">Tương đương, phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>latin9_sundeadkeys</name>
-            <description>Alternative, Sun dead keys</description>
-            <description xml:lang="en_GB">Alternative, Sun dead keys</description>
-            <description xml:lang="nl">Alternatief, Sun-dode toetsen</description>
-            <description xml:lang="ru">Альтернативная, специальные клавиши (dead keys) Sun</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="vi">Tương đương, phím chết Sun</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak</name>
-            <description>Dvorak</description>
-            <description xml:lang="af">Dvorak</description>
-            <description xml:lang="az">Dvorak</description>
-            <description xml:lang="bg">Дворак</description>
-            <description xml:lang="cs">Dvorak</description>
-            <description xml:lang="da">Dvorak</description>
-            <description xml:lang="en_GB">Dvorak</description>
-            <description xml:lang="fr">Dvorak</description>
-            <description xml:lang="hu">Dvorak-féle</description>
-            <description xml:lang="nl">Dvorak</description>
-            <description xml:lang="ru">Дворак</description>
-            <description xml:lang="sk">Dvorak</description>
-            <description xml:lang="sq">Dvorak</description>
-            <description xml:lang="sr">дворак</description>
-            <description xml:lang="sv">Dvorak</description>
-            <description xml:lang="tr">Dvorak</description>
-            <description xml:lang="uk">Дворак</description>
-            <description xml:lang="vi">Dvorak</description>
-            <description xml:lang="zh_CN">Dvorak</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ge</name>
-        <shortDescription>Geo</shortDescription>
-        <shortDescription xml:lang="af">Geo</shortDescription>
-        <shortDescription xml:lang="az">Gür</shortDescription>
-        <shortDescription xml:lang="cs">Gru</shortDescription>
-        <shortDescription xml:lang="da">Geo</shortDescription>
-        <shortDescription xml:lang="en_GB">Geo</shortDescription>
-        <shortDescription xml:lang="fr">Geo</shortDescription>
-        <shortDescription xml:lang="hu">Geo</shortDescription>
-        <shortDescription xml:lang="nl">Geo</shortDescription>
-        <shortDescription xml:lang="ru">Груз</shortDescription>
-        <shortDescription xml:lang="sk">Gru</shortDescription>
-        <shortDescription xml:lang="sq">Geo</shortDescription>
-        <shortDescription xml:lang="sr">гру</shortDescription>
-        <shortDescription xml:lang="sv">Geo</shortDescription>
-        <shortDescription xml:lang="tr">Geo</shortDescription>
-        <shortDescription xml:lang="uk">Груз</shortDescription>
-        <shortDescription xml:lang="vi">Geo</shortDescription>
-        <shortDescription xml:lang="zh_CN">Geo</shortDescription>
-        <description>Georgia</description>
-        <description xml:lang="en_GB">Georgia</description>
-        <description xml:lang="nl">Georgië</description>
-        <description xml:lang="ru">Грузия</description>
-        <description xml:lang="rw">Geworigiya</description>
-        <description xml:lang="vi">Georgia</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>ru</name>
-            <description>Russian</description>
-            <description xml:lang="af">Russies</description>
-            <description xml:lang="az">Rusca</description>
-            <description xml:lang="bg">руска</description>
-            <description xml:lang="cs">Ruské</description>
-            <description xml:lang="da">Russisk</description>
-            <description xml:lang="el">Ρωσσικά</description>
-            <description xml:lang="en_GB">Russian</description>
-            <description xml:lang="fr">Russe</description>
-            <description xml:lang="hu">orosz</description>
-            <description xml:lang="nl">Russisch</description>
-            <description xml:lang="ru">Русская</description>
-            <description xml:lang="rw">Ikirusiya</description>
-            <description xml:lang="sk">Ruské</description>
-            <description xml:lang="sq">Rusisht</description>
-            <description xml:lang="sr">руски</description>
-            <description xml:lang="sv">Rysk</description>
-            <description xml:lang="tr">Rusça</description>
-            <description xml:lang="uk">Російська</description>
-            <description xml:lang="vi">Nga</description>
-            <description xml:lang="zh_CN">俄语</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>de</name>
-        <shortDescription>Deu</shortDescription>
-        <shortDescription xml:lang="af">Deu</shortDescription>
-        <shortDescription xml:lang="az">Deu</shortDescription>
-        <shortDescription xml:lang="cs">Něm</shortDescription>
-        <shortDescription xml:lang="da">Tys</shortDescription>
-        <shortDescription xml:lang="en_GB">Deu</shortDescription>
-        <shortDescription xml:lang="fr">Deu</shortDescription>
-        <shortDescription xml:lang="hu">Deu</shortDescription>
-        <shortDescription xml:lang="nl">Deu</shortDescription>
-        <shortDescription xml:lang="ru">Нем</shortDescription>
-        <shortDescription xml:lang="sk">Nem</shortDescription>
-        <shortDescription xml:lang="sq">Deu</shortDescription>
-        <shortDescription xml:lang="sr">нем</shortDescription>
-        <shortDescription xml:lang="sv">Deu</shortDescription>
-        <shortDescription xml:lang="tr">Alm</shortDescription>
-        <shortDescription xml:lang="uk">Нім</shortDescription>
-        <shortDescription xml:lang="vi">Deu</shortDescription>
-        <shortDescription xml:lang="zh_CN">Deu</shortDescription>
-        <description>Germany</description>
-        <description xml:lang="en_GB">Germany</description>
-        <description xml:lang="nl">Duitsland</description>
-        <description xml:lang="ru">Германия</description>
-        <description xml:lang="rw">Ubudage</description>
-        <description xml:lang="vi">Đức</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>deadacute</name>
-            <description>Dead acute</description>
-            <description xml:lang="af">Dooie akuutaksent</description>
-            <description xml:lang="az">Dead acute</description>
-            <description xml:lang="cs">Mrtvá čárka</description>
-            <description xml:lang="da">Død accent</description>
-            <description xml:lang="en_GB">Dead acute</description>
-            <description xml:lang="fr">clé morte d'accent aigu</description>
-            <description xml:lang="hu">Halott vessző (´) ékezet</description>
-            <description xml:lang="nl">Dood acutus</description>
-            <description xml:lang="ru">Спец. символ Dead acute</description>
-            <description xml:lang="sk">Mŕtva čiarka</description>
-            <description xml:lang="sq">Fund kritik</description>
-            <description xml:lang="sr">Акутски акценат</description>
-            <description xml:lang="sv">Stum akut accent</description>
-            <description xml:lang="tr">Ölü acute (´)</description>
-            <description xml:lang="uk">Спец. символ Dead acute</description>
-            <description xml:lang="vi">Chết sâu</description>
-            <description xml:lang="zh_CN">Dead acute</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>deadgraveacute</name>
-            <description>Dead grave acute</description>
-            <description xml:lang="af">Dooie gravisaksent</description>
-            <description xml:lang="az">Dead grave acute</description>
-            <description xml:lang="cs">Mrtvá opačná čárka</description>
-            <description xml:lang="da">Død accent grave</description>
-            <description xml:lang="en_GB">Dead grave acute</description>
-            <description xml:lang="fr">clé morte d'accent grave</description>
-            <description xml:lang="hu">Halott grave (`) ékezet</description>
-            <description xml:lang="nl">Dood gravis-acutus</description>
-            <description xml:lang="ru">Спец. символ Dead grave acute</description>
-            <description xml:lang="sk">Mŕtva opačná čiarka</description>
-            <description xml:lang="sq">Fund kritik serioz</description>
-            <description xml:lang="sr">Гравис акутски акценат</description>
-            <description xml:lang="sv">Stum grav och akut accent</description>
-            <description xml:lang="tr">Ölü grave acute (`)</description>
-            <description xml:lang="uk">Спец. символ Dead grave acute</description>
-            <description xml:lang="vi">Chết non sâu</description>
-            <description xml:lang="zh_CN">Dead grave acute</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ro</name>
-            <description>Romanian keyboard with German letters</description>
-            <description xml:lang="en_GB">Romanian keyboard with German letters</description>
-            <description xml:lang="nl">Roemeens toetsenbord met Duitse letters</description>
-            <description xml:lang="ru">Румынская клавиатура с немецкими буквами</description>
-            <description xml:lang="rw">Mwandikisho Na:</description>
-            <description xml:lang="vi">Bàn phím Rô-ma-ni với các chữ cái Đức</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ro_nodeadkeys</name>
-            <description>Romanian keyboard with German letters, eliminate dead keys</description>
-            <description xml:lang="en_GB">Romanian keyboard with German letters, eliminate dead keys</description>
-            <description xml:lang="nl">Roemeens toetsenbord met Duitse letters, zonder dode toetsen</description>
-            <description xml:lang="rw">Mwandikisho Na: Utubuto</description>
-            <description xml:lang="vi">Bàn phím Rô-ma-ni với các chữ cái Đức, các phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak</name>
-            <description>Dvorak</description>
-            <description xml:lang="af">Dvorak</description>
-            <description xml:lang="az">Dvorak</description>
-            <description xml:lang="bg">Дворак</description>
-            <description xml:lang="cs">Dvorak</description>
-            <description xml:lang="da">Dvorak</description>
-            <description xml:lang="en_GB">Dvorak</description>
-            <description xml:lang="fr">Dvorak</description>
-            <description xml:lang="hu">Dvorak-féle</description>
-            <description xml:lang="nl">Dvorak</description>
-            <description xml:lang="ru">Дворак</description>
-            <description xml:lang="sk">Dvorak</description>
-            <description xml:lang="sq">Dvorak</description>
-            <description xml:lang="sr">дворак</description>
-            <description xml:lang="sv">Dvorak</description>
-            <description xml:lang="tr">Dvorak</description>
-            <description xml:lang="uk">Дворак</description>
-            <description xml:lang="vi">Dvorak</description>
-            <description xml:lang="zh_CN">Dvorak</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>gr</name>
-        <shortDescription>Gre</shortDescription>
-        <shortDescription xml:lang="el">Ελλ</shortDescription>
-        <shortDescription xml:lang="en_GB">Gre</shortDescription>
-        <shortDescription xml:lang="nl">Grieks</shortDescription>
-        <shortDescription xml:lang="ru">Гре</shortDescription>
-        <shortDescription xml:lang="vi">Gre</shortDescription>
-        <description>Greece</description>
-        <description xml:lang="en_GB">Greece</description>
-        <description xml:lang="nl">Griekenland</description>
-        <description xml:lang="ru">Греция</description>
-        <description xml:lang="rw">Ikigereki</description>
-        <description xml:lang="vi">Hy Lạp</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>extended</name>
-            <description>Extended</description>
-            <description xml:lang="af">Uitgebreide</description>
-            <description xml:lang="az">Uzadılmış</description>
-            <description xml:lang="cs">Rozšířené</description>
-            <description xml:lang="da">Udvidet</description>
-            <description xml:lang="en_GB">Extended</description>
-            <description xml:lang="fr">Étendue</description>
-            <description xml:lang="hu">Kibővített</description>
-            <description xml:lang="nl">Uitgebreid</description>
-            <description xml:lang="ru">Расширенная</description>
-            <description xml:lang="rw">cya/byagutse</description>
-            <description xml:lang="sk">Rozšírené</description>
-            <description xml:lang="sq">E zgjeruar</description>
-            <description xml:lang="sr">Проширено</description>
-            <description xml:lang="sv">Utökad</description>
-            <description xml:lang="tr">Gelişmiş</description>
-            <description xml:lang="uk">Розширена</description>
-            <description xml:lang="vi">Mở rộng</description>
-            <description xml:lang="zh_CN">扩展</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>polytonic</name>
-            <description>Polytonic</description>
-            <description xml:lang="af">Polytonic</description>
-            <description xml:lang="az">Politonik</description>
-            <description xml:lang="cs">Polytónické</description>
-            <description xml:lang="da">Polytonisk</description>
-            <description xml:lang="el">Πολυτονικά</description>
-            <description xml:lang="en_GB">Polytonic</description>
-            <description xml:lang="fr">Polytonique</description>
-            <description xml:lang="hu">Polytonic</description>
-            <description xml:lang="nl">Polytonisch</description>
-            <description xml:lang="ru">Полифоническая</description>
-            <description xml:lang="sk">Polytónické</description>
-            <description xml:lang="sq">Polytonic</description>
-            <description xml:lang="sr">вишезвучни</description>
-            <description xml:lang="sv">Polytonic</description>
-            <description xml:lang="tr">Politonik</description>
-            <description xml:lang="uk">Поліфонічна</description>
-            <description xml:lang="vi">Nhiều âm</description>
-            <description xml:lang="zh_CN">Polytonic</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>hu</name>
-        <shortDescription>Hun</shortDescription>
-        <shortDescription xml:lang="af">Hun</shortDescription>
-        <shortDescription xml:lang="az">Mac</shortDescription>
-        <shortDescription xml:lang="cs">Maď</shortDescription>
-        <shortDescription xml:lang="da">Ung</shortDescription>
-        <shortDescription xml:lang="en_GB">Hun</shortDescription>
-        <shortDescription xml:lang="fr">Hun</shortDescription>
-        <shortDescription xml:lang="hu">Hun</shortDescription>
-        <shortDescription xml:lang="nl">Hun</shortDescription>
-        <shortDescription xml:lang="ru">Венг</shortDescription>
-        <shortDescription xml:lang="sk">Maď</shortDescription>
-        <shortDescription xml:lang="sq">Hun</shortDescription>
-        <shortDescription xml:lang="sr">мађ</shortDescription>
-        <shortDescription xml:lang="sv">Hun</shortDescription>
-        <shortDescription xml:lang="tr">Mcr</shortDescription>
-        <shortDescription xml:lang="uk">Уго</shortDescription>
-        <shortDescription xml:lang="vi">Hun</shortDescription>
-        <shortDescription xml:lang="zh_CN">Hun</shortDescription>
-        <description>Hungary</description>
-        <description xml:lang="en_GB">Hungary</description>
-        <description xml:lang="nl">Hongarije</description>
-        <description xml:lang="ru">Венгрия</description>
-        <description xml:lang="rw">Hongiriya</description>
-        <description xml:lang="vi">Hungary</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>standard</name>
-            <description>Standard</description>
-            <description xml:lang="af">Standaard</description>
-            <description xml:lang="az">Standart</description>
-            <description xml:lang="cs">Standardní</description>
-            <description xml:lang="da">Standard</description>
-            <description xml:lang="el">Εξ ορισμού</description>
-            <description xml:lang="en_GB">Standard</description>
-            <description xml:lang="fr">Standard</description>
-            <description xml:lang="hu">Szabványos</description>
-            <description xml:lang="nl">Standaard</description>
-            <description xml:lang="ru">Стандартная</description>
-            <description xml:lang="rw">gisanzwe/kimenyerewe</description>
-            <description xml:lang="sk">Štandardné</description>
-            <description xml:lang="sq">Standart</description>
-            <description xml:lang="sr">стандардна</description>
-            <description xml:lang="sv">Standard</description>
-            <description xml:lang="tr">Standart</description>
-            <description xml:lang="uk">Стандартна</description>
-            <description xml:lang="vi">Tiêu chuẩn</description>
-            <description xml:lang="zh_CN">标准</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>qwerty</name>
-            <description>qwerty</description>
-            <description xml:lang="af">qwerty</description>
-            <description xml:lang="az">qwerty</description>
-            <description xml:lang="bg">чешка (qwerty)</description>
-            <description xml:lang="cs">qwerty</description>
-            <description xml:lang="da">qwerty</description>
-            <description xml:lang="en_GB">qwerty</description>
-            <description xml:lang="fr">qwerty</description>
-            <description xml:lang="hu">qwerty</description>
-            <description xml:lang="nl">qwerty</description>
-            <description xml:lang="ru">qwerty</description>
-            <description xml:lang="sk">qwerty</description>
-            <description xml:lang="sq">qwerty</description>
-            <description xml:lang="sr">qwerty</description>
-            <description xml:lang="sv">qwerty</description>
-            <description xml:lang="tr">qwerty</description>
-            <description xml:lang="uk">qwerty</description>
-            <description xml:lang="vi">qwerty</description>
-            <description xml:lang="zh_CN">qwerty</description>
-          </configItem>
-        </variant>
-
-        <!-- 101 keys -->
-        <variant>
-          <configItem>
-            <name>101_qwertz_comma_dead</name>
-            <description>101/qwertz/comma/Dead keys</description>
-            <description xml:lang="en_GB">101/qwertz/comma/Dead keys</description>
-            <description xml:lang="nl">101/qwertz/komma/Dode toetsen</description>
-            <description xml:lang="ru">pc101, qwertz, запятая, специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akitso Utubuto</description>
-            <description xml:lang="vi">101/qwertz/dấu phẩy/Phím chết</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>101_qwertz_comma_nodead</name>
-            <description>101/qwertz/comma/Eliminate dead keys</description>
-            <description xml:lang="en_GB">101/qwertz/comma/Eliminate dead keys</description>
-            <description xml:lang="nl">101/qwertz/komma/Dode toetsen verwijderen</description>
-            <description xml:lang="ru">pc101, qwertz, запятая, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akitso Utubuto</description>
-            <description xml:lang="vi">101/qwertz/dấu phẩy/Phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>101_qwertz_dot_dead</name>
-            <description>101/qwertz/dot/Dead keys</description>
-            <description xml:lang="en_GB">101/qwertz/dot/Dead keys</description>
-            <description xml:lang="nl">101/qwertz/punt/Dode toetsen</description>
-            <description xml:lang="ru">pc101, qwertz, точка, специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akadomo Utubuto</description>
-            <description xml:lang="vi">101/qwertz/dấu chấm/Phím chết</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>101_qwertz_dot_nodead</name>
-            <description>101/qwertz/dot/Eliminate dead keys</description>
-            <description xml:lang="en_GB">101/qwertz/dot/Eliminate dead keys</description>
-            <description xml:lang="nl">101/qwertz/punt/Dode toetsen verwijderen</description>
-            <description xml:lang="ru">pc101, qwertz, точка, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akadomo Utubuto</description>
-            <description xml:lang="vi">101/qwertz/dấu chấm/Phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>101_qwerty_comma_dead</name>
-            <description>101/qwerty/comma/Dead keys</description>
-            <description xml:lang="en_GB">101/qwerty/comma/Dead keys</description>
-            <description xml:lang="nl">101/qwerty/komma/Dode toetsen</description>
-            <description xml:lang="ru">pc101, qwerty, запятая, специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akitso Utubuto</description>
-            <description xml:lang="vi">101/qwerty/dấu phẩy/Phím chết</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>101_qwerty_comma_nodead</name>
-            <description>101/qwerty/comma/Eliminate dead keys</description>
-            <description xml:lang="en_GB">101/qwerty/comma/Eliminate dead keys</description>
-            <description xml:lang="nl">101/qwerty/komma/Dode toetsen verwijderen</description>
-            <description xml:lang="ru">pc101, qwerty, запятая, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akitso Utubuto</description>
-            <description xml:lang="vi">101/qwerty/dấu phẩy/Phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>101_qwerty_dot_dead</name>
-            <description>101/qwerty/dot/Dead keys</description>
-            <description xml:lang="en_GB">101/qwerty/dot/Dead keys</description>
-            <description xml:lang="nl">101/qwerty/punt/Dode toetsen</description>
-            <description xml:lang="ru">pc101, qwerty, точка, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akadomo Utubuto</description>
-            <description xml:lang="vi">101/qwerty/dấu chấm/Phím chết</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>101_qwerty_dot_nodead</name>
-            <description>101/qwerty/dot/Eliminate dead keys</description>
-            <description xml:lang="en_GB">101/qwerty/dot/Eliminate dead keys</description>
-            <description xml:lang="nl">101/qwerty/punt/Dode toetsen verwijderen</description>
-            <description xml:lang="ru">pc101, qwerty, точка, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akadomo Utubuto</description>
-            <description xml:lang="vi">101/qwerty/dấu chấm/Phím chết loại trừ</description>
-          </configItem>
-        </variant>
-
-
-        <!-- 102 keys -->
-        <variant>
-          <configItem>
-            <name>102_qwertz_comma_dead</name>
-            <description>102/qwertz/comma/Dead keys</description>
-            <description xml:lang="en_GB">102/qwertz/comma/Dead keys</description>
-            <description xml:lang="nl">102/qwertz/komma/Dode toetsen</description>
-            <description xml:lang="ru">pc102, qwertz, запятая, специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akitso Utubuto</description>
-            <description xml:lang="vi">102/qwertz/dấu phẩy/Phím chết</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>102_qwertz_comma_nodead</name>
-            <description>102/qwertz/comma/Eliminate dead keys</description>
-            <description xml:lang="en_GB">102/qwertz/comma/Eliminate dead keys</description>
-            <description xml:lang="nl">102/qwertz/komma/Dode toetsen verwijderen</description>
-            <description xml:lang="ru">pc102, qwertz, запятая, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akitso Utubuto</description>
-            <description xml:lang="vi">102/qwertz/dấu phẩy/Phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>102_qwertz_dot_dead</name>
-            <description>102/qwertz/dot/Dead keys</description>
-            <description xml:lang="en_GB">102/qwertz/dot/Dead keys</description>
-            <description xml:lang="nl">102/qwertz/punt/Dode toetsen</description>
-            <description xml:lang="ru">pc102, qwertz, точка, специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akadomo Utubuto</description>
-            <description xml:lang="vi">102/qwertz/dấu chấm/Phím chết</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>102_qwertz_dot_nodead</name>
-            <description>102/qwertz/dot/Eliminate dead keys</description>
-            <description xml:lang="en_GB">102/qwertz/dot/Eliminate dead keys</description>
-            <description xml:lang="nl">102/qwertz/punt/Dode toetsen verwijderen</description>
-            <description xml:lang="ru">pc102, qwertz, точка, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akadomo Utubuto</description>
-            <description xml:lang="vi">102/qwertz/dấu chấm/Phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>102_qwerty_comma_dead</name>
-            <description>102/qwerty/comma/Dead keys</description>
-            <description xml:lang="en_GB">102/qwerty/comma/Dead keys</description>
-            <description xml:lang="nl">102/qwerty/komma/Dode toetsen</description>
-            <description xml:lang="ru">pc102, qwerty, запятая, специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akitso Utubuto</description>
-            <description xml:lang="vi">102/qwerty/dấu phẩy/Phím chết</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>102_qwerty_comma_nodead</name>
-            <description>102/qwerty/comma/Eliminate dead keys</description>
-            <description xml:lang="en_GB">102/qwerty/comma/Eliminate dead keys</description>
-            <description xml:lang="nl">102/qwerty/komma/Dode toetsen verwijderen</description>
-            <description xml:lang="ru">pc102, qwerty, запятая, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akitso Utubuto</description>
-            <description xml:lang="vi">102/qwerty/dấu phẩy/Phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>102_qwerty_dot_dead</name>
-            <description>102/qwerty/dot/Dead keys</description>
-            <description xml:lang="en_GB">102/qwerty/dot/Dead keys</description>
-            <description xml:lang="nl">102/qwerty/punt/Dode toetsen</description>
-            <description xml:lang="ru">pc102, qwerty, точка, специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akadomo Utubuto</description>
-            <description xml:lang="vi">102/qwerty/dấu chấm/Phím chết</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>102_qwerty_dot_nodead</name>
-            <description>102/qwerty/dot/Eliminate dead keys</description>
-            <description xml:lang="en_GB">102/qwerty/dot/Eliminate dead keys</description>
-            <description xml:lang="nl">102/qwerty/punt/Dode toetsen verwijderen</description>
-            <description xml:lang="ru">pc102, qwerty, точка, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Akadomo Utubuto</description>
-            <description xml:lang="vi">102/qwerty/dấu chấm/Phím chết loại trừ</description>
-          </configItem>
-        </variant>
-
-
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>is</name>
-        <shortDescription>Isl</shortDescription>
-        <shortDescription xml:lang="af">Isl</shortDescription>
-        <shortDescription xml:lang="az">İsl</shortDescription>
-        <shortDescription xml:lang="cs">Isl</shortDescription>
-        <shortDescription xml:lang="da">Isl</shortDescription>
-        <shortDescription xml:lang="en_GB">Isl</shortDescription>
-        <shortDescription xml:lang="fr">Isl</shortDescription>
-        <shortDescription xml:lang="hu">Isl</shortDescription>
-        <shortDescription xml:lang="nl">Isl</shortDescription>
-        <shortDescription xml:lang="ru">Исл</shortDescription>
-        <shortDescription xml:lang="sk">Isl</shortDescription>
-        <shortDescription xml:lang="sq">Isl</shortDescription>
-        <shortDescription xml:lang="sr">исл</shortDescription>
-        <shortDescription xml:lang="sv">Isl</shortDescription>
-        <shortDescription xml:lang="tr">Izl</shortDescription>
-        <shortDescription xml:lang="uk">Ісл</shortDescription>
-        <shortDescription xml:lang="vi">Isl</shortDescription>
-        <shortDescription xml:lang="zh_CN">Isl</shortDescription>
-        <description>Iceland</description>
-        <description xml:lang="en_GB">Iceland</description>
-        <description xml:lang="nl">IJsland</description>
-        <description xml:lang="ru">Исландия</description>
-        <description xml:lang="rw">Isilande</description>
-        <description xml:lang="vi">Iceland</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>Sundeadkeys</name>
-            <description>Sun dead keys</description>
-            <description xml:lang="af">Sun (dooie sleutels)</description>
-            <description xml:lang="az">Sun ölü düymələr</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Mrtvé klávesy Sun</description>
-            <description xml:lang="da">Sun døde taster</description>
-            <description xml:lang="en_GB">Sun dead keys</description>
-            <description xml:lang="fr">clés mortes Sun</description>
-            <description xml:lang="hu">Sun halott billentyűk</description>
-            <description xml:lang="nl">Sun dode toetsen</description>
-            <description xml:lang="ru">Специальные клавиши (dead keys) Sun</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Mŕtve klávesy Sun</description>
-            <description xml:lang="sq">Pulsantë të vdekur Sun</description>
-            <description xml:lang="sr">Sun-ови акценти</description>
-            <description xml:lang="sv">Sun stumma tangenter</description>
-            <description xml:lang="tr">Sun ölü tuşlar</description>
-            <description xml:lang="uk">Спеціальні клавіші (dead keys) Sun</description>
-            <description xml:lang="vi">Phím chết Sun</description>
-            <description xml:lang="zh_CN">Sun 死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>il</name>
-        <shortDescription>Isr</shortDescription>
-        <shortDescription xml:lang="af">Isr</shortDescription>
-        <shortDescription xml:lang="az">İsr</shortDescription>
-        <shortDescription xml:lang="cs">Izr</shortDescription>
-        <shortDescription xml:lang="da">Isr</shortDescription>
-        <shortDescription xml:lang="en_GB">Isr</shortDescription>
-        <shortDescription xml:lang="fr">Isr</shortDescription>
-        <shortDescription xml:lang="hu">Isr</shortDescription>
-        <shortDescription xml:lang="nl">Isr</shortDescription>
-        <shortDescription xml:lang="ru">Ивр</shortDescription>
-        <shortDescription xml:lang="sk">Izr</shortDescription>
-        <shortDescription xml:lang="sq">Isr</shortDescription>
-        <shortDescription xml:lang="sr">изр</shortDescription>
-        <shortDescription xml:lang="sv">Isr</shortDescription>
-        <shortDescription xml:lang="tr">İbr</shortDescription>
-        <shortDescription xml:lang="uk">Івр</shortDescription>
-        <shortDescription xml:lang="vi">Isr</shortDescription>
-        <shortDescription xml:lang="zh_CN">Isr</shortDescription>
-        <description>Israel</description>
-        <description xml:lang="en_GB">Israel</description>
-        <description xml:lang="nl">Israël</description>
-        <description xml:lang="ru">Израиль</description>
-        <description xml:lang="rw">Isirayeli</description>
-        <description xml:lang="vi">Israel</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>lyx</name>
-            <description>lyx</description>
-            <description xml:lang="af">lyx</description>
-            <description xml:lang="az">lyx</description>
-            <description xml:lang="cs">lyx</description>
-            <description xml:lang="da">lyx</description>
-            <description xml:lang="en_GB">lyx</description>
-            <description xml:lang="fr">lyx</description>
-            <description xml:lang="hu">lyx</description>
-            <description xml:lang="nl">lyx</description>
-            <description xml:lang="ru">lyx</description>
-            <description xml:lang="sk">lyx</description>
-            <description xml:lang="sq">lyx</description>
-            <description xml:lang="sr">lyx</description>
-            <description xml:lang="sv">lyx</description>
-            <description xml:lang="tr">lyx</description>
-            <description xml:lang="uk">lyx</description>
-            <description xml:lang="vi">lyx</description>
-            <description xml:lang="zh_CN">lyx</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>si1452</name>
-            <description>si1452</description>
-            <description xml:lang="af">si1452</description>
-            <description xml:lang="az">si1452</description>
-            <description xml:lang="cs">si1452</description>
-            <description xml:lang="da">si1452</description>
-            <description xml:lang="en_GB">si1452</description>
-            <description xml:lang="fr">si1452</description>
-            <description xml:lang="hu">si1452</description>
-            <description xml:lang="nl">si1452</description>
-            <description xml:lang="ru">si1452</description>
-            <description xml:lang="sk">si1452</description>
-            <description xml:lang="sq">si1452</description>
-            <description xml:lang="sr">si1452</description>
-            <description xml:lang="sv">si1452</description>
-            <description xml:lang="tr">si1452</description>
-            <description xml:lang="uk">si1452</description>
-            <description xml:lang="vi">si1452</description>
-            <description xml:lang="zh_CN">si1452</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>phonetic</name>
-            <description>Phonetic</description>
-            <description xml:lang="af">Foneties</description>
-            <description xml:lang="az">Fonetik</description>
-            <description xml:lang="cs">Fonetické</description>
-            <description xml:lang="da">Fonetisk</description>
-            <description xml:lang="el">Φωνητικά</description>
-            <description xml:lang="en_GB">Phonetic</description>
-            <description xml:lang="fr">Phonétique</description>
-            <description xml:lang="hu">fonetikus</description>
-            <description xml:lang="nl">Fonetisch</description>
-            <description xml:lang="ru">Фонетическая</description>
-            <description xml:lang="rw">Nyigamvugo:</description>
-            <description xml:lang="sk">Fonetické</description>
-            <description xml:lang="sq">Phonetic</description>
-            <description xml:lang="sr">фонетски</description>
-            <description xml:lang="sv">Fonetisk</description>
-            <description xml:lang="tr">Fonetik</description>
-            <description xml:lang="uk">Фонетична</description>
-            <description xml:lang="vi">Ngữ âm</description>
-            <description xml:lang="zh_CN">Phonetic</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>it</name>
-        <shortDescription>Ita</shortDescription>
-        <shortDescription xml:lang="af">Ita</shortDescription>
-        <shortDescription xml:lang="az">İta</shortDescription>
-        <shortDescription xml:lang="cs">Ita</shortDescription>
-        <shortDescription xml:lang="da">Ita</shortDescription>
-        <shortDescription xml:lang="en_GB">Ita</shortDescription>
-        <shortDescription xml:lang="fr">Ita</shortDescription>
-        <shortDescription xml:lang="hu">Ita</shortDescription>
-        <shortDescription xml:lang="nl">Ita</shortDescription>
-        <shortDescription xml:lang="ru">Ит</shortDescription>
-        <shortDescription xml:lang="sk">Tal</shortDescription>
-        <shortDescription xml:lang="sq">Ita</shortDescription>
-        <shortDescription xml:lang="sr">ита</shortDescription>
-        <shortDescription xml:lang="sv">Ita</shortDescription>
-        <shortDescription xml:lang="tr">İta</shortDescription>
-        <shortDescription xml:lang="uk">Іта</shortDescription>
-        <shortDescription xml:lang="vi">Ita</shortDescription>
-        <shortDescription xml:lang="zh_CN">Ita</shortDescription>
-        <description>Italy</description>
-        <description xml:lang="en_GB">Italy</description>
-        <description xml:lang="nl">Italië</description>
-        <description xml:lang="ru">Италия</description>
-        <description xml:lang="rw">Ubutariyani</description>
-        <description xml:lang="vi">Italy</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>jp</name>
-        <shortDescription>Jpn</shortDescription>
-        <shortDescription xml:lang="af">Jpn</shortDescription>
-        <shortDescription xml:lang="az">Ypn</shortDescription>
-        <shortDescription xml:lang="cs">Jap</shortDescription>
-        <shortDescription xml:lang="da">Jpn</shortDescription>
-        <shortDescription xml:lang="el">Ιαπ</shortDescription>
-        <shortDescription xml:lang="en_GB">Jpn</shortDescription>
-        <shortDescription xml:lang="fr">Jpn</shortDescription>
-        <shortDescription xml:lang="hu">Jpn</shortDescription>
-        <shortDescription xml:lang="nl">Jpn</shortDescription>
-        <shortDescription xml:lang="ru">Яп</shortDescription>
-        <shortDescription xml:lang="sk">Jpn</shortDescription>
-        <shortDescription xml:lang="sq">Jpn</shortDescription>
-        <shortDescription xml:lang="sr">јпн</shortDescription>
-        <shortDescription xml:lang="sv">Jpn</shortDescription>
-        <shortDescription xml:lang="tr">Jpn</shortDescription>
-        <shortDescription xml:lang="uk">Япо</shortDescription>
-        <shortDescription xml:lang="vi">Jpn</shortDescription>
-        <shortDescription xml:lang="zh_CN">Jpn</shortDescription>
-        <description>Japan</description>
-        <description xml:lang="en_GB">Japan</description>
-        <description xml:lang="nl">Japan</description>
-        <description xml:lang="ru">Япония</description>
-        <description xml:lang="rw">Ubuyapani</description>
-        <description xml:lang="vi">Nhật Bản</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>kg</name>
-        <shortDescription>Kyr</shortDescription>
-        <shortDescription xml:lang="en_GB">Kyr</shortDescription>
-        <shortDescription xml:lang="nl">Syr</shortDescription>
-        <shortDescription xml:lang="ru">Кыр</shortDescription>
-        <shortDescription xml:lang="vi">Kyr</shortDescription>
-        <description>Kyrgyzstan</description>
-        <description xml:lang="en_GB">Kyrgyzstan</description>
-        <description xml:lang="nl">Kirgizië</description>
-        <description xml:lang="ru">Кыргызстан</description>
-        <description xml:lang="rw">Kirigizasitani</description>
-        <description xml:lang="vi">Kyrgyzstan</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>la</name>
-        <shortDescription>Lao</shortDescription>
-        <shortDescription xml:lang="en_GB">Lao</shortDescription>
-        <shortDescription xml:lang="nl">Mal</shortDescription>
-        <shortDescription xml:lang="ru">Лао</shortDescription>
-        <shortDescription xml:lang="rw">Lawo</shortDescription>
-        <shortDescription xml:lang="vi">Lào</shortDescription>
-        <description>Laos</description>
-        <description xml:lang="en_GB">Laos</description>
-        <description xml:lang="nl">Laos</description>
-        <description xml:lang="ru">Лаос</description>
-        <description xml:lang="vi">Lào</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>latam</name>
-        <shortDescription>LAm</shortDescription>
-        <shortDescription xml:lang="af">LAm</shortDescription>
-        <shortDescription xml:lang="az">LAm</shortDescription>
-        <shortDescription xml:lang="cs">LAm</shortDescription>
-        <shortDescription xml:lang="da">LAm</shortDescription>
-        <shortDescription xml:lang="en_GB">LAm</shortDescription>
-        <shortDescription xml:lang="fr">LAm</shortDescription>
-        <shortDescription xml:lang="hu">LAm</shortDescription>
-        <shortDescription xml:lang="nl">LAm</shortDescription>
-        <shortDescription xml:lang="ru">ЛатАм</shortDescription>
-        <shortDescription xml:lang="sk">LAm</shortDescription>
-        <shortDescription xml:lang="sq">LAm</shortDescription>
-        <shortDescription xml:lang="sr">ЈАм</shortDescription>
-        <shortDescription xml:lang="sv">LAm</shortDescription>
-        <shortDescription xml:lang="tr">LAm</shortDescription>
-        <shortDescription xml:lang="uk">ЛатАм</shortDescription>
-        <shortDescription xml:lang="vi">LAm</shortDescription>
-        <shortDescription xml:lang="zh_CN">LAm</shortDescription>
-        <description>Latin American</description>
-        <description xml:lang="en_GB">Latin American</description>
-        <description xml:lang="nl">Latijns-Amerika</description>
-        <description xml:lang="ru">Латиноамериканская</description>
-        <description xml:lang="vi">La tinh Mỹ</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>sundeadkeys</name>
-            <description>Sun dead keys</description>
-            <description xml:lang="af">Sun (dooie sleutels)</description>
-            <description xml:lang="az">Sun ölü düymələr</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Mrtvé klávesy Sun</description>
-            <description xml:lang="da">Sun døde taster</description>
-            <description xml:lang="en_GB">Sun dead keys</description>
-            <description xml:lang="fr">clés mortes Sun</description>
-            <description xml:lang="hu">Sun halott billentyűk</description>
-            <description xml:lang="nl">Sun dode toetsen</description>
-            <description xml:lang="ru">Специальные клавиши (dead keys) Sun</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Mŕtve klávesy Sun</description>
-            <description xml:lang="sq">Pulsantë të vdekur Sun</description>
-            <description xml:lang="sr">Sun-ови акценти</description>
-            <description xml:lang="sv">Sun stumma tangenter</description>
-            <description xml:lang="tr">Sun ölü tuşlar</description>
-            <description xml:lang="uk">Спеціальні клавіші (dead keys) Sun</description>
-            <description xml:lang="vi">Phím chết Sun</description>
-            <description xml:lang="zh_CN">Sun 死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>lt</name>
-        <shortDescription>Ltu</shortDescription>
-        <shortDescription xml:lang="af">Ltu</shortDescription>
-        <shortDescription xml:lang="az">Ltu</shortDescription>
-        <shortDescription xml:lang="cs">Lit</shortDescription>
-        <shortDescription xml:lang="da">Lit</shortDescription>
-        <shortDescription xml:lang="en_GB">Ltu</shortDescription>
-        <shortDescription xml:lang="fr">Ltu</shortDescription>
-        <shortDescription xml:lang="hu">Ltu</shortDescription>
-        <shortDescription xml:lang="nl">Ltu</shortDescription>
-        <shortDescription xml:lang="ru">Лит</shortDescription>
-        <shortDescription xml:lang="sk">Lit</shortDescription>
-        <shortDescription xml:lang="sq">Ltu</shortDescription>
-        <shortDescription xml:lang="sr">лтв</shortDescription>
-        <shortDescription xml:lang="sv">Ltu</shortDescription>
-        <shortDescription xml:lang="tr">Ltu</shortDescription>
-        <shortDescription xml:lang="uk">Лит</shortDescription>
-        <shortDescription xml:lang="vi">Ltu</shortDescription>
-        <shortDescription xml:lang="zh_CN">Ltu</shortDescription>
-        <description>Lithuania</description>
-        <description xml:lang="en_GB">Lithuania</description>
-        <description xml:lang="nl">Litouwen</description>
-        <description xml:lang="ru">Литва</description>
-        <description xml:lang="rw">Lituwaniya</description>
-        <description xml:lang="vi">Li-tu-a-ni</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>std</name>
-            <description>"Standard"</description>
-            <description xml:lang="el">"Εξ ορισμού"</description>
-            <description xml:lang="en_GB">"Standard"</description>
-            <description xml:lang="nl">"Standaard"</description>
-            <description xml:lang="ru">"Стандартная"</description>
-            <description xml:lang="rw">"Bisanzwe-</description>
-            <description xml:lang="vi">"Tiêu chuẩn"</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>us</name>
-            <description>US keyboard with Lithuanian letters</description>
-            <description xml:lang="en_GB">US keyboard with Lithuanian letters</description>
-            <description xml:lang="nl">Amerikaans toetsenbord met Litouwse letters</description>
-            <description xml:lang="ru">Клавиатура США с литовскими буквами</description>
-            <description xml:lang="rw">Mwandikisho Na:</description>
-            <description xml:lang="vi">Bàn phím Mỹ với các chữ cái Li-tu-a-nia</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>lv</name>
-        <shortDescription>Lva</shortDescription>
-        <shortDescription xml:lang="af">Lva</shortDescription>
-        <shortDescription xml:lang="az">Lva</shortDescription>
-        <shortDescription xml:lang="cs">Lot</shortDescription>
-        <shortDescription xml:lang="da">Let</shortDescription>
-        <shortDescription xml:lang="en_GB">Lva</shortDescription>
-        <shortDescription xml:lang="fr">Lva</shortDescription>
-        <shortDescription xml:lang="hu">Lva</shortDescription>
-        <shortDescription xml:lang="nl">Lva</shortDescription>
-        <shortDescription xml:lang="ru">Латв</shortDescription>
-        <shortDescription xml:lang="sk">Lot</shortDescription>
-        <shortDescription xml:lang="sq">Lva</shortDescription>
-        <shortDescription xml:lang="sr">лет</shortDescription>
-        <shortDescription xml:lang="sv">Lva</shortDescription>
-        <shortDescription xml:lang="tr">Lva</shortDescription>
-        <shortDescription xml:lang="uk">Латв</shortDescription>
-        <shortDescription xml:lang="vi">Lva</shortDescription>
-        <shortDescription xml:lang="zh_CN">Lva</shortDescription>
-        <description>Latvia</description>
-        <description xml:lang="en_GB">Latvia</description>
-        <description xml:lang="nl">Letland</description>
-        <description xml:lang="ru">Латвия</description>
-        <description xml:lang="rw">Lativiya</description>
-        <description xml:lang="vi">Lát-via</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>apostrophe</name>
-            <description>Apostrophe (') variant</description>
-            <description xml:lang="en_GB">Apostrophe (') variant</description>
-            <description xml:lang="ru">Вариант с апострофом (')</description>
-            <description xml:lang="vi">Phương án hô ngữ (')</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tilde</name>
-            <description>Tilde (~) variant</description>
-            <description xml:lang="en_GB">Tilde (~) variant</description>
-            <description xml:lang="ru">Вариант с тильдой (~)</description>
-            <description xml:lang="vi">Phương án dấu sóng (~)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>fkey</name>
-            <description>F-letter (F) variant</description>
-            <description xml:lang="en_GB">F-letter (F) variant</description>
-            <description xml:lang="nl">F-letter (F) variant</description>
-            <description xml:lang="ru">Вариант с F</description>
-            <description xml:lang="rw">Ibaruwa...</description>
-            <description xml:lang="vi">Phương án chữ cái F (F)</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>mao</name>
-        <shortDescription>Mao</shortDescription>
-        <shortDescription xml:lang="en_GB">Mao</shortDescription>
-        <shortDescription xml:lang="nl">Mal</shortDescription>
-        <shortDescription xml:lang="ru">Мао</shortDescription>
-        <shortDescription xml:lang="vi">Mao</shortDescription>
-        <description>Maori</description>
-        <description xml:lang="en_GB">Maori</description>
-        <description xml:lang="nl">Maori</description>
-        <description xml:lang="ru">Маори</description>
-        <description xml:lang="rw">Ikimawori</description>
-        <description xml:lang="vi">Maori</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>mkd</name>
-        <shortDescription>Mkd</shortDescription>
-        <shortDescription xml:lang="af">Mkd</shortDescription>
-        <shortDescription xml:lang="az">Mkd</shortDescription>
-        <shortDescription xml:lang="cs">Mak</shortDescription>
-        <shortDescription xml:lang="da">Mkd</shortDescription>
-        <shortDescription xml:lang="en_GB">Mkd</shortDescription>
-        <shortDescription xml:lang="fr">Mkd</shortDescription>
-        <shortDescription xml:lang="hu">Mkd</shortDescription>
-        <shortDescription xml:lang="nl">Mkd</shortDescription>
-        <shortDescription xml:lang="ru">Мак</shortDescription>
-        <shortDescription xml:lang="sk">Mak</shortDescription>
-        <shortDescription xml:lang="sq">Mkd</shortDescription>
-        <shortDescription xml:lang="sr">мак</shortDescription>
-        <shortDescription xml:lang="sv">Mkd</shortDescription>
-        <shortDescription xml:lang="tr">Mkd</shortDescription>
-        <shortDescription xml:lang="uk">Мкд</shortDescription>
-        <shortDescription xml:lang="vi">Mkd</shortDescription>
-        <shortDescription xml:lang="zh_CN">Mkd</shortDescription>
-        <description>Macedonian</description>
-        <description xml:lang="af">Masedonies</description>
-        <description xml:lang="az">Makedonca</description>
-        <description xml:lang="bg">македонска</description>
-        <description xml:lang="cs">Makedonské</description>
-        <description xml:lang="da">Makedonsk</description>
-        <description xml:lang="el">Φυρομιακά</description>
-        <description xml:lang="en_GB">Macedonian</description>
-        <description xml:lang="fr">Macédonien</description>
-        <description xml:lang="hu">macedón</description>
-        <description xml:lang="nl">Macedonisch</description>
-        <description xml:lang="ru">Македонская</description>
-        <description xml:lang="rw">Nyamasedoniya</description>
-        <description xml:lang="sk">Macedónske</description>
-        <description xml:lang="sq">Maqedonisht</description>
-        <description xml:lang="sr">македонски</description>
-        <description xml:lang="sv">Makedonsk</description>
-        <description xml:lang="tr">Makedonya dili</description>
-        <description xml:lang="uk">Македонська</description>
-        <description xml:lang="vi">Mác-kê-đô-nhia</description>
-        <description xml:lang="zh_CN">马其顿</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>mt</name>
-        <shortDescription>Mlt</shortDescription>
-        <shortDescription xml:lang="af">Mlt</shortDescription>
-        <shortDescription xml:lang="az">Mlt</shortDescription>
-        <shortDescription xml:lang="cs">Mlt</shortDescription>
-        <shortDescription xml:lang="da">Mlt</shortDescription>
-        <shortDescription xml:lang="en_GB">Mlt</shortDescription>
-        <shortDescription xml:lang="fr">Mlt</shortDescription>
-        <shortDescription xml:lang="hu">Mlt</shortDescription>
-        <shortDescription xml:lang="nl">Mlt</shortDescription>
-        <shortDescription xml:lang="ru">Мальт</shortDescription>
-        <shortDescription xml:lang="sk">Mlt</shortDescription>
-        <shortDescription xml:lang="sq">Mlt</shortDescription>
-        <shortDescription xml:lang="sr">мал</shortDescription>
-        <shortDescription xml:lang="sv">Mlt</shortDescription>
-        <shortDescription xml:lang="tr">Mlt</shortDescription>
-        <shortDescription xml:lang="uk">Мальт</shortDescription>
-        <shortDescription xml:lang="vi">Mlt</shortDescription>
-        <shortDescription xml:lang="zh_CN">Mlt</shortDescription>
-        <description>Malta</description>
-        <description xml:lang="en_GB">Malta</description>
-        <description xml:lang="nl">Malta</description>
-        <description xml:lang="ru">Мальта</description>
-        <description xml:lang="rw">Malita</description>
-        <description xml:lang="vi">Malta</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>us</name>
-            <description>US keyboard with Maltian letters</description>
-            <description xml:lang="en_GB">US keyboard with Maltian letters</description>
-            <description xml:lang="nl">Amerikaans toetsenbord met Roemeense letters</description>
-            <description xml:lang="ru">Клавиатура США с мальтийскими буквами</description>
-            <description xml:lang="rw">Mwandikisho Na:</description>
-            <description xml:lang="vi">Bàn phím Mỹ với các chữ cái Mal-chi-a</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>mn</name>
-        <shortDescription>Mng</shortDescription>
-        <shortDescription xml:lang="af">Mng</shortDescription>
-        <shortDescription xml:lang="az">Mng</shortDescription>
-        <shortDescription xml:lang="cs">Mng</shortDescription>
-        <shortDescription xml:lang="da">Mng</shortDescription>
-        <shortDescription xml:lang="en_GB">Mng</shortDescription>
-        <shortDescription xml:lang="fr">Mng</shortDescription>
-        <shortDescription xml:lang="hu">Mng</shortDescription>
-        <shortDescription xml:lang="nl">Mng</shortDescription>
-        <shortDescription xml:lang="ru">Монг</shortDescription>
-        <shortDescription xml:lang="sk">Mng</shortDescription>
-        <shortDescription xml:lang="sq">Mng</shortDescription>
-        <shortDescription xml:lang="sr">мон</shortDescription>
-        <shortDescription xml:lang="sv">Mng</shortDescription>
-        <shortDescription xml:lang="tr">Moğ</shortDescription>
-        <shortDescription xml:lang="uk">Монг</shortDescription>
-        <shortDescription xml:lang="vi">Mng</shortDescription>
-        <shortDescription xml:lang="zh_CN">Mng</shortDescription>
-        <description>Mongolia</description>
-        <description xml:lang="en_GB">Mongolia</description>
-        <description xml:lang="nl">Mongolië</description>
-        <description xml:lang="ru">Монголия</description>
-        <description xml:lang="rw">Mongoliya</description>
-        <description xml:lang="vi">Mông cổ</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>no</name>
-        <shortDescription>Nor</shortDescription>
-        <shortDescription xml:lang="af">Nor</shortDescription>
-        <shortDescription xml:lang="az">Nor</shortDescription>
-        <shortDescription xml:lang="cs">Nor</shortDescription>
-        <shortDescription xml:lang="da">Nor</shortDescription>
-        <shortDescription xml:lang="en_GB">Nor</shortDescription>
-        <shortDescription xml:lang="fr">Nor</shortDescription>
-        <shortDescription xml:lang="hu">Nor</shortDescription>
-        <shortDescription xml:lang="nl">Nor</shortDescription>
-        <shortDescription xml:lang="ru">Нор</shortDescription>
-        <shortDescription xml:lang="sk">Nor</shortDescription>
-        <shortDescription xml:lang="sq">Nor</shortDescription>
-        <shortDescription xml:lang="sr">нор</shortDescription>
-        <shortDescription xml:lang="sv">Nor</shortDescription>
-        <shortDescription xml:lang="tr">Nor</shortDescription>
-        <shortDescription xml:lang="uk">Нор</shortDescription>
-        <shortDescription xml:lang="vi">Nor</shortDescription>
-        <shortDescription xml:lang="zh_CN">Nor</shortDescription>
-        <description>Norway</description>
-        <description xml:lang="en_GB">Norway</description>
-        <description xml:lang="nl">Noorwegen</description>
-        <description xml:lang="ru">Норвегия</description>
-        <description xml:lang="rw">Noruveje</description>
-        <description xml:lang="vi">Na Uy</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak</name>
-            <description>Dvorak</description>
-            <description xml:lang="af">Dvorak</description>
-            <description xml:lang="az">Dvorak</description>
-            <description xml:lang="bg">Дворак</description>
-            <description xml:lang="cs">Dvorak</description>
-            <description xml:lang="da">Dvorak</description>
-            <description xml:lang="en_GB">Dvorak</description>
-            <description xml:lang="fr">Dvorak</description>
-            <description xml:lang="hu">Dvorak-féle</description>
-            <description xml:lang="nl">Dvorak</description>
-            <description xml:lang="ru">Дворак</description>
-            <description xml:lang="sk">Dvorak</description>
-            <description xml:lang="sq">Dvorak</description>
-            <description xml:lang="sr">дворак</description>
-            <description xml:lang="sv">Dvorak</description>
-            <description xml:lang="tr">Dvorak</description>
-            <description xml:lang="uk">Дворак</description>
-            <description xml:lang="vi">Dvorak</description>
-            <description xml:lang="zh_CN">Dvorak</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>smi</name>
-            <description>Northern Saami</description>
-            <description xml:lang="en_GB">Northern Saami</description>
-            <description xml:lang="nl">Noord-Lapland</description>
-            <description xml:lang="ru">Северная Саамская</description>
-            <description xml:lang="rw">Sami y'Amajyaruguru</description>
-            <description xml:lang="vi">Bắc Saami</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>smi_nodeadkeys</name>
-            <description>Northern Saami, eliminate dead keys</description>
-            <description xml:lang="ru">Северная Саамская, исключить специальные клавиши (dead keys)</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>pl</name>
-        <shortDescription>Pol</shortDescription>
-        <shortDescription xml:lang="af">Pol</shortDescription>
-        <shortDescription xml:lang="az">Pol</shortDescription>
-        <shortDescription xml:lang="bg">полска</shortDescription>
-        <shortDescription xml:lang="cs">Pol</shortDescription>
-        <shortDescription xml:lang="da">Pol</shortDescription>
-        <shortDescription xml:lang="el">Πολ</shortDescription>
-        <shortDescription xml:lang="en_GB">Pol</shortDescription>
-        <shortDescription xml:lang="fr">Pol</shortDescription>
-        <shortDescription xml:lang="hu">Pol</shortDescription>
-        <shortDescription xml:lang="nl">Pol</shortDescription>
-        <shortDescription xml:lang="ru">Польск</shortDescription>
-        <shortDescription xml:lang="sk">Pol</shortDescription>
-        <shortDescription xml:lang="sq">Pol</shortDescription>
-        <shortDescription xml:lang="sr">пољ</shortDescription>
-        <shortDescription xml:lang="sv">Pol</shortDescription>
-        <shortDescription xml:lang="tr">Pol</shortDescription>
-        <shortDescription xml:lang="uk">Пол</shortDescription>
-        <shortDescription xml:lang="vi">Pol</shortDescription>
-        <shortDescription xml:lang="zh_CN">Pol</shortDescription>
-        <description>Poland</description>
-        <description xml:lang="en_GB">Poland</description>
-        <description xml:lang="nl">Polen</description>
-        <description xml:lang="ru">Польша</description>
-        <description xml:lang="rw">Polonye</description>
-        <description xml:lang="vi">Phần Lan</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>qwertz</name>
-            <description>qwertz</description>
-            <description xml:lang="en_GB">qwertz</description>
-            <description xml:lang="nl">qwertz</description>
-            <description xml:lang="ru">qwertz</description>
-            <description xml:lang="vi">qwertz</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak</name>
-            <description>Dvorak</description>
-            <description xml:lang="af">Dvorak</description>
-            <description xml:lang="az">Dvorak</description>
-            <description xml:lang="bg">Дворак</description>
-            <description xml:lang="cs">Dvorak</description>
-            <description xml:lang="da">Dvorak</description>
-            <description xml:lang="en_GB">Dvorak</description>
-            <description xml:lang="fr">Dvorak</description>
-            <description xml:lang="hu">Dvorak-féle</description>
-            <description xml:lang="nl">Dvorak</description>
-            <description xml:lang="ru">Дворак</description>
-            <description xml:lang="sk">Dvorak</description>
-            <description xml:lang="sq">Dvorak</description>
-            <description xml:lang="sr">дворак</description>
-            <description xml:lang="sv">Dvorak</description>
-            <description xml:lang="tr">Dvorak</description>
-            <description xml:lang="uk">Дворак</description>
-            <description xml:lang="vi">Dvorak</description>
-            <description xml:lang="zh_CN">Dvorak</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak_quotes</name>
-            <description>Dvorak, Polish quotes on quotemark key</description>
-            <description xml:lang="en_GB">Dvorak, Polish quotes on quotemark key</description>
-            <description xml:lang="ru">Dvorak, польские кавычки на клавишах с кавычками</description>
-            <description xml:lang="rw">ku Urufunguzo</description>
-            <description xml:lang="vi">Dvorak, dấu ngoặc Polish trên phím đánh dấu ngoặc</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak_altquotes</name>
-            <description>Dvorak, Polish quotes on key "1/!"</description>
-            <description xml:lang="en_GB">Dvorak, Polish quotes on key "1/!"</description>
-            <description xml:lang="ru">Dvorak, польские кавычки на клавише "1/!"</description>
-            <description xml:lang="rw">ku Urufunguzo 1.</description>
-            <description xml:lang="vi">Dvorak, dấu ngoặc Polish trên phím "1/!"</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>pt</name>
-        <shortDescription>Prt</shortDescription>
-        <shortDescription xml:lang="af">Prt</shortDescription>
-        <shortDescription xml:lang="az">Prt</shortDescription>
-        <shortDescription xml:lang="cs">Prt</shortDescription>
-        <shortDescription xml:lang="da">Prt</shortDescription>
-        <shortDescription xml:lang="en_GB">Prt</shortDescription>
-        <shortDescription xml:lang="fr">Prt</shortDescription>
-        <shortDescription xml:lang="hu">Prt</shortDescription>
-        <shortDescription xml:lang="nl">Prt</shortDescription>
-        <shortDescription xml:lang="ru">Порт</shortDescription>
-        <shortDescription xml:lang="sk">Prt</shortDescription>
-        <shortDescription xml:lang="sq">Prt</shortDescription>
-        <shortDescription xml:lang="sr">прт</shortDescription>
-        <shortDescription xml:lang="sv">Prt</shortDescription>
-        <shortDescription xml:lang="tr">Prt</shortDescription>
-        <shortDescription xml:lang="uk">Порт</shortDescription>
-        <shortDescription xml:lang="vi">Prt</shortDescription>
-        <shortDescription xml:lang="zh_CN">Prt</shortDescription>
-        <description>Portugal</description>
-        <description xml:lang="en_GB">Portugal</description>
-        <description xml:lang="nl">Portugal</description>
-        <description xml:lang="ru">Португалия</description>
-        <description xml:lang="rw">Porutigali</description>
-        <description xml:lang="vi">Bồ Đào Nha</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>sundeadkeys</name>
-            <description>Sun dead keys</description>
-            <description xml:lang="af">Sun (dooie sleutels)</description>
-            <description xml:lang="az">Sun ölü düymələr</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Mrtvé klávesy Sun</description>
-            <description xml:lang="da">Sun døde taster</description>
-            <description xml:lang="en_GB">Sun dead keys</description>
-            <description xml:lang="fr">clés mortes Sun</description>
-            <description xml:lang="hu">Sun halott billentyűk</description>
-            <description xml:lang="nl">Sun dode toetsen</description>
-            <description xml:lang="ru">Специальные клавиши (dead keys) Sun</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Mŕtve klávesy Sun</description>
-            <description xml:lang="sq">Pulsantë të vdekur Sun</description>
-            <description xml:lang="sr">Sun-ови акценти</description>
-            <description xml:lang="sv">Sun stumma tangenter</description>
-            <description xml:lang="tr">Sun ölü tuşlar</description>
-            <description xml:lang="uk">Спеціальні клавіші (dead keys) Sun</description>
-            <description xml:lang="vi">Phím chết Sun</description>
-            <description xml:lang="zh_CN">Sun 死键</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ro</name>
-        <shortDescription>Rou</shortDescription>
-        <shortDescription xml:lang="af">Rou</shortDescription>
-        <shortDescription xml:lang="az">Rou</shortDescription>
-        <shortDescription xml:lang="cs">Rum</shortDescription>
-        <shortDescription xml:lang="da">Rum</shortDescription>
-        <shortDescription xml:lang="en_GB">Rou</shortDescription>
-        <shortDescription xml:lang="fr">Rou</shortDescription>
-        <shortDescription xml:lang="hu">Rou</shortDescription>
-        <shortDescription xml:lang="nl">Rou</shortDescription>
-        <shortDescription xml:lang="ru">Рум</shortDescription>
-        <shortDescription xml:lang="sk">Rum</shortDescription>
-        <shortDescription xml:lang="sq">Rou</shortDescription>
-        <shortDescription xml:lang="sr">рум</shortDescription>
-        <shortDescription xml:lang="sv">Rou</shortDescription>
-        <shortDescription xml:lang="tr">Rou</shortDescription>
-        <shortDescription xml:lang="uk">Рум</shortDescription>
-        <shortDescription xml:lang="vi">Rou</shortDescription>
-        <shortDescription xml:lang="zh_CN">Rou</shortDescription>
-        <description>Romania</description>
-        <description xml:lang="en_GB">Romania</description>
-        <description xml:lang="nl">Roemenië</description>
-        <description xml:lang="ru">Румыния</description>
-        <description xml:lang="rw">Romaniya</description>
-        <description xml:lang="vi">Rô-ma-ni</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>us</name>
-            <description>US keyboard with Romanian letters</description>
-            <description xml:lang="af">VSA sleutelbord met Romeense letters</description>
-            <description xml:lang="az">Roman hərfli ABŞ klaviaturası</description>
-            <description xml:lang="cs">Americká klávesnice s rumunskými písmeny</description>
-            <description xml:lang="da">US-tastatur med rumænske bogstaver</description>
-            <description xml:lang="en_GB">US keyboard with Romanian letters</description>
-            <description xml:lang="fr">clavier US avec lettres roumaines</description>
-            <description xml:lang="hu">US billentyűzet román betűkkel</description>
-            <description xml:lang="nl">Amerikaans toetsenbord met Roemeense letters</description>
-            <description xml:lang="ru">Клавиатура США с румынскими буквами</description>
-            <description xml:lang="rw">Mwandikisho Na:</description>
-            <description xml:lang="sk">Americká klávesnica s rumunskými písmami</description>
-            <description xml:lang="sq">Tastierë US me gërma Romane</description>
-            <description xml:lang="sr">Америчка тастатура са румунским словима</description>
-            <description xml:lang="sv">USA-tangentbord med rumänska bokstäver</description>
-            <description xml:lang="tr">Romen harfleriyle amerikan klavyesi</description>
-            <description xml:lang="uk">Клавіатура США з румунськими буквами</description>
-            <description xml:lang="vi">Bàn phím Mỹ với các chữ cái Ro-ma-ni</description>
-            <description xml:lang="zh_CN">美国键盘,带罗马尼亚字符</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>de</name>
-            <description>Romanian keyboard with German letters</description>
-            <description xml:lang="en_GB">Romanian keyboard with German letters</description>
-            <description xml:lang="nl">Roemeens toetsenbord met Duitse letters</description>
-            <description xml:lang="ru">Румынская клавиатура с немецкими буквами</description>
-            <description xml:lang="rw">Mwandikisho Na:</description>
-            <description xml:lang="vi">Bàn phím Rô-ma-ni với các chữ cái Đức</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ru</name>
-        <shortDescription>Rus</shortDescription>
-        <shortDescription xml:lang="af">Rus</shortDescription>
-        <shortDescription xml:lang="az">Rus</shortDescription>
-        <shortDescription xml:lang="cs">Rus</shortDescription>
-        <shortDescription xml:lang="da">Rus</shortDescription>
-        <shortDescription xml:lang="el">Ρωσ</shortDescription>
-        <shortDescription xml:lang="en_GB">Rus</shortDescription>
-        <shortDescription xml:lang="fr">Rus</shortDescription>
-        <shortDescription xml:lang="hu">Rus</shortDescription>
-        <shortDescription xml:lang="nl">Rus</shortDescription>
-        <shortDescription xml:lang="ru">Рус</shortDescription>
-        <shortDescription xml:lang="sk">Rus</shortDescription>
-        <shortDescription xml:lang="sq">Rus</shortDescription>
-        <shortDescription xml:lang="sr">рус</shortDescription>
-        <shortDescription xml:lang="sv">Rus</shortDescription>
-        <shortDescription xml:lang="tr">Rus</shortDescription>
-        <shortDescription xml:lang="uk">Рос</shortDescription>
-        <shortDescription xml:lang="vi">Nga</shortDescription>
-        <shortDescription xml:lang="zh_CN">Rus</shortDescription>
-        <description>Russia</description>
-        <description xml:lang="en_GB">Russia</description>
-        <description xml:lang="nl">Rusland</description>
-        <description xml:lang="ru">Россия</description>
-        <description xml:lang="vi">Nga</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>phonetic</name>
-            <description>Phonetic</description>
-            <description xml:lang="af">Foneties</description>
-            <description xml:lang="az">Fonetik</description>
-            <description xml:lang="cs">Fonetické</description>
-            <description xml:lang="da">Fonetisk</description>
-            <description xml:lang="el">Φωνητικά</description>
-            <description xml:lang="en_GB">Phonetic</description>
-            <description xml:lang="fr">Phonétique</description>
-            <description xml:lang="hu">fonetikus</description>
-            <description xml:lang="nl">Fonetisch</description>
-            <description xml:lang="ru">Фонетическая</description>
-            <description xml:lang="rw">Nyigamvugo:</description>
-            <description xml:lang="sk">Fonetické</description>
-            <description xml:lang="sq">Phonetic</description>
-            <description xml:lang="sr">фонетски</description>
-            <description xml:lang="sv">Fonetisk</description>
-            <description xml:lang="tr">Fonetik</description>
-            <description xml:lang="uk">Фонетична</description>
-            <description xml:lang="vi">Ngữ âm</description>
-            <description xml:lang="zh_CN">Phonetic</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>typewriter</name>
-            <description>Typewriter</description>
-            <description xml:lang="ru">Печатная машинка</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>winkeys</name>
-            <description>Winkeys</description>
-            <description xml:lang="af">Winkeys</description>
-            <description xml:lang="az">Winkeys</description>
-            <description xml:lang="cs">Winkeys</description>
-            <description xml:lang="da">Win-taster</description>
-            <description xml:lang="en_GB">Winkeys</description>
-            <description xml:lang="fr">Winkeys</description>
-            <description xml:lang="hu">Winkeys</description>
-            <description xml:lang="nl">Win-toetsen</description>
-            <description xml:lang="ru">Клавиатура Windows</description>
-            <description xml:lang="sk">Win klávesy</description>
-            <description xml:lang="sq">Winkeys</description>
-            <description xml:lang="sr">Windows тастери</description>
-            <description xml:lang="sv">Wintangenter</description>
-            <description xml:lang="tr">Win tuşları</description>
-            <description xml:lang="uk">Розкладка Windows</description>
-            <description xml:lang="vi">Phím Win</description>
-            <description xml:lang="zh_CN">Winkeys</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>srp</name>
-        <shortDescription>Srp</shortDescription>
-        <shortDescription xml:lang="en_GB">Srp</shortDescription>
-        <shortDescription xml:lang="nl">Syr</shortDescription>
-        <shortDescription xml:lang="ru">Срб</shortDescription>
-        <shortDescription xml:lang="vi">Srp</shortDescription>
-        <description>Serbian</description>
-        <description xml:lang="af">Serbies</description>
-        <description xml:lang="az">Servcə</description>
-        <description xml:lang="bg">сръбска</description>
-        <description xml:lang="cs">Srbské</description>
-        <description xml:lang="da">Serbisk</description>
-        <description xml:lang="en_GB">Serbian</description>
-        <description xml:lang="fr">Serbe</description>
-        <description xml:lang="hu">szerb</description>
-        <description xml:lang="nl">Servisch</description>
-        <description xml:lang="ru">Сербская</description>
-        <description xml:lang="rw">Ikinyaseribiya</description>
-        <description xml:lang="sk">Srbské</description>
-        <description xml:lang="sq">Sërbisht</description>
-        <description xml:lang="sr">српски</description>
-        <description xml:lang="sv">Serbisk</description>
-        <description xml:lang="tr">Sırpça</description>
-        <description xml:lang="uk">Сербська</description>
-        <description xml:lang="vi">Séc-bia</description>
-        <description xml:lang="zh_CN">塞尔维亚</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>yz</name>
-            <description>Z and ZHE swapped</description>
-            <description xml:lang="en_GB">Z and ZHE swapped</description>
-            <description xml:lang="nl">Z en ZHE verwisseld</description>
-            <description xml:lang="ru">З и Ж переставлены</description>
-            <description xml:lang="rw">Na</description>
-            <description xml:lang="vi">Đổi chỗ Z và ZHE</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>latin</name>
-            <description>Latin</description>
-            <description xml:lang="af">Latyns</description>
-            <description xml:lang="az">Latın</description>
-            <description xml:lang="bg">латвийска</description>
-            <description xml:lang="cs">Latinské</description>
-            <description xml:lang="da">Latin</description>
-            <description xml:lang="en_GB">Latin</description>
-            <description xml:lang="fr">Latin</description>
-            <description xml:lang="hu">latin</description>
-            <description xml:lang="nl">Latijn</description>
-            <description xml:lang="ru">Латинская</description>
-            <description xml:lang="rw">Ikiratini</description>
-            <description xml:lang="sk">Latinské</description>
-            <description xml:lang="sq">Latinishte</description>
-            <description xml:lang="sr">латинични</description>
-            <description xml:lang="sv">Latin</description>
-            <description xml:lang="tr">Latin</description>
-            <description xml:lang="uk">Латинська</description>
-            <description xml:lang="vi">La tinh</description>
-            <description xml:lang="zh_CN">拉丁</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>latinunicode</name>
-            <description>Latin Unicode</description>
-            <description xml:lang="en_GB">Latin Unicode</description>
-            <description xml:lang="nl">Latijns-Unicode</description>
-            <description xml:lang="ru">Латинская Unicode</description>
-            <description xml:lang="vi">La tinh Unicode</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>latinyz</name>
-            <description>Latin qwerty</description>
-            <description xml:lang="en_GB">Latin qwerty</description>
-            <description xml:lang="nl">Latijns qwerty</description>
-            <description xml:lang="ru">Латинская qwerty</description>
-            <description xml:lang="vi">La tinh qwerty</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>latinunicodeyz</name>
-            <description>Latin Unicode qwerty</description>
-            <description xml:lang="en_GB">Latin Unicode qwerty</description>
-            <description xml:lang="nl">Latijns-Unicode qwerty</description>
-            <description xml:lang="ru">Латинская Unicode qwerty</description>
-            <description xml:lang="vi">La tinh Unicode qwerty</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>alternatequotes</name>
-            <description>With guillemots</description>
-            <description xml:lang="en_GB">With guillemots</description>
-            <description xml:lang="ru">С guillemots</description>
-            <description xml:lang="vi">Với chim guillemot</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>latinalternatequotes</name>
-            <description>Latin with guillemots</description>
-            <description xml:lang="en_GB">Latin with guillemots</description>
-            <description xml:lang="ru">Латинская с guillemots</description>
-            <description xml:lang="rw">Na:</description>
-            <description xml:lang="vi">La tinh với chim guillemot</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>si</name>
-        <shortDescription>Svn</shortDescription>
-        <shortDescription xml:lang="af">Svn</shortDescription>
-        <shortDescription xml:lang="az">Svn</shortDescription>
-        <shortDescription xml:lang="cs">Svn</shortDescription>
-        <shortDescription xml:lang="da">Svn</shortDescription>
-        <shortDescription xml:lang="en_GB">Svn</shortDescription>
-        <shortDescription xml:lang="fr">Svn</shortDescription>
-        <shortDescription xml:lang="hu">Svn</shortDescription>
-        <shortDescription xml:lang="nl">Svn</shortDescription>
-        <shortDescription xml:lang="ru">Cловен</shortDescription>
-        <shortDescription xml:lang="sk">Svn</shortDescription>
-        <shortDescription xml:lang="sq">Svn</shortDescription>
-        <shortDescription xml:lang="sr">сло</shortDescription>
-        <shortDescription xml:lang="sv">Svn</shortDescription>
-        <shortDescription xml:lang="tr">Svn</shortDescription>
-        <shortDescription xml:lang="uk">Словен</shortDescription>
-        <shortDescription xml:lang="vi">Svn</shortDescription>
-        <shortDescription xml:lang="zh_CN">Svn</shortDescription>
-        <description>Slovenia</description>
-        <description xml:lang="en_GB">Slovenia</description>
-        <description xml:lang="nl">Slovenië</description>
-        <description xml:lang="ru">Словения</description>
-        <description xml:lang="rw">Siloveniya</description>
-        <description xml:lang="vi">Slovenia</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>sk</name>
-        <shortDescription>Svk</shortDescription>
-        <shortDescription xml:lang="af">Svk</shortDescription>
-        <shortDescription xml:lang="az">Svk</shortDescription>
-        <shortDescription xml:lang="bg">словашка</shortDescription>
-        <shortDescription xml:lang="cs">Svk</shortDescription>
-        <shortDescription xml:lang="da">Svk</shortDescription>
-        <shortDescription xml:lang="en_GB">Svk</shortDescription>
-        <shortDescription xml:lang="fr">Svk</shortDescription>
-        <shortDescription xml:lang="hu">Svk</shortDescription>
-        <shortDescription xml:lang="nl">Svk</shortDescription>
-        <shortDescription xml:lang="ru">Слов</shortDescription>
-        <shortDescription xml:lang="sk">Svk</shortDescription>
-        <shortDescription xml:lang="sq">Svk</shortDescription>
-        <shortDescription xml:lang="sr">слк</shortDescription>
-        <shortDescription xml:lang="sv">Svk</shortDescription>
-        <shortDescription xml:lang="tr">Svk</shortDescription>
-        <shortDescription xml:lang="uk">Слов</shortDescription>
-        <shortDescription xml:lang="vi">Svk</shortDescription>
-        <shortDescription xml:lang="zh_CN">Svk</shortDescription>
-        <description>Slovakia</description>
-        <description xml:lang="en_GB">Slovakia</description>
-        <description xml:lang="nl">Slowakije</description>
-        <description xml:lang="ru">Словакия</description>
-        <description xml:lang="rw">Silovakiya</description>
-        <description xml:lang="vi">Slovakia</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>bksl</name>
-            <description>Extended Backslash</description>
-            <description xml:lang="en_GB">Extended Backslash</description>
-            <description xml:lang="nl">Uitgebreide backslash</description>
-            <description xml:lang="ru">Расширенные функции Backslash</description>
-            <description xml:lang="vi">Gạch chéo ngược Mở rộng</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>qwerty</name>
-            <description>qwerty</description>
-            <description xml:lang="af">qwerty</description>
-            <description xml:lang="az">qwerty</description>
-            <description xml:lang="bg">чешка (qwerty)</description>
-            <description xml:lang="cs">qwerty</description>
-            <description xml:lang="da">qwerty</description>
-            <description xml:lang="en_GB">qwerty</description>
-            <description xml:lang="fr">qwerty</description>
-            <description xml:lang="hu">qwerty</description>
-            <description xml:lang="nl">qwerty</description>
-            <description xml:lang="ru">qwerty</description>
-            <description xml:lang="sk">qwerty</description>
-            <description xml:lang="sq">qwerty</description>
-            <description xml:lang="sr">qwerty</description>
-            <description xml:lang="sv">qwerty</description>
-            <description xml:lang="tr">qwerty</description>
-            <description xml:lang="uk">qwerty</description>
-            <description xml:lang="vi">qwerty</description>
-            <description xml:lang="zh_CN">qwerty</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>qwerty_bksl</name>
-            <description>qwerty, extended Backslash</description>
-            <description xml:lang="en_GB">qwerty, extended Backslash</description>
-            <description xml:lang="nl">qwerty, uitgebreide backslash</description>
-            <description xml:lang="ru">qwerty, расширенные функции Backslash</description>
-            <description xml:lang="rw">Byongerewe...</description>
-            <description xml:lang="vi">qwerty, Gạch ngược mở rộng</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>es</name>
-        <shortDescription>Esp</shortDescription>
-        <shortDescription xml:lang="af">Esp</shortDescription>
-        <shortDescription xml:lang="az">İsp</shortDescription>
-        <shortDescription xml:lang="cs">Špa</shortDescription>
-        <shortDescription xml:lang="da">Esp</shortDescription>
-        <shortDescription xml:lang="en_GB">Esp</shortDescription>
-        <shortDescription xml:lang="fr">Esp</shortDescription>
-        <shortDescription xml:lang="hu">Esp</shortDescription>
-        <shortDescription xml:lang="nl">Esp</shortDescription>
-        <shortDescription xml:lang="ru">Исп</shortDescription>
-        <shortDescription xml:lang="sk">Špa</shortDescription>
-        <shortDescription xml:lang="sq">Esp</shortDescription>
-        <shortDescription xml:lang="sr">шпа</shortDescription>
-        <shortDescription xml:lang="sv">Esp</shortDescription>
-        <shortDescription xml:lang="tr">İsp</shortDescription>
-        <shortDescription xml:lang="uk">Ісп</shortDescription>
-        <shortDescription xml:lang="vi">Esp</shortDescription>
-        <shortDescription xml:lang="zh_CN">Esp</shortDescription>
-        <description>Spain</description>
-        <description xml:lang="en_GB">Spain</description>
-        <description xml:lang="nl">Spanje</description>
-        <description xml:lang="ru">Испания</description>
-        <description xml:lang="rw">Esipanye</description>
-        <description xml:lang="vi">Tây Ban Nha</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>sundeadkeys</name>
-            <description>Sun dead keys</description>
-            <description xml:lang="af">Sun (dooie sleutels)</description>
-            <description xml:lang="az">Sun ölü düymələr</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Mrtvé klávesy Sun</description>
-            <description xml:lang="da">Sun døde taster</description>
-            <description xml:lang="en_GB">Sun dead keys</description>
-            <description xml:lang="fr">clés mortes Sun</description>
-            <description xml:lang="hu">Sun halott billentyűk</description>
-            <description xml:lang="nl">Sun dode toetsen</description>
-            <description xml:lang="ru">Специальные клавиши (dead keys) Sun</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Mŕtve klávesy Sun</description>
-            <description xml:lang="sq">Pulsantë të vdekur Sun</description>
-            <description xml:lang="sr">Sun-ови акценти</description>
-            <description xml:lang="sv">Sun stumma tangenter</description>
-            <description xml:lang="tr">Sun ölü tuşlar</description>
-            <description xml:lang="uk">Спеціальні клавіші (dead keys) Sun</description>
-            <description xml:lang="vi">Phím chết Sun</description>
-            <description xml:lang="zh_CN">Sun 死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak</name>
-            <description>Dvorak</description>
-            <description xml:lang="af">Dvorak</description>
-            <description xml:lang="az">Dvorak</description>
-            <description xml:lang="bg">Дворак</description>
-            <description xml:lang="cs">Dvorak</description>
-            <description xml:lang="da">Dvorak</description>
-            <description xml:lang="en_GB">Dvorak</description>
-            <description xml:lang="fr">Dvorak</description>
-            <description xml:lang="hu">Dvorak-féle</description>
-            <description xml:lang="nl">Dvorak</description>
-            <description xml:lang="ru">Дворак</description>
-            <description xml:lang="sk">Dvorak</description>
-            <description xml:lang="sq">Dvorak</description>
-            <description xml:lang="sr">дворак</description>
-            <description xml:lang="sv">Dvorak</description>
-            <description xml:lang="tr">Dvorak</description>
-            <description xml:lang="uk">Дворак</description>
-            <description xml:lang="vi">Dvorak</description>
-            <description xml:lang="zh_CN">Dvorak</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>se</name>
-        <shortDescription>Swe</shortDescription>
-        <shortDescription xml:lang="af">Swe</shortDescription>
-        <shortDescription xml:lang="az">Swe</shortDescription>
-        <shortDescription xml:lang="cs">Švé</shortDescription>
-        <shortDescription xml:lang="da">Sve</shortDescription>
-        <shortDescription xml:lang="el">Σου</shortDescription>
-        <shortDescription xml:lang="en_GB">Swe</shortDescription>
-        <shortDescription xml:lang="fr">Sué</shortDescription>
-        <shortDescription xml:lang="hu">Swe</shortDescription>
-        <shortDescription xml:lang="nl">Swe</shortDescription>
-        <shortDescription xml:lang="ru">Швед</shortDescription>
-        <shortDescription xml:lang="sk">Swe</shortDescription>
-        <shortDescription xml:lang="sq">Swe</shortDescription>
-        <shortDescription xml:lang="sr">шве</shortDescription>
-        <shortDescription xml:lang="sv">Swe</shortDescription>
-        <shortDescription xml:lang="tr">İsve</shortDescription>
-        <shortDescription xml:lang="uk">Швед</shortDescription>
-        <shortDescription xml:lang="vi">Swe</shortDescription>
-        <shortDescription xml:lang="zh_CN">Swe</shortDescription>
-        <description>Sweden</description>
-        <description xml:lang="en_GB">Sweden</description>
-        <description xml:lang="nl">Zweden</description>
-        <description xml:lang="ru">Швеция</description>
-        <description xml:lang="rw">Suwede</description>
-        <description xml:lang="vi">Thụy Điển</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>nodeadkeys</name>
-            <description>Eliminate dead keys</description>
-            <description xml:lang="af">Elimineer dooie sleutels</description>
-            <description xml:lang="az">Ölü düymələri sayma</description>
-            <description xml:lang="bg">Изключи специалните клавиши (dead keys)</description>
-            <description xml:lang="cs">Eliminovat mrtvé klávesy</description>
-            <description xml:lang="da">Slå døde taster fra</description>
-            <description xml:lang="el">Χωρίς νεκρά πλήκτρα</description>
-            <description xml:lang="en_GB">Eliminate dead keys</description>
-            <description xml:lang="fr">éliminer des clés mortes</description>
-            <description xml:lang="hu">Halott billentyűk tiltása</description>
-            <description xml:lang="nl">Dode toetsen niet doen</description>
-            <description xml:lang="ru">Исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="sk">Eliminovať mrtvé kláves</description>
-            <description xml:lang="sq">Elemino pulsantët e vdekur</description>
-            <description xml:lang="sr">Уклони акценте</description>
-            <description xml:lang="sv">Eliminera stumma tangenter</description>
-            <description xml:lang="tr">Ölü tuşları normal yapar</description>
-            <description xml:lang="uk">Вилучити спеціальні клавіші (dead keys)</description>
-            <description xml:lang="vi">Phím chết loại trừ</description>
-            <description xml:lang="zh_CN">除去死键</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak</name>
-            <description>Dvorak</description>
-            <description xml:lang="af">Dvorak</description>
-            <description xml:lang="az">Dvorak</description>
-            <description xml:lang="bg">Дворак</description>
-            <description xml:lang="cs">Dvorak</description>
-            <description xml:lang="da">Dvorak</description>
-            <description xml:lang="en_GB">Dvorak</description>
-            <description xml:lang="fr">Dvorak</description>
-            <description xml:lang="hu">Dvorak-féle</description>
-            <description xml:lang="nl">Dvorak</description>
-            <description xml:lang="ru">Дворак</description>
-            <description xml:lang="sk">Dvorak</description>
-            <description xml:lang="sq">Dvorak</description>
-            <description xml:lang="sr">дворак</description>
-            <description xml:lang="sv">Dvorak</description>
-            <description xml:lang="tr">Dvorak</description>
-            <description xml:lang="uk">Дворак</description>
-            <description xml:lang="vi">Dvorak</description>
-            <description xml:lang="zh_CN">Dvorak</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>rus</name>
-            <description>Russian phonetic</description>
-            <description xml:lang="ru">Русская фонетическая</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>rus_nodeadkeys</name>
-            <description>Russian phonetic, eliminate dead keys</description>
-            <description xml:lang="ru">Русская фонетическая, исключить специальные клавиши (dead keys)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>smi</name>
-            <description>Northern Saami</description>
-            <description xml:lang="en_GB">Northern Saami</description>
-            <description xml:lang="nl">Noord-Lapland</description>
-            <description xml:lang="ru">Северная Саамская</description>
-            <description xml:lang="rw">Sami y'Amajyaruguru</description>
-            <description xml:lang="vi">Bắc Saami</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ch</name>
-        <shortDescription>Che</shortDescription>
-        <shortDescription xml:lang="en_GB">Che</shortDescription>
-        <shortDescription xml:lang="nl">Cze</shortDescription>
-        <shortDescription xml:lang="ru">Швейц.</shortDescription>
-        <shortDescription xml:lang="vi">Che</shortDescription>
-        <description>Switzerland</description>
-        <description xml:lang="en_GB">Switzerland</description>
-        <description xml:lang="nl">Zwitserland</description>
-        <description xml:lang="ru">Швейцария</description>
-        <description xml:lang="rw">Ubusuwisi</description>
-        <description xml:lang="vi">Thụy Sĩ</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>de_nodeadkeys</name>
-            <description>German, eliminate dead keys</description>
-            <description xml:lang="en_GB">German, eliminate dead keys</description>
-            <description xml:lang="nl">Duits, zonder dode toetsen</description>
-            <description xml:lang="ru">Немецкая, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="vi">Đức, phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>de_sundeadkeys</name>
-            <description>German, Sun dead keys</description>
-            <description xml:lang="en_GB">German, Sun dead keys</description>
-            <description xml:lang="nl">Duits, Sun-dode toetsen</description>
-            <description xml:lang="ru">Немецкая, специальные клавиши (dead keys) Sun</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="vi">Đức, phím chết Sun</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>fr</name>
-            <description>French</description>
-            <description xml:lang="af">Frans</description>
-            <description xml:lang="az">Fransızca</description>
-            <description xml:lang="bg">френска</description>
-            <description xml:lang="cs">Francouzské</description>
-            <description xml:lang="da">Fransk</description>
-            <description xml:lang="el">Γαλλικά</description>
-            <description xml:lang="en_GB">French</description>
-            <description xml:lang="fr">Français</description>
-            <description xml:lang="hu">francia</description>
-            <description xml:lang="nl">Frans</description>
-            <description xml:lang="ru">Французская</description>
-            <description xml:lang="rw">Igifaransa</description>
-            <description xml:lang="sk">Francúzske</description>
-            <description xml:lang="sq">Frengjisht</description>
-            <description xml:lang="sr">француски</description>
-            <description xml:lang="sv">Fransk</description>
-            <description xml:lang="tr">Fransızca</description>
-            <description xml:lang="uk">Французька</description>
-            <description xml:lang="vi">Pháp</description>
-            <description xml:lang="zh_CN">法语</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>fr_nodeadkeys</name>
-            <description>French, eliminate dead keys</description>
-            <description xml:lang="en_GB">French, eliminate dead keys</description>
-            <description xml:lang="nl">Frans, zonder dode toetsen</description>
-            <description xml:lang="ru">Французская, исключить специальные клавиши (dead keys)</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="vi">Pháp, phím chết loại trừ</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>fr_sundeadkeys</name>
-            <description>French, Sun dead keys</description>
-            <description xml:lang="en_GB">French, Sun dead keys</description>
-            <description xml:lang="nl">Frans, Sun-dode toetsen</description>
-            <description xml:lang="ru">Французская, специальные клавиши (dead keys) Sun</description>
-            <description xml:lang="rw">Utubuto</description>
-            <description xml:lang="vi">Pháp, phím chết Sun</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>sy</name>
-        <shortDescription>Syr</shortDescription>
-        <shortDescription xml:lang="af">Syr</shortDescription>
-        <shortDescription xml:lang="az">Syr</shortDescription>
-        <shortDescription xml:lang="bg">сръбска</shortDescription>
-        <shortDescription xml:lang="cs">Syr</shortDescription>
-        <shortDescription xml:lang="da">Syr</shortDescription>
-        <shortDescription xml:lang="el">Συρ</shortDescription>
-        <shortDescription xml:lang="en_GB">Syr</shortDescription>
-        <shortDescription xml:lang="fr">Syr</shortDescription>
-        <shortDescription xml:lang="hu">Syr</shortDescription>
-        <shortDescription xml:lang="nl">Syr</shortDescription>
-        <shortDescription xml:lang="ru">Асс</shortDescription>
-        <shortDescription xml:lang="sk">Syr</shortDescription>
-        <shortDescription xml:lang="sq">Syr</shortDescription>
-        <shortDescription xml:lang="sr">сир</shortDescription>
-        <shortDescription xml:lang="sv">Syr</shortDescription>
-        <shortDescription xml:lang="tr">Sur</shortDescription>
-        <shortDescription xml:lang="uk">Сир</shortDescription>
-        <shortDescription xml:lang="vi">Syr</shortDescription>
-        <shortDescription xml:lang="zh_CN">Syr</shortDescription>
-        <description>Syria</description>
-        <description xml:lang="ru">Сирийская</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>syc</name>
-            <description>Syriac</description>
-            <description xml:lang="af">Siries</description>
-            <description xml:lang="az">Syriac</description>
-            <description xml:lang="bg">сръбска</description>
-            <description xml:lang="cs">Syrské</description>
-            <description xml:lang="da">Syrisk</description>
-            <description xml:lang="el">Συριακά</description>
-            <description xml:lang="en_GB">Syriac</description>
-            <description xml:lang="fr">Syriac</description>
-            <description xml:lang="hu">szír</description>
-            <description xml:lang="nl">Syrisch</description>
-            <description xml:lang="ru">Сирийская</description>
-            <description xml:lang="rw">Syriac</description>
-            <description xml:lang="sk">Syrské</description>
-            <description xml:lang="sq">Siriane</description>
-            <description xml:lang="sr">сиријски</description>
-            <description xml:lang="sv">Syrisk</description>
-            <description xml:lang="tr">Suriye dili</description>
-            <description xml:lang="uk">Сирійська</description>
-            <description xml:lang="vi">Syriac</description>
-            <description xml:lang="zh_CN">叙利亚</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>syc_phonetic</name>
-            <description>Syriac phonetic</description>
-            <description xml:lang="ru">Сирийская фонетическая</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>tj</name>
-        <shortDescription>Tjk</shortDescription>
-        <shortDescription xml:lang="af">Tjk</shortDescription>
-        <shortDescription xml:lang="az">Tac</shortDescription>
-        <shortDescription xml:lang="bg">таджикска</shortDescription>
-        <shortDescription xml:lang="cs">Tjk</shortDescription>
-        <shortDescription xml:lang="da">Tjk</shortDescription>
-        <shortDescription xml:lang="en_GB">Tjk</shortDescription>
-        <shortDescription xml:lang="fr">Tjk</shortDescription>
-        <shortDescription xml:lang="hu">Tjk</shortDescription>
-        <shortDescription xml:lang="nl">Tjk</shortDescription>
-        <shortDescription xml:lang="ru">Тадж</shortDescription>
-        <shortDescription xml:lang="sk">Tjk</shortDescription>
-        <shortDescription xml:lang="sq">Tjk</shortDescription>
-        <shortDescription xml:lang="sr">тџк</shortDescription>
-        <shortDescription xml:lang="sv">Tjk</shortDescription>
-        <shortDescription xml:lang="tr">Tck</shortDescription>
-        <shortDescription xml:lang="uk">Тдж</shortDescription>
-        <shortDescription xml:lang="vi">Tjk</shortDescription>
-        <shortDescription xml:lang="zh_CN">Tjk</shortDescription>
-        <description>Tajikistan</description>
-        <description xml:lang="en_GB">Tajikistan</description>
-        <description xml:lang="nl">Tadzjikistan</description>
-        <description xml:lang="ru">Таджикистан</description>
-        <description xml:lang="rw">Tajikisitani</description>
-        <description xml:lang="vi">Ta-zi-kix-tan</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>lk</name>
-        <shortDescription>SrL</shortDescription>
-        <shortDescription xml:lang="ru">ШрЛ</shortDescription>
-        <description>Sri Lanka</description>
-        <description xml:lang="ru">Шри Ланка</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>tam_unicode</name>
-            <description>Tamil Unicode</description>
-            <description xml:lang="ru">Тамильская Unicode</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_TAB</name>
-            <description>Tamil TAB Typewriter</description>
-            <description xml:lang="ru">Тамильская "Печатная машинка" TAB</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>tam_TSCII</name>
-            <description>Tamil TSCII Typewriter</description>
-            <description xml:lang="ru">Тамильская "Печатная машинка" TSCII</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>sin_phonetic</name>
-            <description>Sinhala phonetic</description>
-            <description xml:lang="ru">Синхала фонетическая</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>th</name>
-        <shortDescription>Tha</shortDescription>
-        <shortDescription xml:lang="af">Tha</shortDescription>
-        <shortDescription xml:lang="az">Tay</shortDescription>
-        <shortDescription xml:lang="bg">тайландска</shortDescription>
-        <shortDescription xml:lang="cs">Tha</shortDescription>
-        <shortDescription xml:lang="da">Tha</shortDescription>
-        <shortDescription xml:lang="en_GB">Tha</shortDescription>
-        <shortDescription xml:lang="fr">Tha</shortDescription>
-        <shortDescription xml:lang="hu">Tha</shortDescription>
-        <shortDescription xml:lang="nl">Tha</shortDescription>
-        <shortDescription xml:lang="ru">Таи</shortDescription>
-        <shortDescription xml:lang="sk">Tha</shortDescription>
-        <shortDescription xml:lang="sq">Tha</shortDescription>
-        <shortDescription xml:lang="sr">тај</shortDescription>
-        <shortDescription xml:lang="sv">Tha</shortDescription>
-        <shortDescription xml:lang="tr">Tha</shortDescription>
-        <shortDescription xml:lang="uk">Тай</shortDescription>
-        <shortDescription xml:lang="vi">Tha</shortDescription>
-        <shortDescription xml:lang="zh_CN">Tha</shortDescription>
-        <description>Thailand</description>
-        <description xml:lang="en_GB">Thailand</description>
-        <description xml:lang="nl">Thaïland</description>
-        <description xml:lang="ru">Таиланд</description>
-        <description xml:lang="rw">Tayilande</description>
-        <description xml:lang="vi">Thái Lan</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>tis</name>
-            <description>TIS-820.2538</description>
-            <description xml:lang="en_GB">TIS-820.2538</description>
-            <description xml:lang="nl">TIS-820.2538</description>
-            <description xml:lang="ru">TIS-820.2538</description>
-            <description xml:lang="vi">TIS-820.2538</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>pat</name>
-            <description>Pattachote</description>
-            <description xml:lang="en_GB">Pattachote</description>
-            <description xml:lang="nl">Pattachote</description>
-            <description xml:lang="ru">Паттачот</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>tr</name>
-        <shortDescription>Tur</shortDescription>
-        <shortDescription xml:lang="af">Tur</shortDescription>
-        <shortDescription xml:lang="az">Tür</shortDescription>
-        <shortDescription xml:lang="cs">Tur</shortDescription>
-        <shortDescription xml:lang="da">Tyr</shortDescription>
-        <shortDescription xml:lang="el">Του</shortDescription>
-        <shortDescription xml:lang="en_GB">Tur</shortDescription>
-        <shortDescription xml:lang="fr">Tur</shortDescription>
-        <shortDescription xml:lang="hu">Tur</shortDescription>
-        <shortDescription xml:lang="nl">Tur</shortDescription>
-        <shortDescription xml:lang="ru">Тур</shortDescription>
-        <shortDescription xml:lang="sk">Tur</shortDescription>
-        <shortDescription xml:lang="sq">Tur</shortDescription>
-        <shortDescription xml:lang="sr">тур</shortDescription>
-        <shortDescription xml:lang="sv">Tur</shortDescription>
-        <shortDescription xml:lang="tr">Trk</shortDescription>
-        <shortDescription xml:lang="uk">Тур</shortDescription>
-        <shortDescription xml:lang="vi">Tur</shortDescription>
-        <shortDescription xml:lang="zh_CN">Tur</shortDescription>
-        <description>Turkish </description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>f</name>
-            <description>(F)</description>
-            <description xml:lang="en_GB">(F)</description>
-            <description xml:lang="nl">(F)</description>
-            <description xml:lang="ru">(F)</description>
-            <description xml:lang="vi">(F)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>alt</name>
-            <description>Alt-Q</description>
-            <description xml:lang="el">Alt-Q</description>
-            <description xml:lang="en_GB">Alt-Q</description>
-            <description xml:lang="nl">Alt-Q</description>
-            <description xml:lang="ru">Alt-Q</description>
-            <description xml:lang="vi">Alt-Q</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ua</name>
-        <shortDescription>Ukr</shortDescription>
-        <shortDescription xml:lang="af">Ukr</shortDescription>
-        <shortDescription xml:lang="az">Ukr</shortDescription>
-        <shortDescription xml:lang="cs">Ukr</shortDescription>
-        <shortDescription xml:lang="da">Ukr</shortDescription>
-        <shortDescription xml:lang="el">Ουκ</shortDescription>
-        <shortDescription xml:lang="en_GB">Ukr</shortDescription>
-        <shortDescription xml:lang="fr">Ukr</shortDescription>
-        <shortDescription xml:lang="hu">Ukr</shortDescription>
-        <shortDescription xml:lang="nl">Ukr</shortDescription>
-        <shortDescription xml:lang="ru">Укр</shortDescription>
-        <shortDescription xml:lang="sk">Ukr</shortDescription>
-        <shortDescription xml:lang="sq">Ukr</shortDescription>
-        <shortDescription xml:lang="sr">укр</shortDescription>
-        <shortDescription xml:lang="sv">Ukr</shortDescription>
-        <shortDescription xml:lang="tr">Ukr</shortDescription>
-        <shortDescription xml:lang="uk">Укр</shortDescription>
-        <shortDescription xml:lang="vi">Ukr</shortDescription>
-        <shortDescription xml:lang="zh_CN">Ukr</shortDescription>
-        <description>Ukraine</description>
-        <description xml:lang="en_GB">Ukraine</description>
-        <description xml:lang="nl">Oekraïne</description>
-        <description xml:lang="ru">Украина</description>
-        <description xml:lang="rw">Ikerene</description>
-        <description xml:lang="vi">U-cra-in</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>phonetic</name>
-            <description>Phonetic</description>
-            <description xml:lang="af">Foneties</description>
-            <description xml:lang="az">Fonetik</description>
-            <description xml:lang="cs">Fonetické</description>
-            <description xml:lang="da">Fonetisk</description>
-            <description xml:lang="el">Φωνητικά</description>
-            <description xml:lang="en_GB">Phonetic</description>
-            <description xml:lang="fr">Phonétique</description>
-            <description xml:lang="hu">fonetikus</description>
-            <description xml:lang="nl">Fonetisch</description>
-            <description xml:lang="ru">Фонетическая</description>
-            <description xml:lang="rw">Nyigamvugo:</description>
-            <description xml:lang="sk">Fonetické</description>
-            <description xml:lang="sq">Phonetic</description>
-            <description xml:lang="sr">фонетски</description>
-            <description xml:lang="sv">Fonetisk</description>
-            <description xml:lang="tr">Fonetik</description>
-            <description xml:lang="uk">Фонетична</description>
-            <description xml:lang="vi">Ngữ âm</description>
-            <description xml:lang="zh_CN">Phonetic</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>typewriter</name>
-            <description>Typewriter</description>
-            <description xml:lang="ru">Печатная машинка</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>winkeys</name>
-            <description>Winkeys</description>
-            <description xml:lang="af">Winkeys</description>
-            <description xml:lang="az">Winkeys</description>
-            <description xml:lang="cs">Winkeys</description>
-            <description xml:lang="da">Win-taster</description>
-            <description xml:lang="en_GB">Winkeys</description>
-            <description xml:lang="fr">Winkeys</description>
-            <description xml:lang="hu">Winkeys</description>
-            <description xml:lang="nl">Win-toetsen</description>
-            <description xml:lang="ru">Клавиатура Windows</description>
-            <description xml:lang="sk">Win klávesy</description>
-            <description xml:lang="sq">Winkeys</description>
-            <description xml:lang="sr">Windows тастери</description>
-            <description xml:lang="sv">Wintangenter</description>
-            <description xml:lang="tr">Win tuşları</description>
-            <description xml:lang="uk">Розкладка Windows</description>
-            <description xml:lang="vi">Phím Win</description>
-            <description xml:lang="zh_CN">Winkeys</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>rstu</name>
-<!-- RSTU 2019-91 -->
-            <description>Standard RSTU</description>
-            <description xml:lang="ru">Стандартная RSTU</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>rstu_ru</name>
-<!-- RSTU 2019-91 -->
-            <description>Standard RSTU on Russian layout</description>
-            <description xml:lang="ru">Стандартная RSTU, русская</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>gb</name>
-        <shortDescription>GBr</shortDescription>
-        <shortDescription xml:lang="af">GBr</shortDescription>
-        <shortDescription xml:lang="az">GBr</shortDescription>
-        <shortDescription xml:lang="cs">VBr</shortDescription>
-        <shortDescription xml:lang="da">GBr</shortDescription>
-        <shortDescription xml:lang="en_GB">GBr</shortDescription>
-        <shortDescription xml:lang="fr">GBr</shortDescription>
-        <shortDescription xml:lang="hu">GBr</shortDescription>
-        <shortDescription xml:lang="nl">GBr</shortDescription>
-        <shortDescription xml:lang="ru">Брит</shortDescription>
-        <shortDescription xml:lang="sk">VBr</shortDescription>
-        <shortDescription xml:lang="sq">GBr</shortDescription>
-        <shortDescription xml:lang="sr">вбр</shortDescription>
-        <shortDescription xml:lang="sv">GBr</shortDescription>
-        <shortDescription xml:lang="tr">GBr</shortDescription>
-        <shortDescription xml:lang="uk">Брит</shortDescription>
-        <shortDescription xml:lang="vi">GBr</shortDescription>
-        <shortDescription xml:lang="zh_CN">GBr</shortDescription>
-        <description>United Kingdom</description>
-        <description xml:lang="af">Vereenigde Koninkryk</description>
-        <description xml:lang="az">Birləşik Krallıq</description>
-        <description xml:lang="bg">британска</description>
-        <description xml:lang="cs">Spojené království</description>
-        <description xml:lang="da">United Kingdom</description>
-        <description xml:lang="el">Ηνωμένο Βασίλειο</description>
-        <description xml:lang="en_GB">United Kingdom</description>
-        <description xml:lang="fr">Royaume Uni</description>
-        <description xml:lang="hu">brit angol</description>
-        <description xml:lang="nl">Verenigd Koninkrijk</description>
-        <description xml:lang="ru">Английская (Великобритания)</description>
-        <description xml:lang="rw">Ubwongereza (UK)</description>
-        <description xml:lang="sk">Spojené kráľovstvo</description>
-        <description xml:lang="sq">Mbretëria e Bashkuar</description>
-        <description xml:lang="sr">Велика Британија</description>
-        <description xml:lang="sv">Storbritannien</description>
-        <description xml:lang="tr">İngiltere</description>
-        <description xml:lang="uk">Англійська (Великобританія)</description>
-        <description xml:lang="vi">Vương Quốc Anh</description>
-        <description xml:lang="zh_CN">英国</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>intl</name>
-            <description>International (with dead keys)</description>
-            <description xml:lang="en_GB">International (with dead keys)</description>
-            <description xml:lang="nl">Internationaal (met dode toetsen)</description>
-            <description xml:lang="ru">Международная, со спец. клавишами (dead keys)</description>
-            <description xml:lang="rw">Na: Utubuto</description>
-            <description xml:lang="vi">Quốc tế (với phím chết)</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dvorak</name>
-            <description>Dvorak</description>
-            <description xml:lang="af">Dvorak</description>
-            <description xml:lang="az">Dvorak</description>
-            <description xml:lang="bg">Дворак</description>
-            <description xml:lang="cs">Dvorak</description>
-            <description xml:lang="da">Dvorak</description>
-            <description xml:lang="en_GB">Dvorak</description>
-            <description xml:lang="fr">Dvorak</description>
-            <description xml:lang="hu">Dvorak-féle</description>
-            <description xml:lang="nl">Dvorak</description>
-            <description xml:lang="ru">Дворак</description>
-            <description xml:lang="sk">Dvorak</description>
-            <description xml:lang="sq">Dvorak</description>
-            <description xml:lang="sr">дворак</description>
-            <description xml:lang="sv">Dvorak</description>
-            <description xml:lang="tr">Dvorak</description>
-            <description xml:lang="uk">Дворак</description>
-            <description xml:lang="vi">Dvorak</description>
-            <description xml:lang="zh_CN">Dvorak</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>uz</name>
-        <shortDescription>Uzb</shortDescription>
-        <shortDescription xml:lang="af">Uzb</shortDescription>
-        <shortDescription xml:lang="az">Özb</shortDescription>
-        <shortDescription xml:lang="cs">Uzb</shortDescription>
-        <shortDescription xml:lang="da">Uzb</shortDescription>
-        <shortDescription xml:lang="en_GB">Uzb</shortDescription>
-        <shortDescription xml:lang="fr">Uzb</shortDescription>
-        <shortDescription xml:lang="hu">Uzb</shortDescription>
-        <shortDescription xml:lang="nl">Uzb</shortDescription>
-        <shortDescription xml:lang="ru">Узб</shortDescription>
-        <shortDescription xml:lang="sk">Uzb</shortDescription>
-        <shortDescription xml:lang="sq">Uzb</shortDescription>
-        <shortDescription xml:lang="sr">узб</shortDescription>
-        <shortDescription xml:lang="sv">Uzb</shortDescription>
-        <shortDescription xml:lang="tr">Özb</shortDescription>
-        <shortDescription xml:lang="uk">Узб</shortDescription>
-        <shortDescription xml:lang="vi">Uzb</shortDescription>
-        <shortDescription xml:lang="zh_CN">Uzb</shortDescription>
-        <description>Uzbekistan</description>
-        <description xml:lang="en_GB">Uzbekistan</description>
-        <description xml:lang="nl">Oezbekistan</description>
-        <description xml:lang="ru">Узбекистан</description>
-        <description xml:lang="rw">Uzubekisitani</description>
-        <description xml:lang="vi">Uz-bê-kix-tan</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>vn</name>
-        <shortDescription>Vnm</shortDescription>
-        <shortDescription xml:lang="af">Vnm</shortDescription>
-        <shortDescription xml:lang="az">Vye</shortDescription>
-        <shortDescription xml:lang="cs">Vnm</shortDescription>
-        <shortDescription xml:lang="da">Vnm</shortDescription>
-        <shortDescription xml:lang="en_GB">Vnm</shortDescription>
-        <shortDescription xml:lang="fr">Vnm</shortDescription>
-        <shortDescription xml:lang="hu">Vnm</shortDescription>
-        <shortDescription xml:lang="nl">Vnm</shortDescription>
-        <shortDescription xml:lang="ru">Вьет</shortDescription>
-        <shortDescription xml:lang="sk">Vnm</shortDescription>
-        <shortDescription xml:lang="sq">Vnm</shortDescription>
-        <shortDescription xml:lang="sr">вјт</shortDescription>
-        <shortDescription xml:lang="sv">Vnm</shortDescription>
-        <shortDescription xml:lang="tr">Vnm</shortDescription>
-        <shortDescription xml:lang="uk">Вьет</shortDescription>
-        <shortDescription xml:lang="vi">Vnm</shortDescription>
-        <shortDescription xml:lang="zh_CN">Vnm</shortDescription>
-        <description>Vietnam</description>
-        <description xml:lang="en_GB">Vietnam</description>
-        <description xml:lang="nl">Viëtnam</description>
-        <description xml:lang="ru">Вьетнам</description>
-        <description xml:lang="rw">Viyetinamu</description>
-        <description xml:lang="vi">Việt nam</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>nec_vndr/jp</name>
-        <shortDescription>Jpn</shortDescription>
-        <shortDescription xml:lang="af">Jpn</shortDescription>
-        <shortDescription xml:lang="az">Ypn</shortDescription>
-        <shortDescription xml:lang="cs">Jap</shortDescription>
-        <shortDescription xml:lang="da">Jpn</shortDescription>
-        <shortDescription xml:lang="el">Ιαπ</shortDescription>
-        <shortDescription xml:lang="en_GB">Jpn</shortDescription>
-        <shortDescription xml:lang="fr">Jpn</shortDescription>
-        <shortDescription xml:lang="hu">Jpn</shortDescription>
-        <shortDescription xml:lang="nl">Jpn</shortDescription>
-        <shortDescription xml:lang="ru">Яп</shortDescription>
-        <shortDescription xml:lang="sk">Jpn</shortDescription>
-        <shortDescription xml:lang="sq">Jpn</shortDescription>
-        <shortDescription xml:lang="sr">јпн</shortDescription>
-        <shortDescription xml:lang="sv">Jpn</shortDescription>
-        <shortDescription xml:lang="tr">Jpn</shortDescription>
-        <shortDescription xml:lang="uk">Япо</shortDescription>
-        <shortDescription xml:lang="vi">Jpn</shortDescription>
-        <shortDescription xml:lang="zh_CN">Jpn</shortDescription>
-        <description>PC-98xx Series</description>
-        <description xml:lang="af">PC-98xx Reeks</description>
-        <description xml:lang="az">PC-98xx Seriyaları</description>
-        <description xml:lang="bg">PC-98xx серии</description>
-        <description xml:lang="cs">PC-98xx řada</description>
-        <description xml:lang="da">PC-98xx-serien</description>
-        <description xml:lang="en_GB">PC-98xx Series</description>
-        <description xml:lang="fr">PC-98xx Series</description>
-        <description xml:lang="hu">PC-98xx Series</description>
-        <description xml:lang="nl">PC-98xx serie</description>
-        <description xml:lang="ru">PC-98xx</description>
-        <description xml:lang="sk">Séria PC-98xx</description>
-        <description xml:lang="sq">Seritë PC-98xx</description>
-        <description xml:lang="sr">PC-98xx серија</description>
-        <description xml:lang="sv">PC-98xx-serien</description>
-        <description xml:lang="tr">PC-98xx Serisi</description>
-        <description xml:lang="uk">Моделі PC-98xx</description>
-        <description xml:lang="vi">Sê ri PC-98xx</description>
-        <description xml:lang="zh_CN">PC-98xx 系列</description>
-      </configItem>
-      <variantList/>
-    </layout>
-    <layout>
-      <configItem>
-        <name>ie</name>
-        <shortDescription>Irl</shortDescription>
-        <shortDescription xml:lang="af">Irl</shortDescription>
-        <shortDescription xml:lang="az">İrl</shortDescription>
-        <shortDescription xml:lang="cs">Irs</shortDescription>
-        <shortDescription xml:lang="da">Irl</shortDescription>
-        <shortDescription xml:lang="en_GB">Irl</shortDescription>
-        <shortDescription xml:lang="fr">Irl</shortDescription>
-        <shortDescription xml:lang="hu">Irl</shortDescription>
-        <shortDescription xml:lang="nl">Irl</shortDescription>
-        <shortDescription xml:lang="ru">Ирл</shortDescription>
-        <shortDescription xml:lang="sk">Irs</shortDescription>
-        <shortDescription xml:lang="sq">Irl</shortDescription>
-        <shortDescription xml:lang="sr">ирс</shortDescription>
-        <shortDescription xml:lang="sv">Irl</shortDescription>
-        <shortDescription xml:lang="tr">İrl</shortDescription>
-        <shortDescription xml:lang="uk">Ірл</shortDescription>
-        <shortDescription xml:lang="vi">Irl</shortDescription>
-        <shortDescription xml:lang="zh_CN">Irl</shortDescription>
-        <description>Ireland</description>
-        <description xml:lang="en_GB">Ireland</description>
-        <description xml:lang="nl">Ierland</description>
-        <description xml:lang="ru">Ирландия</description>
-        <description xml:lang="rw">Irilande</description>
-        <description xml:lang="vi">Ireland</description>
-      </configItem>
-      <variantList>
-        <variant>
-          <configItem>
-            <name>CloGaelach</name>
-            <description>CloGaelach</description>
-            <description xml:lang="af">CloGaelach</description>
-            <description xml:lang="az">CloGaelach</description>
-            <description xml:lang="cs">CloGaelach</description>
-            <description xml:lang="da">CloGaelach</description>
-            <description xml:lang="en_GB">CloGaelach</description>
-            <description xml:lang="fr">CloGaelach</description>
-            <description xml:lang="hu">CloGaelach</description>
-            <description xml:lang="nl">CloGaelach</description>
-            <description xml:lang="ru">CloGaelach</description>
-            <description xml:lang="sk">CloGaelach</description>
-            <description xml:lang="sq">CloGaelach</description>
-            <description xml:lang="sr">CloGaelach</description>
-            <description xml:lang="sv">CloGaelach</description>
-            <description xml:lang="tr">CloGaelach</description>
-            <description xml:lang="uk">CloGaelach</description>
-            <description xml:lang="vi">CloGaelach</description>
-            <description xml:lang="zh_CN">CloGaelach</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>UnicodeExpert</name>
-            <description>UnicodeExpert</description>
-            <description xml:lang="af">UnicodeExpert</description>
-            <description xml:lang="az">UnicodeExpert</description>
-            <description xml:lang="cs">UnicodeExpert</description>
-            <description xml:lang="da">UnicodeExpert</description>
-            <description xml:lang="en_GB">UnicodeExpert</description>
-            <description xml:lang="fr">UnicodeExpert</description>
-            <description xml:lang="hu">UnicodeExpert</description>
-            <description xml:lang="nl">UnicodeExpert</description>
-            <description xml:lang="ru">UnicodeExpert</description>
-            <description xml:lang="sk">UnicodeExpert</description>
-            <description xml:lang="sq">EkspertUnicode</description>
-            <description xml:lang="sr">Стручна за Уникод</description>
-            <description xml:lang="sv">UnicodeExpert</description>
-            <description xml:lang="tr">Unicode Uzman</description>
-            <description xml:lang="uk">UnicodeExpert</description>
-            <description xml:lang="vi">Unicode Chuyên môn</description>
-            <description xml:lang="zh_CN">UnicodeExpert</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ogam</name>
-            <description>Ogham</description>
-            <description xml:lang="af">Ogham</description>
-            <description xml:lang="az">Ogham</description>
-            <description xml:lang="cs">Oghamské</description>
-            <description xml:lang="da">Ogham</description>
-            <description xml:lang="en_GB">Ogham</description>
-            <description xml:lang="fr">Ogham</description>
-            <description xml:lang="hu">ogham</description>
-            <description xml:lang="nl">Oghamees</description>
-            <description xml:lang="ru">Огхам (древнеирланская)</description>
-            <description xml:lang="rw">Ogham</description>
-            <description xml:lang="sk">Oghamské</description>
-            <description xml:lang="sq">Ogham</description>
-            <description xml:lang="sr">огам</description>
-            <description xml:lang="sv">Ogham</description>
-            <description xml:lang="tr">Ogham</description>
-            <description xml:lang="uk">Огхам (давньоірландська)</description>
-            <description xml:lang="vi">Ogham</description>
-            <description xml:lang="zh_CN">欧甘</description>
-         </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>ogam_is434</name>
-            <description>Ogham IS434</description>
-            <description xml:lang="ru">Огхам IS434</description>
-          </configItem>
-        </variant>
-      </variantList>
-    </layout>
-    <layout>
-      <configItem>
-        <name>pk</name>
-        <shortDescription>Pak</shortDescription>
-        <shortDescription xml:lang="ru">Пак</shortDescription>
-        <description>Pakistan</description>
-        <description xml:lang="ru">Пакистан</description>
-      </configItem>
-      <variantList/>
-    </layout>
- <!--   <layout>
-      <configItem>
-        <name>div</name>
-        <shortDescription>Div</shortDescription>
-        <shortDescription xml:lang="ru">Див</shortDescription>
-        <description>Dhivehi</description>
-        <description xml:lang="ru">Дивехи</description>
-      </configItem>
-      <variantList/>
-    </layout> -->
-  </layoutList>
-  <optionList>
-    <group allowMultipleSelection="true">
-      <!-- The key combination used to switch between groups -->
-      <configItem>
-        <name>grp</name>
-        <description>Group Shift/Lock behavior</description>
-        <description xml:lang="af">Groep Shift/Lock gedrag</description>
-        <description xml:lang="az">Shift/Lock Qrupu Davranışı</description>
-        <description xml:lang="bg">Функции на клавишите Shift/Lock</description>
-        <description xml:lang="cs">Chování skupiny Shift/Lock</description>
-        <description xml:lang="da">Gruppeskift/-lås-opførsel</description>
-        <description xml:lang="en_GB">Group Shift/Lock behaviour</description>
-        <description xml:lang="fr">comportement de groupe Shitf/Lock</description>
-        <description xml:lang="hu">Csoportváltás és -zárolás</description>
-        <description xml:lang="nl">Groepgedrag Shift/Lock</description>
-        <description xml:lang="ru">Функция смены раскладки</description>
-        <description xml:lang="rw">imyitwarire</description>
-        <description xml:lang="sk">Zoskupiť chovanie Shift/Lock</description>
-        <description xml:lang="sq">Sjellja e grupit Shift/Lock</description>
-        <description xml:lang="sr">Понашање измене/избора групе</description>
-        <description xml:lang="sv">Gruppbeteende för Skift/Lock</description>
-        <description xml:lang="tr">Shift/Lock Grubu davranışı</description>
-        <description xml:lang="uk">Функція зміни групи</description>
-        <description xml:lang="vi">Đặc điểm của nhóm Shift/Lock</description>
-        <description xml:lang="zh_CN">组切换/锁定行为</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>grp:switch</name>
-          <description>R-Alt switches group while pressed.</description>
-          <description xml:lang="en_GB">R-Alt switches group while pressed.</description>
-          <description xml:lang="nl">Rechter Alt schakelt groep bij indrukken.</description>
-          <description xml:lang="ru">Правая клавиша Alt переключает группу на время нажатия.</description>
-          <description xml:lang="rw">Itsinda</description>
-          <description xml:lang="vi">R-Alt thay đổi ngôn ngữ nhập vào khi được nhấn.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:lswitch</name>
-          <description>Left Alt key switches group while pressed.</description>
-          <description xml:lang="en_GB">Left Alt key switches group while pressed.</description>
-          <description xml:lang="nl">Linker Alt-toets schakelt groep bij indrukken.</description>
-          <description xml:lang="ru">Левая клавиша Alt переключает группу на время нажатия.</description>
-          <description xml:lang="rw">Urufunguzo Itsinda</description>
-          <description xml:lang="vi">Phím Alt bên trái chuyển đổi ngôn ngữ khi được nhấn.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:lwin_switch</name>
-          <description>Left Win-key switches group while pressed.</description>
-          <description xml:lang="en_GB">Left Win-key switches group while pressed.</description>
-          <description xml:lang="nl">Linker Win-toets schakelt groep bij indrukken.</description>
-          <description xml:lang="ru">Левая клавиша Win переключает группу на время нажатия.</description>
-          <description xml:lang="rw">Urufunguzo Itsinda</description>
-          <description xml:lang="vi">Phím Win bên trái chuyển đổi ngôn ngữ khi được nhấn.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:rwin_switch</name>
-          <description>Right Win-key switches group while pressed.</description>
-          <description xml:lang="en_GB">Right Win-key switches group while pressed.</description>
-          <description xml:lang="nl">Rechter Win-toets schakelt groep bij indrukken.</description>
-          <description xml:lang="ru">Правая клавиша Win переключает группу на время нажатия.</description>
-          <description xml:lang="rw">Urufunguzo Itsinda</description>
-          <description xml:lang="vi">Phím Alt bên phải thay đổi ngôn ngữ nhập vào khi được nhấn.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:win_switch</name>
-          <description>Both Win-keys switch group while pressed.</description>
-          <description xml:lang="en_GB">Both Win-keys switch group while pressed.</description>
-          <description xml:lang="nl">Beide Win-toetsen schakelen groep bij indrukken.</description>
-          <description xml:lang="ru">Две клавиши Win переключает группу на время нажатия.</description>
-          <description xml:lang="rw">Utubuto Hindura Itsinda</description>
-          <description xml:lang="vi">Cả hai phím Win chuyển ngôn ngữ nhập khi nhấn.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:rctrl_switch</name>
-          <description>Right Ctrl key switches group while pressed.</description>
-          <description xml:lang="en_GB">Right Ctrl key switches group while pressed.</description>
-          <description xml:lang="nl">Rechter Ctrl-toets schakelt groep bij indrukken.</description>
-          <description xml:lang="ru">Правая клавиша Ctrl переключает группу на время нажатия.</description>
-          <description xml:lang="rw">Urufunguzo Itsinda</description>
-          <description xml:lang="vi">Ctrl bên phải thay đổi ngôn ngữ nhập vào khi được nhấn.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:toggle</name>
-          <description>Right Alt key changes group.</description>
-          <description xml:lang="en_GB">Right Alt key changes group.</description>
-          <description xml:lang="nl">Rechter Alt-toets verandert groep.</description>
-          <description xml:lang="ru">Правая клавиша Alt меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím Alt bên phải thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:lalt_toggle</name>
-          <description>Left Alt key changes group.</description>
-          <description xml:lang="en_GB">Left Alt key changes group.</description>
-          <description xml:lang="nl">Linker Alt-toets verandert groep.</description>
-          <description xml:lang="ru">Левая клавиша Alt меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím Alt bên trái thay đổi ngôn ngữ nhập vào.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:caps_toggle</name>
-          <description>CapsLock key changes group.</description>
-          <description xml:lang="en_GB">Caps Lock key changes group.</description>
-          <description xml:lang="nl">CapsLock-toets verandert groep.</description>
-          <description xml:lang="ru">Клавиша CapsLock меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím CapsLock thay đổi nhóm.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:shift_caps_toggle</name>
-          <description>Shift+CapsLock changes group.</description>
-          <description xml:lang="en_GB">Shift+Caps Lock changes group.</description>
-          <description xml:lang="nl">Shift+CapsLock verandert groep.</description>
-          <description xml:lang="ru">Клавиши Shift и Caps Lock, нажатые вместе, меняют группу.</description>
-          <description xml:lang="rw">Amahinduka Itsinda</description>
-          <description xml:lang="vi">Shift+CapsLock thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:shifts_toggle</name>
-          <description>Both Shift keys together change group.</description>
-          <description xml:lang="en_GB">Both Shift keys together change group.</description>
-          <description xml:lang="nl">Beide Shift-toetsen samen veranderen groep.</description>
-          <description xml:lang="ru">Две клавиши Shift вместе меняют группу.</description>
-          <description xml:lang="rw">Utubuto Guhindura&gt;&gt; Itsinda</description>
-          <description xml:lang="vi">Nhấn đồng thời hai phím Shift thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:alts_toggle</name>
-          <description>Both Alt keys together change group.</description>
-          <description xml:lang="en_GB">Both Alt keys together change group.</description>
-          <description xml:lang="nl">Beide Alt-toetsen samen veranderen groep.</description>
-          <description xml:lang="ru">Две клавиши Alt вместе меняют группу.</description>
-          <description xml:lang="rw">Utubuto Guhindura&gt;&gt; Itsinda</description>
-          <description xml:lang="vi">Nhấn đồng thời hai phím Alt thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:ctrls_toggle</name>
-          <description>Both Ctrl keys together change group.</description>
-          <description xml:lang="en_GB">Both Ctrl keys together change group.</description>
-          <description xml:lang="nl">Beide Ctrl-toetsen samen veranderen groep.</description>
-          <description xml:lang="ru">Две клавиши Ctrl вместе меняют группу.</description>
-          <description xml:lang="rw">Utubuto Guhindura&gt;&gt; Itsinda</description>
-          <description xml:lang="vi">Nhấn đồng thời hai phím Ctrl thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:ctrl_shift_toggle</name>
-          <description>Control+Shift changes group.</description>
-          <description xml:lang="el">Το Control+Shift αλλάζει ομάδα.</description>
-          <description xml:lang="en_GB">Control+Shift changes group.</description>
-          <description xml:lang="nl">Control+Shift verandert groep.</description>
-          <description xml:lang="ru">Control+Shift меняют группу.</description>
-          <description xml:lang="rw">Amahinduka Itsinda</description>
-          <description xml:lang="vi">Control+Shift thay đổi ngôn ngữ nhập vào.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:ctrl_alt_toggle</name>
-          <description>Alt+Control changes group.</description>
-          <description xml:lang="el">Το Alt+Control αλλάζει ομάδα.</description>
-          <description xml:lang="en_GB">Alt+Control changes group.</description>
-          <description xml:lang="nl">Alt+Control verandert groep.</description>
-          <description xml:lang="ru">Alt+Control меняют группу.</description>
-          <description xml:lang="rw">Amahinduka Itsinda</description>
-          <description xml:lang="vi">Alt+Control thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:alt_shift_toggle</name>
-          <description>Alt+Shift changes group.</description>
-          <description xml:lang="el">Το Alt+Shift αλλάζει ομάδα.</description>
-          <description xml:lang="en_GB">Alt+Shift changes group.</description>
-          <description xml:lang="nl">Alt+Shift verandert groep.</description>
-          <description xml:lang="ru">Alt+Shift меняют группу.</description>
-          <description xml:lang="rw">Amahinduka Itsinda</description>
-          <description xml:lang="vi">Alt+Shift thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:menu_toggle</name>
-          <description>Menu key changes group.</description>
-          <description xml:lang="en_GB">Menu key changes group.</description>
-          <description xml:lang="nl">Menu-toets verandert groep.</description>
-          <description xml:lang="ru">Клавиша Menu меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím Menu thay đổi ngôn ngữ nhập vào.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:lwin_toggle</name>
-          <description>Left Win-key changes group.</description>
-          <description xml:lang="en_GB">Left Win-key changes group.</description>
-          <description xml:lang="nl">Linker Win-toets verandert groep.</description>
-          <description xml:lang="ru">Левая клавиша Win меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím Win bên trái thay đổi ngôn ngữ nhập vào.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:rwin_toggle</name>
-          <description>Right Win-key changes group.</description>
-          <description xml:lang="en_GB">Right Win-key changes group.</description>
-          <description xml:lang="nl">Rechter Win-toets verandert groep.</description>
-          <description xml:lang="ru">Правая клавиша Win меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím Win bên phải thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:lshift_toggle</name>
-          <description>Left Shift key changes group.</description>
-          <description xml:lang="en_GB">Left Shift key changes group.</description>
-          <description xml:lang="nl">Linker Shift-toets verandert groep.</description>
-          <description xml:lang="ru">Левая клавиша Shift меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím Shift bên trái thay đổi ngôn ngữ nhập vào.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:rshift_toggle</name>
-          <description>Right Shift key changes group.</description>
-          <description xml:lang="en_GB">Right Shift key changes group.</description>
-          <description xml:lang="nl">Rechter Shift-toets verandert groep.</description>
-          <description xml:lang="ru">Правая клавиша Shift меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím Shift bên phải thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:lctrl_toggle</name>
-          <description>Left Ctrl key changes group.</description>
-          <description xml:lang="en_GB">Left Ctrl key changes group.</description>
-          <description xml:lang="nl">Linker Ctrl-toets verandert groep.</description>
-          <description xml:lang="ru">Левая клавиша Ctrl меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím Ctrl bên trái thay đổi ngôn ngữ nhập vào.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp:rctrl_toggle</name>
-          <description>Right Ctrl key changes group.</description>
-          <description xml:lang="en_GB">Right Ctrl key changes group.</description>
-          <description xml:lang="nl">Rechter Ctrl-toets verandert groep.</description>
-          <description xml:lang="ru">Правая клавиша Ctrl меняет группу.</description>
-          <description xml:lang="rw">Urufunguzo Amahinduka Itsinda</description>
-          <description xml:lang="vi">Phím Ctrl bên phải thay đổi ngôn ngữ nhập.</description>
-        </configItem>
-      </option>
-    </group>
-    <group allowMultipleSelection="true">
-      <!-- The key combination used to choose the 3rd (and 4th, together with Shift)
-	   level of symbols -->
-      <configItem>
-        <name>lv3</name>
-        <description>Third level choosers</description>
-        <description xml:lang="af">Derdevlak kiesers</description>
-        <description xml:lang="az">Üçüncü səviyyə seçicilər</description>
-        <description xml:lang="bg">Избор на третата група</description>
-        <description xml:lang="cs">Výběr třetí úrovně</description>
-        <description xml:lang="da">Tredje niveaus vælgere</description>
-        <description xml:lang="en_GB">Third level choosers</description>
-        <description xml:lang="fr">sélecteur du 3e niveau</description>
-        <description xml:lang="hu">Harmadik szintű választók</description>
-        <description xml:lang="nl">Derde niveau kiezers</description>
-        <description xml:lang="ru">Выбор 3-го уровня</description>
-        <description xml:lang="rw">urwego</description>
-        <description xml:lang="sk">Výber tretej úrovne</description>
-        <description xml:lang="sq">Zgjedhësit e nivelit të tretë</description>
-        <description xml:lang="sr">Избор трећег нивоа</description>
-        <description xml:lang="sv">Tredjenivåsväljare</description>
-        <description xml:lang="tr">3. seviye seçiciler</description>
-        <description xml:lang="uk">Вибір 3-го рівня</description>
-        <description xml:lang="vi">Trình chọn ngôn ngữ thứ ba</description>
-        <description xml:lang="zh_CN">第三级选择</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>lv3:switch</name>
-          <description>Press Right Control to choose 3rd level.</description>
-          <description xml:lang="en_GB">Press Right Control to choose 3rd level.</description>
-          <description xml:lang="nl">Druk op de rechter Control-toets op het 3e niveau te kiezen.</description>
-          <description xml:lang="ru">Выбор 3-го уровня нажатием правой клавиши Control.</description>
-          <description xml:lang="rw">Kuri Guhitamo urwego</description>
-          <description xml:lang="vi">Nhấn phím Control bên phải để chọn ngôn ngữ thứ 3.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:menu_switch</name>
-          <description>Press Menu key to choose 3rd level.</description>
-          <description xml:lang="en_GB">Press Menu key to choose 3rd level.</description>
-          <description xml:lang="nl">Druk op de Menu-toets om het 3e niveau te kiezen.</description>
-          <description xml:lang="ru">Выбор 3-го уровня нажатием клавиши Menu.</description>
-          <description xml:lang="rw">Urufunguzo Kuri Guhitamo urwego</description>
-          <description xml:lang="vi">Nhấn phím Menu để chọn ngôn ngữ thứ 3.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:win_switch</name>
-          <description>Press any of Win-keys to choose 3rd level.</description>
-          <description xml:lang="en_GB">Press any of Win-keys to choose 3rd level.</description>
-          <description xml:lang="nl">Druk op een Win-toets om het 3e niveau te kiezen.</description>
-          <description xml:lang="ru">Выбор 3-го уровня нажатием любой клавиши Win.</description>
-          <description xml:lang="rw">Bya Utubuto Kuri Guhitamo urwego</description>
-          <description xml:lang="vi">Nhấn phím Win bất kỳ để chọn ngôn ngữ thứ 3.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:lwin_switch</name>
-          <description>Press Left Win-key to choose 3rd level.</description>
-          <description xml:lang="en_GB">Press Left Win-key to choose 3rd level.</description>
-          <description xml:lang="nl">Druk op de linker Win-toets om het 3e niveau te kiezen.</description>
-          <description xml:lang="ru">Выбор 3-го уровня нажатием левой клавиши Win.</description>
-          <description xml:lang="rw">Urufunguzo Kuri Guhitamo urwego</description>
-          <description xml:lang="vi">Nhấn phím Win bên trái để chọn ngôn ngữ thứ 3.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:rwin_switch</name>
-          <description>Press Right Win-key to choose 3rd level.</description>
-          <description xml:lang="en_GB">Press Right Win-key to choose 3rd level.</description>
-          <description xml:lang="nl">Druk op de rechter Win-toets om het 3e niveau te kiezen.</description>
-          <description xml:lang="ru">Выбор 3-го уровня нажатием правой клавиши Win.</description>
-          <description xml:lang="rw">Urufunguzo Kuri Guhitamo urwego</description>
-          <description xml:lang="vi">Nhấn phím Win bên phải để chọn ngôn ngữ thứ 3.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:alt_switch</name>
-          <description>Press any of Alt keys to choose 3rd level.</description>
-          <description xml:lang="en_GB">Press any of Alt keys to choose 3rd level.</description>
-          <description xml:lang="nl">Druk op een Alt-toets om het 3e niveau te kiezen.</description>
-          <description xml:lang="ru">Выбор 3-го уровня нажатием любой клавиши Alt.</description>
-          <description xml:lang="rw">Bya Utubuto Kuri Guhitamo urwego</description>
-          <description xml:lang="vi">Nhấn phím Alt bất kỳ để chọn ngôn ngữ thứ 3.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:lalt_switch</name>
-          <description>Press Left Alt key to choose 3rd level.</description>
-          <description xml:lang="en_GB">Press Left Alt key to choose 3rd level.</description>
-          <description xml:lang="nl">Druk op de linker Alt-toets om het 3e niveau te kiezen.</description>
-          <description xml:lang="ru">Выбор 3-го уровня нажатием левой клавиши Alt.</description>
-          <description xml:lang="rw">Urufunguzo Kuri Guhitamo urwego</description>
-          <description xml:lang="vi">Nhấn phím Alt bên trái để chọn ngôn ngữ thứ 3.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:ralt_switch</name>
-          <description>Press Right Alt key to choose 3rd level.</description>
-          <description xml:lang="en_GB">Press Right Alt key to choose 3rd level.</description>
-          <description xml:lang="nl">Druk op de rechter Win-toets om het 3e niveau te kiezen.</description>
-          <description xml:lang="ru">Выбор 3-го уровня нажатием правой клавиши Alt.</description>
-          <description xml:lang="rw">Urufunguzo Kuri Guhitamo urwego</description>
-          <description xml:lang="vi">Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3.</description>
-        </configItem>
-      </option>
-    </group>
-    <group allowMultipleSelection="false">
-      <!-- Tweaking the position of the "Ctrl" key -->
-      <configItem>
-        <name>ctrl</name>
-        <description>Control key position</description>
-        <description xml:lang="ru">Положение клавиши Control</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>ctrl:nocaps</name>
-          <description>Make CapsLock an additional Control.</description>
-          <description xml:lang="en_GB">Make Caps Lock an additional Control.</description>
-          <description xml:lang="nl">Van CapsLock een extra Control maken.</description>
-          <description xml:lang="ru">Использовать CapsLock как дополнительную клавишу Control.</description>
-          <description xml:lang="vi">Dùng CapsLock làm một Control bổ sung.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>ctrl:swapcaps</name>
-          <description>Swap Control and CapsLock.</description>
-          <description xml:lang="en_GB">Swap Control and Caps Lock.</description>
-          <description xml:lang="nl">Control en CapsLock verwisselen.</description>
-          <description xml:lang="ru">Поменять местами клавиши Control и CapsLock.</description>
-          <description xml:lang="rw">Na</description>
-          <description xml:lang="vi">Trao đổi Control và CapsLock.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>ctrl:ctrl_ac</name>
-          <description>Control key at left of 'A'</description>
-          <description xml:lang="af">Kontrolesleutel links van 'A'</description>
-          <description xml:lang="az">Control düyməsi 'A' hərfinin solunda</description>
-          <description xml:lang="bg">Control е вляво от 'A'</description>
-          <description xml:lang="cs">Klávesa Control nalevo od 'A'</description>
-          <description xml:lang="da">Ctrl-tast til venstre for 'A'</description>
-          <description xml:lang="el">Πλήκτρο Control στα αριστερά του 'Α'</description>
-          <description xml:lang="en_GB">Control key at left of 'A'</description>
-          <description xml:lang="fr">clé de contrône à la gauche du « A »</description>
-          <description xml:lang="hu">A Ctrl billentyű az 'A' betűtől jobbra van</description>
-          <description xml:lang="nl">Control-toets links van 'A'</description>
-          <description xml:lang="ru">Клавиша Control слева от 'Ф'</description>
-          <description xml:lang="rw">Urufunguzo ku Ibumoso: Bya</description>
-          <description xml:lang="sk">Kláves Control naľavo od 'A'</description>
-          <description xml:lang="sq">Pulsanti Control në të majtë të 'A'</description>
-          <description xml:lang="sr">Тастер Control је у лево од „А“</description>
-          <description xml:lang="sv">Control-tangenten till vänster om "A"</description>
-          <description xml:lang="tr">Control tuşu, 'A' tuşunu solunda</description>
-          <description xml:lang="uk">Клавіша Control зліва від 'Ф'</description>
-          <description xml:lang="vi">Phím Control ở bên trái của 'A'</description>
-          <description xml:lang="zh_CN">Ctrl 键在“A”左侧</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>ctrl:ctrl_aa</name>
-          <description>Control key at bottom left</description>
-          <description xml:lang="af">Kontrolesleutel links onder</description>
-          <description xml:lang="az">Control düyməsi sol altda</description>
-          <description xml:lang="bg">Control е долу вляво</description>
-          <description xml:lang="cs">Klávesa Control vlevo dole</description>
-          <description xml:lang="da">Ctrl-tast nederst til venstre</description>
-          <description xml:lang="el">Πλήκτρο Control κάτω αριστερά</description>
-          <description xml:lang="en_GB">Control key at bottom left</description>
-          <description xml:lang="fr">clé de contrôle au bas à gauche</description>
-          <description xml:lang="hu">A Ctrl billentyű a bal alsó sarokban van</description>
-          <description xml:lang="nl">Control-toets linksonder</description>
-          <description xml:lang="ru">Клавиша Control снизу слева</description>
-          <description xml:lang="rw">Urufunguzo ku Hasi: Ibumoso:</description>
-          <description xml:lang="sk">Kláves Control vľavo dole</description>
-          <description xml:lang="sq">Pulsanti Control sipër majtas</description>
-          <description xml:lang="sr">Тастер Control је у дну лево</description>
-          <description xml:lang="sv">Control-tangenten nere till vänster</description>
-          <description xml:lang="tr">Control tuşu, alt solda</description>
-          <description xml:lang="uk">Клавіша Control знизу зліва</description>
-          <description xml:lang="vi">Phím Control ở phía dưới bên trái</description>
-          <description xml:lang="zh_CN">Ctrl 键在左下角</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>ctrl:ctrl_ra</name>
-          <description>Right Control key works as Right Alt.</description>
-          <description xml:lang="en_GB">Right Control key works as Right Alt.</description>
-          <description xml:lang="nl">Rechter Control-toets werkt als rechter Alt.</description>
-          <description xml:lang="ru">Правая клавиша Control работает как правая клавиша Alt.</description>
-          <description xml:lang="rw">Urufunguzo Nka</description>
-          <description xml:lang="vi">Control bên phải làm việc như Alt bên phải.</description>
-        </configItem>
-      </option>
-    </group>
-    <group allowMultipleSelection="true">
-      <!-- Using startard LEDs to indicate the alternative (not first) group(s) -->
-      <configItem>
-        <name>grp_led</name>
-        <description>Use keyboard LED to show alternative group.</description>
-        <description xml:lang="en_GB">Use keyboard LED to show alternative group.</description>
-        <description xml:lang="nl">Toetsenbord LED gebruiken om alternatieve groep te tonen.</description>
-        <description xml:lang="ru">Использование клавиатурных индикаторов для отображения доп. групп.</description>
-        <description xml:lang="rw">Mwandikisho Kuri Garagaza Itsinda</description>
-        <description xml:lang="vi">Sử dụng đèn bàn phím để chỉ ra ngôn ngữ tương đương.</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>grp_led:num</name>
-          <description>NumLock LED shows alternative group.</description>
-          <description xml:lang="en_GB">Num Lock LED shows alternative group.</description>
-          <description xml:lang="nl">NumLock LED toont alternatieve groep.</description>
-          <description xml:lang="ru">Индикатор NumLock отображает доп. группу.</description>
-          <description xml:lang="rw">Itsinda</description>
-          <description xml:lang="vi">Đèn NumLock cho biết ngôn ngữ tương đương.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp_led:caps</name>
-          <description>CapsLock LED shows alternative group.</description>
-          <description xml:lang="en_GB">Caps Lock LED shows alternative group.</description>
-          <description xml:lang="nl">CapsLock LED toont alternatieve groep.</description>
-          <description xml:lang="ru">Индикатор CapsLock отображает доп. группу.</description>
-          <description xml:lang="rw">Itsinda</description>
-          <description xml:lang="vi">Đèn CapsLock cho biết ngôn ngữ nhập tương đương.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>grp_led:scroll</name>
-          <description>ScrollLock LED shows alternative group.</description>
-          <description xml:lang="en_GB">Scroll Lock LED shows alternative group.</description>
-          <description xml:lang="nl">ScrollLock LED toont alternatieve groep.</description>
-          <description xml:lang="ru">Индикатор ScrollLock отображает доп. группу.</description>
-          <description xml:lang="rw">Itsinda</description>
-          <description xml:lang="vi">Đèn ScrollLock cho biết ngôn ngữ tương đương.</description>
-        </configItem>
-      </option>
-    </group>
-    <group allowMultipleSelection="false">
-      <!-- CapsLock tweaks. 
-	   "Internal" capitalization means capitalization using some internal tables.
-	   Otherwise "as Shift" - means using next group. -->
-      <configItem>
-        <name>caps</name>
-        <description>CapsLock key behavior</description>
-        <description xml:lang="af">CapsLock-sleutelgedrag</description>
-        <description xml:lang="az">CapsLock düyməsinin davranışı</description>
-        <description xml:lang="bg">Поведение на Caps Lock</description>
-        <description xml:lang="cs">Chování klávesy CapsLock</description>
-        <description xml:lang="da">Opførsel for Caps Lock-tast</description>
-        <description xml:lang="el">Συμπεριφορά πλήκτρου Κλείδωμα Κεφαλαίων</description>
-        <description xml:lang="en_GB">Caps Lock key behaviour</description>
-        <description xml:lang="fr">comportement de la clé Capslock</description>
-        <description xml:lang="hu">A Caps Lock használati módja</description>
-        <description xml:lang="nl">CapsLock-toets gedrag</description>
-        <description xml:lang="ru">Клавиша Caps Lock</description>
-        <description xml:lang="rw">Urufunguzo imyitwarire</description>
-        <description xml:lang="sk">Chovanie klávesa Caps Lock</description>
-        <description xml:lang="sq">Sjellja e pulsantit CapsLock</description>
-        <description xml:lang="sr">Понашање Caps Lock тастера</description>
-        <description xml:lang="sv">Beteende för Caps Lock-tangenten</description>
-        <description xml:lang="tr">CapsLock tuşunun davranışı</description>
-        <description xml:lang="uk">Клавіша Caps Lock</description>
-        <description xml:lang="vi">Đặc điểm của phím CapsLock</description>
-        <description xml:lang="zh_CN">CapsLock 键行为</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>caps:internal</name>
-          <description>CapsLock uses internal capitalization. Shift cancels CapsLock.</description>
-          <description xml:lang="en_GB">Caps Lock uses internal capitalisation. Shift cancels Caps Lock.</description>
-          <description xml:lang="nl">CapsLock gebruikt interne conversie naar hoofdletters. Shift heft CapsLock op.</description>
-          <description xml:lang="ru">Включает внутреннюю капитализацию. Shift отменяет CapsLock.</description>
-          <description xml:lang="rw">By'imbere</description>
-          <description xml:lang="vi">CapsLock sử dụng viết hoa nội bộ. Shift dừng CapsLock.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>caps:internal_nocancel</name>
-          <description>CapsLock uses internal capitalization. Shift doesn't cancel CapsLock.</description>
-          <description xml:lang="en_GB">Caps Lock uses internal capitalisation. Shift doesn't cancel Caps Lock.</description>
-          <description xml:lang="nl">CapsLock gebruikt interne conversie naar hoofdletters. Shift heft CapsLock niet op.</description>
-          <description xml:lang="ru">Включает внутреннюю капитализацию. Shift не отменяет CapsLock.</description>
-          <description xml:lang="rw">By'imbere Kureka</description>
-          <description xml:lang="vi">CapsLock sử dụng viết hoa nội bộ. Shift không dừng CapsLock.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>caps:shift</name>
-          <description>CapsLock acts as Shift with locking. Shift cancels CapsLock.</description>
-          <description xml:lang="en_GB">Caps Lock acts as Shift with locking. Shift cancels Caps Lock.</description>
-          <description xml:lang="nl">CapsLock werkt als Shift met blokkering, Shift heft CapsLock op.</description>
-          <description xml:lang="ru">Действует как Shift с блокировкой. Shift отменяет CapsLock.</description>
-          <description xml:lang="rw">Nka Na:</description>
-          <description xml:lang="vi">CapsLock hoạt động như Shift với việc khóa. Shift dừng CapsLock.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>caps:shift_nocancel</name>
-          <description>CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock.</description>
-          <description xml:lang="en_GB">Caps Lock acts as Shift with locking. Shift doesn't cancel Caps Lock.</description>
-          <description xml:lang="nl">CapsLock werkt als Shift met blokkering. Shift heft CapsLock niet op.</description>
-          <description xml:lang="ru">Действует как Shift с блокировкой. Shift не отменяет CapsLock.</description>
-          <description xml:lang="rw">Nka Na: Kureka</description>
-          <description xml:lang="vi">CapsLock hoạt động như Shift với việc khóa. Shift không dừng CapsLock.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>caps:shift_lock</name>
-          <description>CapsLock just locks the Shift modifier.</description>
-          <description xml:lang="en_GB">Caps Lock just locks the Shift modifier.</description>
-          <description xml:lang="nl">CapsLock blokkeert slechts de Shift-toets.</description>
-          <description xml:lang="ru">Просто блокирует модификатор Shift.</description>
-          <description xml:lang="rw">i</description>
-          <description xml:lang="vi">CapsLock khóa tính năng của Shift.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>caps:capslock</name>
-          <description>CapsLock toggles normal capitalization of alphabetic characters.</description>
-          <description xml:lang="en_GB">Caps Lock toggles normal capitalisation of alphabetic characters.</description>
-          <description xml:lang="nl">CapsLock bepaalt hoofdletters/kleine letters bij alfabetische tekens.</description>
-          <description xml:lang="ru">Включает обычную капитализацию символов алфавита.</description>
-          <description xml:lang="rw">Bisanzwe Bya Inyuguti</description>
-          <description xml:lang="vi">CapsLock bật tắt viết hoa thông thường của các ký tự chữ cái.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>caps:shiftlock</name>
-          <description>CapsLock toggles Shift so all keys are affected.</description>
-          <description xml:lang="en_GB">Caps Lock toggles Shift so all keys are affected.</description>
-          <description xml:lang="nl">CapsLock verwisselt Shift zodat het alle toetsen beïnvloedt.</description>
-          <description xml:lang="ru">Включает Shift, относится ко всем клавишам.</description>
-          <description xml:lang="rw">Byose Utubuto</description>
-          <description xml:lang="vi">CapsLock bật tắt Shift vì thế mọi phím đều bị ảnh hưởng.</description>
-        </configItem>
-      </option>
-    </group>
-    <group allowMultipleSelection="false">
-      <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) -->
-      <configItem>
-        <name>altwin</name>
-        <description>Alt/Win key behavior</description>
-        <description xml:lang="af">Alt/Win-sleutel gedrag</description>
-        <description xml:lang="az">Alt/Win düyməsinin davranışları</description>
-        <description xml:lang="bg">Функцията на Alt/Win</description>
-        <description xml:lang="cs">Chování klávesy Alt/Win</description>
-        <description xml:lang="da">Alt/Win-tasteopførsel</description>
-        <description xml:lang="el">Συμπεριφορά πλήκτρου Alt/Win</description>
-        <description xml:lang="en_GB">Alt/Win key behaviour</description>
-        <description xml:lang="fr">comportement de la clé Alt/Win</description>
-        <description xml:lang="hu">Az Alt/Win billentyűk viselkedése</description>
-        <description xml:lang="nl">Alt/Win-toets gedrag</description>
-        <description xml:lang="ru">Клавиши Alt/Win</description>
-        <description xml:lang="rw">Urufunguzo imyitwarire</description>
-        <description xml:lang="sk">Chovanie klávesu Alt/Win</description>
-        <description xml:lang="sq">Sjellja e pulsantit Alt/Win</description>
-        <description xml:lang="sr">Понашање Alt/Win тастера</description>
-        <description xml:lang="sv">Alt/Win-tangentbeteende</description>
-        <description xml:lang="tr">Alt/Win tuşu davranışı</description>
-        <description xml:lang="uk">Клавіші Alt/Win</description>
-        <description xml:lang="vi">Các làm việc của Alt/Win</description>
-        <description xml:lang="zh_CN">Alt/Win 键行为</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>altwin:menu</name>
-          <description>Add the standard behavior to Menu key.</description>
-          <description xml:lang="af">Voeg by die standaardgedrag by die Kieslyssleutel.</description>
-          <description xml:lang="az">Menyu düyməsinə standart davranış əlavə et.</description>
-          <description xml:lang="bg">Добавя стандартното поведение на клавиша Menu.</description>
-          <description xml:lang="cs">Přidá standardní chování ke klávese Menu.</description>
-          <description xml:lang="da">Tilføj standardopførslen til menutasten.</description>
-          <description xml:lang="en_GB">Add the standard behaviour to Menu key.</description>
-          <description xml:lang="fr">Ajouter le comportement standard au menu de clés</description>
-          <description xml:lang="hu">A standard funkcionalitás hozzáadása a Menü gombhoz.</description>
-          <description xml:lang="nl">Het standaard gedrag toevoegen aan Menu-toets.</description>
-          <description xml:lang="ru">Добавить стандартную функцию клавиши Menu</description>
-          <description xml:lang="rw">i Bisanzwe imyitwarire Kuri Urufunguzo</description>
-          <description xml:lang="sk">Pridať štandardné chovanie klávesu Ponuka.</description>
-          <description xml:lang="sq">Shto sjelljen standarte tek Menu key.</description>
-          <description xml:lang="sr">Додај обично понашање Menu тастеру.</description>
-          <description xml:lang="sv">Lägg till standardbeteendet till Meny-tangenten.</description>
-          <description xml:lang="tr">Menü tuşuna standart işlevini ekler.</description>
-          <description xml:lang="uk">Надає клавіші Menu типову функцію.</description>
-          <description xml:lang="vi">Thêm tính năng cơ bản vào phím Menu.</description>
-          <description xml:lang="zh_CN">将标准行为添加到菜单键。</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>altwin:meta_alt</name>
-          <description>Alt and Meta are on the Alt keys (default).</description>
-          <description xml:lang="en_GB">Alt and Meta are on the Alt keys (default).</description>
-          <description xml:lang="nl">Alt en Meta zijn op de Als-toetsen (standaard).</description>
-          <description xml:lang="ru">Alt и Meta на клавишах Alt (по умолчанию).</description>
-          <description xml:lang="rw">Na ku i Utubuto Mburabuzi</description>
-          <description xml:lang="vi">Alt và Meta trên phím các Alt (mặc định).</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>altwin:meta_win</name>
-          <description>Meta is mapped to the Win-keys.</description>
-          <description xml:lang="af">Meta is verbind aan die Win-sleutels.</description>
-          <description xml:lang="az">Meta Win düymələrinə xəritələnib.</description>
-          <description xml:lang="bg">Win клавишите фунцкионират като Meta</description>
-          <description xml:lang="cs">Meta je mapována na klávesy Win.</description>
-          <description xml:lang="da">Meta ligger på Win-tasterne.</description>
-          <description xml:lang="en_GB">Meta is mapped to the Win-keys.</description>
-          <description xml:lang="fr">Méta est mappé sur les Win-Keys</description>
-          <description xml:lang="hu">A Meta a Win billentyűkhöz van rendelve.</description>
-          <description xml:lang="nl">Meta wordt afgebeeld op de Win-toetsen.</description>
-          <description xml:lang="ru">Мета соответствует клавишам Win</description>
-          <description xml:lang="rw">ni Kuri i Utubuto</description>
-          <description xml:lang="sk">Meta je mapovaný na Win-klávesy.</description>
-          <description xml:lang="sq">Meta është vendosur tek pulsantët Win. </description>
-          <description xml:lang="sr">Meta је мапиран на Windows тастере.</description>
-          <description xml:lang="sv">Meta är mappat till Win-tangenterna.</description>
-          <description xml:lang="tr">Meta, Win tuşları ile eşleştirilir.</description>
-          <description xml:lang="uk">Клавіша Meta відповідає клавішам Win</description>
-          <description xml:lang="vi">Meta được gắn với các phím Win.</description>
-          <description xml:lang="zh_CN">Meta 被映射到 Windows 键。</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>altwin:left_meta_win</name>
-          <description>Meta is mapped to the left Win-key.</description>
-          <description xml:lang="af">Meta is verbind aan die linkerkantste Win-sleutel.</description>
-          <description xml:lang="az">Meta sol Win düyməsinə xəritələnib.</description>
-          <description xml:lang="bg">Левият Win клавиш функционира като Meta</description>
-          <description xml:lang="cs">Meta je mapována na levou klávesu Win.</description>
-          <description xml:lang="da">Meta ligger på venstre Win-tast.</description>
-          <description xml:lang="en_GB">Meta is mapped to the left Win-key.</description>
-          <description xml:lang="fr">Méta est mappé à la clé gauche Win-key</description>
-          <description xml:lang="hu">A Meta a bal Win billentyűhöz van rendelve.</description>
-          <description xml:lang="nl">Meta wordt afgebeeld op de linker Win-toets.</description>
-          <description xml:lang="ru">Meta соответствует левой клавише Win</description>
-          <description xml:lang="rw">ni Kuri i Ibumoso: Urufunguzo</description>
-          <description xml:lang="sk">Meta je mapovaný na ľavý Win-kláves.</description>
-          <description xml:lang="sq">Meta është vendosur tek pulsanti i majtë Win.</description>
-          <description xml:lang="sr">Meta је мапиран на леви Windows тастер.</description>
-          <description xml:lang="sv">Meta är mappat till vänster Win-tangent.</description>
-          <description xml:lang="tr">Meta, soldaki Win tuşu ile eşleştirilir.</description>
-          <description xml:lang="uk">Клавіша Meta відповідає лівій клавіші Win</description>
-          <description xml:lang="vi">Meta được gắn với phím Win bên trái.</description>
-          <description xml:lang="zh_CN">Meta 被映射到左 Windows 键。</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>altwin:super_win</name>
-          <description>Super is mapped to the Win-keys (default).</description>
-          <description xml:lang="af">Super is verbind aan die Win-sleutels (verstek).</description>
-          <description xml:lang="az">Super Win düymələrinə xəritələnib (ön qurğulu).</description>
-          <description xml:lang="bg">Win клавишите функционират като Super</description>
-          <description xml:lang="cs">Super je mapováno na klávesy Win (výchozí).</description>
-          <description xml:lang="da">Super ligger på Win-tasterne (standard).</description>
-          <description xml:lang="en_GB">Super is mapped to the Win-keys (default).</description>
-          <description xml:lang="fr">Super est mappé au clés Win-keys (par défaut).</description>
-          <description xml:lang="hu">A Super billentyű a Win billentyűkhöz van rendelve (ez az alapértelmezés).</description>
-          <description xml:lang="nl">Super wordt afgebeeld op de Win-toetsen (standaard).</description>
-          <description xml:lang="ru">Super соответствует клавишам Win (по умолчанию)</description>
-          <description xml:lang="rw">ni Kuri i Utubuto Mburabuzi</description>
-          <description xml:lang="sk">Super je mapovaný na Win-klávesy (štandardné).</description>
-          <description xml:lang="sq">Super është vendosur tek pulsantët Win (e prezgjedhur).</description>
-          <description xml:lang="sr">Super је мапиран на Windows тастере (подразумевано).</description>
-          <description xml:lang="sv">Super är mappat till Win-tangenterna (standard).</description>
-          <description xml:lang="tr">Super, Win tuşlarına eşlenir (öntanımlı).</description>
-          <description xml:lang="uk">Super відповідає клавішам Win (типово).</description>
-          <description xml:lang="vi">Super được ánh xạ tới các phím Win (mặc định).</description>
-          <description xml:lang="zh_CN">Super 被映射到 Windows 键(默认)。</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>altwin:hyper_win</name>
-          <description>Hyper is mapped to the Win-keys.</description>
-          <description xml:lang="af">Hiper is verbind aan die Win-sleutels.</description>
-          <description xml:lang="az">Hyper Win düymələrinə xəritələnib.</description>
-          <description xml:lang="bg">Hyper съответства на клавишите Win</description>
-          <description xml:lang="cs">Hyper je mapována na klávesy Win.</description>
-          <description xml:lang="da">Hyper ligger på Win-tasterne.</description>
-          <description xml:lang="en_GB">Hyper is mapped to the Win-keys.</description>
-          <description xml:lang="fr">Hyper est mappé aux clés Win-keys.</description>
-          <description xml:lang="hu">A Hyper a Win billentyűkhöz van rendelve.</description>
-          <description xml:lang="nl">Hyper wordt afgebeeld naar de Win-toetsen.</description>
-          <description xml:lang="ru">Hyper соответствует клавишам Win</description>
-          <description xml:lang="rw">ni Kuri i Utubuto</description>
-          <description xml:lang="sk">Hyper je mapovaný na Win-klávesy.</description>
-          <description xml:lang="sq">Hyper është vendosur tek pulsantët Win.</description>
-          <description xml:lang="sr">Hyper је мапиран на Win тастере.</description>
-          <description xml:lang="sv">Hyper är mappat till Win-tangenterna.</description>
-          <description xml:lang="tr">Hyper, Win tuşlarına eşlenir.</description>
-          <description xml:lang="uk">Hyper відповідає клавішам Win</description>
-          <description xml:lang="vi">Hyper được gắn tới các phím Win.</description>
-          <description xml:lang="zh_CN">Hyper 被映射到 Windows 键。</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>altwin:alt_super_win</name>
-          <description>Alt is mapped to the right Win-key and Super to Menu.</description>
-          <description xml:lang="en_GB">Alt is mapped to the right Win-key and Super to Menu.</description>
-          <description xml:lang="nl">Alt wordt afgebeeld op de rechter Win-toets en Super op Menu.</description>
-          <description xml:lang="ru">Alt соответствует правой клавише Win, а Super - Menu.</description>
-          <description xml:lang="rw">ni Kuri i Iburyo: Urufunguzo Na Kuri</description>
-          <description xml:lang="vi">Ánh xạ Alt sang phím Win bên phải và Super sang Menu.</description>
-        </configItem>
-      </option>
-    </group>
-    <group allowMultipleSelection="true">
-      <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
-      <configItem>
-        <name>Compose key</name>
-        <description>Compose key position</description>
-        <description xml:lang="ru">Положение клавиши Control</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>compose:ralt</name>
-          <description>Right Alt is Compose.</description>
-          <description xml:lang="en_GB">Right Alt is Compose.</description>
-          <description xml:lang="nl">Rechter Alt is samenstellingstoets.</description>
-          <description xml:lang="ru">Правая клавиша Alt соответствует клавише Alt.</description>
-          <description xml:lang="rw">ni</description>
-          <description xml:lang="vi">Alt bên phải là Soạn thảo.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>compose:rwin</name>
-          <description>Right Win-key is Compose.</description>
-          <description xml:lang="en_GB">Right Win-key is Compose.</description>
-          <description xml:lang="nl">Rechter Win-toets is samenstellingstoets.</description>
-          <description xml:lang="ru">Правая клавиша Win соответствует клавише Compose.</description>
-          <description xml:lang="rw">Urufunguzo ni</description>
-          <description xml:lang="vi">Phím Win bên phải là Soạn thảo.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>compose:menu</name>
-          <description>Menu is Compose.</description>
-          <description xml:lang="en_GB">Menu is Compose.</description>
-          <description xml:lang="nl">Menu is samenstellingstoets.</description>
-          <description xml:lang="ru">Клавиша Menu соответствует клавише Compose.</description>
-          <description xml:lang="rw">ni</description>
-          <description xml:lang="vi">Menu là Soạn thảo.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>compose:rctrl</name>
-          <description>Right Ctrl is Compose.</description>
-          <description xml:lang="en_GB">Right Ctrl is Compose.</description>
-          <description xml:lang="nl">Rechter Ctrl is samenstellingstoets.</description>
-          <description xml:lang="ru">Правая клавиша Ctrl соответствует клавише Compose.</description>
-          <description xml:lang="rw">ni</description>
-          <description xml:lang="vi">Ctrl bên phải là Soạn thảo.</description>
-        </configItem>
-      </option>
-    </group>
-    <group allowMultipleSelection="true">
-      <configItem>
-        <name>compat</name>
-        <description>Miscellaneous compatibility options</description>
-        <description xml:lang="af">Verskeie versoenbaarheid-opsies</description>
-        <description xml:lang="az">Müxtəlif yetişmə qabiliyyəti seçimləri</description>
-        <description xml:lang="cs">Dodatečné volby pro kompatibilitu</description>
-        <description xml:lang="da">Diverse kompatibilitetsvalg</description>
-        <description xml:lang="en_GB">Miscellaneous compatibility options</description>
-        <description xml:lang="fr">diverses options de compatibilité</description>
-        <description xml:lang="hu">Egyéb kompatibilitási beállítások</description>
-        <description xml:lang="nl">Overige compatibiliteitsopties</description>
-        <description xml:lang="ru">Разные параметры совместимости</description>
-        <description xml:lang="rw">Bihuye neza Amahitamo</description>
-        <description xml:lang="sk">Dodatočné voľby pre kompatibilitu</description>
-        <description xml:lang="sq">Opcione të ndryshme kompatibiliteti</description>
-        <description xml:lang="sr">Разне могућности за сагласност</description>
-        <description xml:lang="sv">Diverse kompatibilitetsalternativ</description>
-        <description xml:lang="tr">Çeşitli uyumluluk seçenekleri</description>
-        <description xml:lang="uk">Різна параметри сумісності</description>
-        <description xml:lang="vi">Tùy chọn tương thích khác</description>
-        <description xml:lang="zh_CN">其它兼容选项</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>numpad:microsoft</name>
-          <description>Shift with numpad keys works as in MS Windows.</description>
-          <description xml:lang="en_GB">Shift with numpad keys works as in MS Windows.</description>
-          <description xml:lang="nl">Shift met cijferblok-toetsen werkt zoals in MS Windows.</description>
-          <description xml:lang="rw">Na: Utubuto Nka in</description>
-          <description xml:lang="vi">Shift với các phím của bàn phím số làm việc như trong MS Windows.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>srvrkeys:none</name>
-          <description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</description>
-          <description xml:lang="af">Spesiale sleutels (Ctrl+Alt+&lt;sleutel&gt;) word hanteer in 'n bediener.</description>
-          <description xml:lang="az">Xüsusi düymələr (Ctrl+Alt+&lt;düyməsi&gt;) verici tərəfindən idarə edilsin.</description>
-          <description xml:lang="cs">Speciální klávesy (Ctrl+Alt+&lt;key&gt;) zpracovány v serveru.</description>
-          <description xml:lang="da">Specialtaster (Ctrl+Alt+&lt;key&gt;) håndteret i en server.</description>
-          <description xml:lang="en_GB">Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</description>
-          <description xml:lang="fr">les spéciales (Ctrl+Alt+&lt;clé&gt;) sont traitées par le serveur.</description>
-          <description xml:lang="hu">Speciális billentyűk (Ctrl+Alt+&lt;key&gt;), amelyeket a kiszolgáló kezel.</description>
-          <description xml:lang="nl">Speciale toetsen (Ctrl+Alt+&lt;toets&gt;) afgehandeld in een server.</description>
-          <description xml:lang="ru">Специальные клавиши (Ctrl+Alt+&lt;клв&gt;)·обрабатываются сервером.</description>
-          <description xml:lang="rw">Utubuto in a Seriveri</description>
-          <description xml:lang="sk">Špeciálne klávesy (Ctrl+Alt+&lt;key&gt;) spracované na serveru.</description>
-          <description xml:lang="sq">Çelsa specialë (Ctrl+Alt+&lt;çelsi&gt;) të manazhuar në një server.</description>
-          <description xml:lang="sr">Нарочити тастери (Ctrl+Alt+&lt;тастер&gt;) које обрађује сервер.</description>
-          <description xml:lang="sv">Specialtangenter (Ctrl+Alt+&lt;tangent&gt;) hanteras i en server.</description>
-          <description xml:lang="tr">Bir sunucuda elde edilen özel tuşlar (Ctrl+Alt+&lt;tuş&gt;)</description>
-          <description xml:lang="uk">Спеціальні клавіші (Ctrl+Alt+&lt;key&gt;) обробляються на сервері.</description>
-          <description xml:lang="vi">Điều khiển các phím đặt biệt (Ctrl+Alt+&lt;key&gt;) trên một máy chủ.</description>
-          <description xml:lang="zh_CN">服务器处理的特殊键 (Ctrl+Alt+&lt;key&gt;)。</description>
-        </configItem>
-      </option>
-    </group>
-    <group allowMultipleSelection="true">
-      <!-- Special shortcuts for the Euro character -->
-      <configItem>
-        <name>eurosign</name>
-        <description>Adding the EuroSign to certain keys</description>
-        <description xml:lang="en_GB">Adding the Euro sign to certain keys</description>
-        <description xml:lang="nl">Euro-teken aan bepaalde toetsen toevoegen</description>
-        <description xml:lang="ru">Добавить знак Евро к некоторым клавишам</description>
-        <description xml:lang="rw">i Kuri Utubuto</description>
-        <description xml:lang="vi">Thêm ký hiệu đồng Euro vào các phím chắc chắn</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>eurosign:e</name>
-          <description>Add the EuroSign to the E key.</description>
-          <description xml:lang="en_GB">Add the Euro sign to the E key.</description>
-          <description xml:lang="nl">Euro-teken toevoegen aan E-toets.</description>
-          <description xml:lang="ru">Добавить знак Евро к клавише E.</description>
-          <description xml:lang="rw">i Kuri i E Urufunguzo</description>
-          <description xml:lang="vi">Thêm ký hiệu đồng Euro vào phím E.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>eurosign:5</name>
-          <description>Add the EuroSign to the 5 key.</description>
-          <description xml:lang="en_GB">Add the Euro sign to the 5 key.</description>
-          <description xml:lang="nl">Euro-teken toevoegen aan 5-toets.</description>
-          <description xml:lang="ru">Добавить знак Евро к клавише 5.</description>
-          <description xml:lang="rw">i Kuri i 5 Urufunguzo</description>
-          <description xml:lang="vi">Thêm ký hiệu đồng Euro vào phím 5.</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>eurosign:2</name>
-          <description>Add the EuroSign to the 2 key.</description>
-          <description xml:lang="en_GB">Add the Euro sign to the 2 key.</description>
-          <description xml:lang="nl">Euro-teken toevoegen aan 2-toets.</description>
-          <description xml:lang="ru">Добавить знак Евро к клавише 2.</description>
-          <description xml:lang="rw">i Kuri i 2. Urufunguzo</description>
-          <description xml:lang="vi">Thêm ký hiệu đồng Euro vào phím 2.</description>
-        </configItem>
-      </option>
-    </group>
-    <group allowMultipleSelection="true">
-      <configItem>
-        <name>japan</name>
-        <description>Japanese Keyboard Options</description>
-      </configItem>
-      <option>
-        <configItem>
-          <name>japan:kana_lock</name>
-          <description>Kana Lock key is locking</description>
-	</configItem>
-      </option>
-    </group>
-  </optionList>
-</xkbConfigRegistry>
--- a/src/xorg/keytables/sun-src/symbols/al	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-// albanian keyboard layout
-// done by Pablo Saratxaga <[email protected]>
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// it seems the grave on AltGr-7 is not a dead key, I put a dead_grave
-// in AltGr-Shift-7 for convenience
-
-partial hidden alphanumeric_keys modifier_keys 
-xkb_symbols "basic" {
-
-    name[Group1]= "Albanian";
-
-    // Alphanumeric section
-    key <TLDE> {	[ backslash,	bar		]	};
-    key <AE01> {	[	  1,	exclam 		],
-			[ asciitilde			]	};
-    key <AE02> {	[	  2,	quotedbl	],
-			[ dead_caron			]	};
-    key <AE03> {	[	  3,	numbersign	],
-			[ dead_circumflex		]	};
-    key <AE04> {	[	  4,	dollar		],
-			[ dead_breve			]	};
-    key <AE05> {	[	  5,	percent		],
-			[ dead_abovering		]	};
-    key <AE06> {	[	  6,	asciicircum	],
-			[ dead_ogonek			]	};
-    key <AE07> {	[	  7,	ampersand	],
-			[ grave				]	};
-    key <AE08> {	[	  8,	asterisk	],
-			[ dead_abovedot			]	};
-    key <AE09> {	[	  9,	parenleft	],
-			[ dead_acute			]	};
-    key <AE10> {	[	  0,	parenright	],
-			[ dead_doubleacute		]	};
-    key <AE11> {	[     minus,	underscore	],
-			[ dead_diaeresis		]	};
-    key <AE12> {	[     equal,	plus		],
-			[ dead_cedilla			]	};
-
-    key <AD01> {	[	  q,	Q 		]	};
-    key <AD02> {	[	  w,	W		]	};
-    key <AD03> {	[	  e,	E		],
-			[ EuroSign			]	};
-    key <AD04> {	[	  r,	R		]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  z,	Z		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD09> {	[	  o,	O		]	};
-    key <AD10> {	[	  p,	P		]	};
-    key <AD11> {	[  ccedilla,	Ccedilla	],
-			[  division			]	};
-    key <AD12> {	[  apostrophe,  at		],
-			[  multiply			]	};
-
-    key <AC01> {	[	  a,	A 		]	};
-    key <AC02> {	[	  s,	S		],
-			[   dstroke			]	};
-    key <AC03> {	[	  d,	D		],
-			[   Dstroke			]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G		]	};
-    key <AC06> {	[	  h,	H		]	};
-    key <AC07> {	[	  j,	J		]	};
-    key <AC08> {	[	  k,	K		],
-			[   lstroke			]	};
-    key <AC09> {	[	  l,	L		],
-			[   Lstroke			]	};
-    key <AC10> {	[ ediaeresis,	Ediaeresis	]	};
-    key <AC11> {	[ bracketleft,	braceleft	],
-			[    ssharp			]	};
-    key <BKSL> {	[ bracketright,	braceright	],
-			[ currency			]	};
-    key <LSGT> {	[       less,	greater  	]	};
-    key <AB01> {	[	  y,	Y 		]	};
-    key <AB02> {	[	  x,	X		]	};
-    key <AB03> {	[	  c,	C		]	};
-    key <AB04> {	[	  v,	V		]	};
-    key <AB05> {	[	  b,	B		]	};
-    key <AB06> {	[	  n,	N		]	};
-    key <AB07> {	[	  m,	M		],
-			[   section			]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon		]	};
-    key <AB10> {	[     slash,	question	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "al(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "al(Sundeadkeys)" // for naming consistency
-};
--- a/src/xorg/keytables/sun-src/symbols/ar	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-// $XConsortium: th /main/3 1996/08/31 12:20:18 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/ar,v 1.1 2001/11/21 22:28:52 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-    name[Group2]= "Arabic";
-
-// NOTES:
-//
-// there is also combined shadda diacritis in AltGr position of simple
-// diacritics fatha, fathatan, damma, dammatan, kasra and kasratan
-// should a third state be added to Group2 ?
-//
-
-	include "us(basic)"
-
-    key <TLDE> { [  ], [     Arabic_thal,      Arabic_shadda   ]	};
-    key <AE01> { [  ], [               1,          exclam      ]       };
-    key <AE02> { [  ], [               2,              at      ]       };
-    key <AE03> { [  ], [               3,      numbersign      ]       };
-    key <AE04> { [  ], [               4,          dollar      ]       };
-    key <AE05> { [  ], [               5,         percent      ]       };
-    key <AE06> { [  ], [               6,     asciicircum      ]       };
-    key <AE07> { [  ], [               7,       ampersand      ]       };
-    key <AE08> { [  ], [               8,        asterisk      ]       };
-    key <AE09> { [  ], [               9,       parenleft      ]       };
-    key <AE10> { [  ], [               0,      parenright      ]       };
-    key <AE11> { [  ], [           minus,      underscore      ]       };
-    key <AE12> { [  ], [           equal,            plus      ]       };
-						
-    key <AD01> { [  ], [      Arabic_dad,     Arabic_fatha     ]       };
-    key <AD02> { [  ], [      Arabic_sad,     Arabic_fathatan  ]       };
-    key <AD03> { [  ], [     Arabic_theh,     Arabic_damma     ]       };
-    key <AD04> { [  ], [      Arabic_qaf,     Arabic_dammatan  ]       };
-    key <AD05> { [  ], [      Arabic_feh,       0x100fef9      ]       };
-    key <AD06> { [  ], [   Arabic_ghain, Arabic_hamzaunderalef ]       };
-    key <AD07> { [  ], [      Arabic_ain,         grave        ]       };
-    key <AD08> { [  ], [       Arabic_ha,        division      ]       };
-    key <AD09> { [  ], [     Arabic_khah,       multiply       ]       };
-    key <AD10> { [  ], [      Arabic_hah,    Arabic_semicolon  ]       };
-    key <AD11> { [  ], [     Arabic_jeem,          greater     ]       };
-    key <AD12> { [  ], [      Arabic_dal,          less        ]       };	    
-
-    key <AC01> { [  ], [    Arabic_sheen,	Arabic_kasra   ]       };
-    key <AC02> { [  ], [     Arabic_seen,       Arabic_kasratan    ]       };
-    key <AC03> { [  ], [      Arabic_yeh,       bracketleft    ]       };
-    key <AC04> { [  ], [      Arabic_beh,       bracketright   ]       };
-    key <AC05> { [  ], [      Arabic_lam,       0x100fef7      ]       };
-    key <AC06> { [  ], [     Arabic_alef,   Arabic_hamzaonalef ]       };
-    key <AC07> { [  ], [      Arabic_teh,      Arabic_tatweel  ]       };
-    key <AC08> { [  ], [     Arabic_noon,      Arabic_comma    ]       };
-    key <AC09> { [  ], [     Arabic_meem,         slash        ]       };
-    key <AC10> { [  ], [      Arabic_kaf,           colon      ]       };
-    key <AC11> { [  ], [      Arabic_tah,        quotedbl      ]       };
-    key <BKSL> { [  ], [            less,         greater      ]       };
-
-    key <LSGT> { [  ], [             bar,      brokenbar	   ]       };
-    key <AB01> { [  ], [Arabic_hamzaonyeh,    asciitilde       ]       };
-    key <AB02> { [  ], [    Arabic_hamza,      Arabic_sukun    ]       };
-    key <AB03> { [  ], [Arabic_hamzaonwaw,     braceleft       ]       };
-    key <AB04> { [  ], [       Arabic_ra,      braceright      ]       };
-    key <AB05> { [  ], [       0x100fefb,      0x100fef5       ]       };
-    key <AB06> { [  ], [Arabic_alefmaksura, Arabic_maddaonalef ]       };
-    key <AB07> { [  ], [Arabic_tehmarbuta,    apostrophe       ]       };
-    key <AB08> { [  ], [      Arabic_waw,         comma        ]       };
-    key <AB09> { [  ], [     Arabic_zain,         period       ]       };
-    key <AB10> { [  ], [      Arabic_zah, Arabic_question_mark ]       };
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "qwerty" {
-    include "ar(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "azerty" {
-    include "ar(basic)"
-
-	// the north african arabic keyboard differs from the middle east one
-	// by the numeric row; it follows French keyboard style
-    //
-	// PROBLEM: some chars are inaccessible: ! @ # $ % ^ *
-	// should they go elsewhere? replace " ' that are now in double ?
-	// also, dead_circumflex and dead_diaeresis from French keyboard
-	// as well as ugrave are missing, which questions the utility of the
-	// other accentuated latin letters. Maybe this is useful only with
-	// a French keyboard in Group1 ? Then, shouldn't Group1 be filled ?
-
-    key <AE01> { [  ], [       ampersand,               1      ]       };
-    key <AE02> { [  ], [          eacute,               2      ]       };
-    key <AE03> { [  ], [        quotedbl,               3      ]       };
-    key <AE04> { [  ], [      apostrophe,               4      ]       };
-    key <AE05> { [  ], [       parenleft,               5      ]       };
-    key <AE06> { [  ], [           minus,               6      ]       };
-    key <AE07> { [  ], [          egrave,               7      ]       };
-    key <AE08> { [  ], [      underscore,               8      ]       };
-    key <AE09> { [  ], [        ccedilla,               9      ]       };
-    key <AE10> { [  ], [          agrave,               0      ]       };
-    key <AE11> { [  ], [      parenright,          degree      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "digits" {
-    include "ar(basic)"
-
-	// use arabic script digits
-
-    key <AE01> { [  ], [       0x1000661,          exclam      ]       };
-    key <AE02> { [  ], [       0x1000662,              at      ]       };
-    key <AE03> { [  ], [       0x1000663,      numbersign      ]       };
-    key <AE04> { [  ], [       0x1000664,          dollar      ]       };
-    key <AE05> { [  ], [       0x1000665,         percent      ]       };
-    key <AE06> { [  ], [       0x1000666,     asciicircum      ]       };
-    key <AE07> { [  ], [       0x1000667,       ampersand      ]       };
-    key <AE08> { [  ], [       0x1000668,        asterisk      ]       };
-    key <AE09> { [  ], [       0x1000669,       parenleft      ]       };
-    key <AE10> { [  ], [       0x1000660,      parenright      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "qwerty_digits" {
-    include "ar(digits)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "azerty_digits" {
-    include "ar(azerty)"
-	
-    key <AE01> { [  ], [       ampersand,       0x1000661      ]       };
-    key <AE02> { [  ], [          eacute,       0x1000662      ]       };
-    key <AE03> { [  ], [        quotedbl,       0x1000663      ]       };
-    key <AE04> { [  ], [      apostrophe,       0x1000664      ]       };
-    key <AE05> { [  ], [       parenleft,       0x1000665      ]       };
-    key <AE06> { [  ], [           minus,       0x1000666      ]       };
-    key <AE07> { [  ], [          egrave,       0x1000667      ]       };
-    key <AE08> { [  ], [      underscore,       0x1000668      ]       };
-    key <AE09> { [  ], [        ccedilla,       0x1000669      ]       };
-    key <AE10> { [  ], [          agrave,       0x1000660      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "ar(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "ar(Sundeadkeys)"
-};
-
-
--- a/src/xorg/keytables/sun-src/symbols/bg	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,270 +0,0 @@
-// $Xorg: ca,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-//////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1999, 2000 by Anton Zinoviev <[email protected]>
-//
-// This software may be used, modified, copied, distributed, and sold,
-// in both source and binary form provided that the above copyright
-// and these terms are retained. Under no circumstances is the author
-// responsible for the proper functioning of this software, nor does
-// the author assume any responsibility for damages incurred with its
-// use.
-//
-////////////////////////////////////////////////////////////////////////// 
-
-// $XFree86: xc/programs/xkbcomp/symbols/bg,v 3.2 2000/11/06 19:24:10 dawes Exp $
-
-// Version 1.6r1
-
-// Thanks to Ivan Pascal <[email protected]> for improvements in this file.
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-  // Describes the differences between a very simple en_US keyboard
-  // and a very simple Bulgarian keyboard.
-
-  name[Group1]= "Bulgaria";
-  
-  key <TLDE> { 	 [ quoteleft,         asciitilde	  ]    };
-  key <AE01> {   [ 1,                 exclam              ]    };
-  key <AE02> {   [ 2,                 at                  ],
-		 [ 2,		      question		  ]    };
-  key <AE03> {   [ 3,                 numbersign          ],
-                 [ 3,                 plus                ]    };
-  key <AE04> {   [ 4,                 dollar              ],
-                 [ 4,                 quotedbl            ]    };
-  key <AE05> {   [ 5,                 percent             ]    };
-  key <AE06> {   [ 6,                 asciicircum         ],
-                 [ 6,                 equal               ]    };
-  key <AE07> {   [ 7,                 ampersand           ],
-                 [ 7,                 colon               ]    };
-  key <AE08> {   [ 8,                 asterisk            ],
-                 [ 8,                 slash               ]    };
-  key <AE09> {   [ 9,                 parenleft           ],
-                 [ 9,                 underscore          ]    };
-  key <AE10> {   [ 0,                 parenright          ],
-                 [ 0,                 numerosign          ]    };
-  key <AE11> {   [ minus,             underscore          ],
-                 [ minus,             I                   ]    };
-  key <AE12> {   [ equal,             plus                ],
-                 [ period,            V                   ]    };
-
-  key <AD01> {   [ q,                 Q                   ],
-                 [ comma,             Cyrillic_yeru       ]    };
-  key <AD02> {   [ w,                 W                   ],
-                 [ Cyrillic_u,        Cyrillic_U          ]    };
-  key <AD03> {   [ e,                 E                   ],
-                 [ Cyrillic_ie,          Cyrillic_IE         ]    };
-  key <AD04> {   [ r,                 R                   ],
-                 [ Cyrillic_i,        Cyrillic_I          ]    };
-  key <AD05> {   [ t,                 T                   ],
-                 [ Cyrillic_sha,      Cyrillic_SHA        ]    };
-  key <AD06> {   [ y,                 Y                   ],
-                 [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
-  key <AD07> {   [ u,                 U                   ],
-                 [ Cyrillic_ka,       Cyrillic_KA         ]    };
-  key <AD08> {   [ i,                 I                   ],
-                 [ Cyrillic_es,       Cyrillic_ES         ]    };
-  key <AD09> {   [ o,                 O                   ],
-                 [ Cyrillic_de,       Cyrillic_DE         ]    };
-  key <AD10> {   [ p,                 P                   ],
-                 [ Cyrillic_ze,       Cyrillic_ZE         ]    };
-  key <AD11> {   [ bracketleft,       braceleft           ],
-                 [ Cyrillic_tse,      Cyrillic_TSE        ]    };
-  key <AD12> {   [ bracketright,      braceright          ],
-                 [ semicolon,         section             ]    };
-
-  key <AC01> {   [ a,                 A                   ],
-                 [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
-  key <AC02> {   [ s,                 S                   ],
-                 [ Cyrillic_ya,       Cyrillic_YA         ]    };
-  key <AC03> {   [ d,                 D                   ],
-                 [ Cyrillic_a,        Cyrillic_A          ]    };
-  key <AC04> {   [ f,                 F                   ],
-                 [ Cyrillic_o,        Cyrillic_O          ]    };
-  key <AC05> {   [ g,                 G                   ],
-                 [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
-  key <AC06> {   [ h,                 H                   ],
-                 [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
-  key <AC07> {   [ j,                 J                   ],
-                 [ Cyrillic_te,       Cyrillic_TE         ]    };
-  key <AC08> {   [ k,                 K                   ],
-                 [ Cyrillic_en,       Cyrillic_EN         ]    };
-  key <AC09> {   [ l,                 L                   ],
-                 [ Cyrillic_ve,       Cyrillic_VE         ]    };
-  key <AC10> {   [ semicolon,         colon               ],
-                 [ Cyrillic_em,       Cyrillic_EM         ]    };
-  key <AC11> {   [ quoteright,        quotedbl            ],
-                 [ Cyrillic_che,      Cyrillic_CHE        ]    };
-  key <BKSL> {   [ backslash,         bar                 ],
-                 [ parenleft,         parenright       	  ]    };
-
-  key <LSGT> {   [ less,              greater             ]    };
-  key <AB01> {   [ z,                 Z                   ],
-                 [ Cyrillic_yu,       Cyrillic_YU         ]    };
-  key <AB02> {   [ x,                 X                   ],
-                 [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
-  key <AB03> {   [ c,                 C                   ],
-                 [ Cyrillic_hardsign, Cyrillic_HARDSIGN   ]    };
-  key <AB04> {   [ v,                 V                   ],
-                 [ Cyrillic_e,        Cyrillic_E          ]    };
-  key <AB05> {   [ b,                 B                   ],
-                 [ Cyrillic_ef,       Cyrillic_EF         ]    };
-  key <AB06> {   [ n,                 N                   ],
-                 [ Cyrillic_ha,       Cyrillic_HA         ]    };
-  key <AB07> {   [ m,                 M                   ],
-                 [ Cyrillic_pe,       Cyrillic_PE         ]    };
-  key <AB08> {   [ comma,             less                ],
-                 [ Cyrillic_er,       Cyrillic_ER         ]    };
-  key <AB09> {   [ period,            greater             ],
-                 [ Cyrillic_el,       Cyrillic_EL         ]    };
-  key <AB10> {   [ slash,             question            ],
-                 [ Cyrillic_be,       Cyrillic_BE         ]    };
-    
-  // End alphanumeric section
-
-
-  // Begin modifier mappings 
-  
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "phonetic" {
-  
-  // Describes the differences between a very simple en_US keyboard
-  // and a very simple Bulgarian phonetic keyboard.
-
-  name[Group1]= "Bulgaria - Phonetic";
-  
-  key <TLDE> {   [ quoteleft,         asciitilde          ],
-                 [ Cyrillic_che,      Cyrillic_CHE        ]   };
-  key <AE01> {   [ 1,                 exclam              ]   };
-  key <AE02> {   [ 2,                 at                  ]   };
-  key <AE03> {   [ 3,                 numbersign          ]   };
-  key <AE04> {   [ 4,                 dollar              ]   };
-  key <AE05> {   [ 5,                 percent             ]   };
-  key <AE06> {   [ 6,                 asciicircum         ]   };
-  key <AE07> {   [ 7,                 ampersand           ]   };
-  key <AE08> {   [ 8,                 asterisk            ]   };
-  key <AE09> {   [ 9,                 parenleft           ]   };
-  key <AE10> {   [ 0,                 parenright          ]   };
-  key <AE11> {   [ minus,             underscore          ]   };
-  key <AE12> {   [ equal,             plus                ]   };
-
-  key <AD01> {   [ q,                 Q                   ],
-                 [ Cyrillic_ya,       Cyrillic_YA         ]    };
-  key <AD02> {   [ w,                 W                   ],
-                 [ Cyrillic_ve,       Cyrillic_VE         ]    };
-  key <AD03> {   [ e,                 E                   ],
-                 [ EuroSign,          Cyrillic_IE         ]    };
-  key <AD04> {   [ r,                 R                   ],
-                 [ Cyrillic_er,       Cyrillic_ER         ]    };
-  key <AD05> {   [ t,                 T                   ],
-                 [ Cyrillic_te,       Cyrillic_TE         ]    };
-  key <AD06> {   [ y,                 Y                   ],
-                 [ Cyrillic_hardsign, Cyrillic_HARDSIGN   ]    };
-  key <AD07> {   [ u,                 U                   ],
-                 [ Cyrillic_u,        Cyrillic_U          ]    };
-  key <AD08> {   [ i,                 I                   ],
-                 [ Cyrillic_i,        Cyrillic_I          ]    };
-  key <AD09> {   [ o,                 O                   ],
-                 [ Cyrillic_o,        Cyrillic_O          ]    };
-  key <AD10> {   [ p,                 P                   ],
-                 [ Cyrillic_pe,       Cyrillic_PE         ]    };
-  key <AD11> {   [ bracketleft,       braceleft           ],
-                 [ Cyrillic_sha,      Cyrillic_SHA        ]    };
-  key <AD12> {   [ bracketright,      braceright          ],
-                 [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
-
-  key <AC01> {   [ a,                 A                   ],
-                 [ Cyrillic_a,        Cyrillic_A          ]    };
-  key <AC02> {   [ s,                 S                   ],
-                 [ Cyrillic_es,       Cyrillic_ES         ]    };
-  key <AC03> {   [ d,                 D                   ],
-                 [ Cyrillic_de,       Cyrillic_DE         ]    };
-  key <AC04> {   [ f,                 F                   ],
-                 [ Cyrillic_ef,       Cyrillic_EF         ]    };
-  key <AC05> {   [ g,                 G                   ],
-                 [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
-  key <AC06> {   [ h,                 H                   ],
-                 [ Cyrillic_ha,       Cyrillic_HA         ]    };
-  key <AC07> {   [ j,                 J                   ],
-                 [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
-  key <AC08> {   [ k,                 K                   ],
-                 [ Cyrillic_ka,       Cyrillic_KA         ]    };
-  key <AC09> {   [ l,                 L                   ],
-                 [ Cyrillic_el,       Cyrillic_EL         ]    };
-  key <AC10> {   [ semicolon,         colon               ]    };
-  key <AC11> {   [ quoteright,        quotedbl            ]    };
-  key <BKSL> {   [ backslash,         bar                 ],
-                 [ Cyrillic_yu,       Cyrillic_YU         ]    };
-
-  key <LSGT> {   [ less,              greater             ]    };
-  key <AB01> {   [ z,                 Z                   ],
-                 [ Cyrillic_ze,       Cyrillic_ZE         ]    };
-  key <AB02> {   [ x,                 X                   ],
-                 [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
-  key <AB03> {   [ c,                 C                   ],
-                 [ Cyrillic_tse,      Cyrillic_TSE        ]    };
-  key <AB04> {   [ v,                 V                   ],
-                 [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
-  key <AB05> {   [ b,                 B                   ],
-                 [ Cyrillic_be,       Cyrillic_BE         ]    };
-  key <AB06> {   [ n,                 N                   ],
-                 [ Cyrillic_en,       Cyrillic_EN         ]    };
-  key <AB07> {   [ m,                 M                   ],
-                 [ Cyrillic_em,       Cyrillic_EM         ]    };
-  key <AB08> {   [ comma,             less                ]    };
-  key <AB09> {   [ period,            greater             ]    };
-  key <AB10> {   [ slash,             question            ]    };
-
-  // End alphanumeric section
-
-  // Begin modifier mappings 
-  
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "bg(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "bg(Sundeadkeys)" // for naming consistency
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "bg(basic)" // for naming consistency
-};
--- a/src/xorg/keytables/sun-src/symbols/br	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/br,v 1.3 2000/10/27 18:31:08 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-include "us(basic)"
-
-    // Describes the differences between a very simple us
-    // keyboard and a very simple Brasilian ABNT2 keybaord
-    // by Ricardo Y. Igarashi ([email protected])
-    // Adds suport for dead-keys in I18N applications
-    // by Conectiva  (http://www.conectiva.com.br)
-
-    name[Group1]= "Brazilian";
-
-    key <TLDE> {        [      apostrophe,        quotedbl      ]       };
-    key <AE01> {        [               1,          exclam      ],
-                        [     onesuperior,      exclamdown      ]       };
-    key <AE02> {        [               2,              at      ],
-                        [     twosuperior,         onehalf      ]       };
-    key <AE03> {        [               3,      numbersign      ],
-                        [   threesuperior,   threequarters      ]       };
-    key <AE04> {        [               4,          dollar      ],
-                        [        sterling,      onequarter      ]       };
-    key <AE05> {        [               5,         percent      ],
-                        [            cent                       ]       };
-    key <AE06> {        [               6,  dead_diaeresis      ],
-                        [         notsign,       diaeresis      ]       };
-    key <AE07> {        [               7,       ampersand      ],
-                        [       braceleft                       ]       };
-    key <AE08> {        [               8,        asterisk      ],
-                        [     bracketleft                       ]       };
-    key <AE09> {        [               9,       parenleft      ],
-                        [    bracketright                       ]       };
-    key <AE10> {        [               0,      parenright      ],
-                        [      braceright                       ]       };
-    key <AE11> {        [           minus,      underscore      ],
-                        [       backslash                       ]       };
-    key <AE12> {        [           equal,            plus      ],
-                        [         section                       ]       };
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign                       ]       };
-    key <AD04> {        [               r,               R      ],
-                        [      registered                       ]       };
-    key <AD11> {        [      dead_acute,      dead_grave      ],
-                        [           acute,           grave      ]       };
-    key <AD12> {        [     bracketleft,       braceleft      ],
-                        [     ordfeminine                       ]       };
-    key <AC10> {        [        ccedilla,        Ccedilla      ]       };
-    key <AC11> {        [      dead_tilde, dead_circumflex      ],
-                        [      asciitilde,     asciicircum      ]       };
-    key <AC12> {        [    bracketright,      braceright      ],
-                        [       masculine                       ]       };
-    key <AB03> {        [               c,               C      ],
-                        [       copyright                       ]       };
-    key <AB07> {        [               m,               M      ],
-                        [              mu                       ]       };
-    key <BKSL> {        [       backslash,             bar      ]       };
-    key <AB10> {        [       semicolon,           colon      ]       };
-// ABNT-2 keyboard has this special key
-    key <AB11> {        [           slash,        question      ],
-                        [          degree,    questiondown      ]       };
-
-    key <KPPT> {        [  KP_Decimal                           ]       };
-    key <KPDL> {        [  KP_Delete,   comma                   ]       };
-
-    // begin modifier mappings
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    key <RALT> {
-        symbols[Group1]= [ Mode_switch, Multi_key ],
-        virtualMods= AltGr
-    };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "br(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "br(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    include "br(abnt2)" // for consistent naming
-    key <AE06> {        [               6,       diaeresis      ],
-                        [         notsign                       ]       };
-    key <AD11> {        [      apostrophe,           grave      ]       };
-    key <AC11> {        [      asciitilde,     asciicircum      ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/by	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-//
-// belarusian standard keyboard 
-// Alexander Mikhailian <[email protected]>
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Belarusian keybaord
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Belarusian";
-
-    key	<TLDE> {	[	    grave,	asciitilde	],
-			[     Cyrillic_io,     Cyrillic_IO	]	};
-    key	<LSGT> {	[		less,		   greater	],
-			[		bar,	brokenbar	]	};
-    key	<AD01> {	[		q,		 Q	],
-			[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<AE01> {	[		1,	    exclam	]	};
-    key	<AB01> {	[		z,		 Z	],
-			[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<AC02> {	[		s,		 S	],
-			[   Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<AC01> {	[		a,		 A	],
-			[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<AD02> {	[		w,		 W	],
-			[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<AE02> {	[		2,		at	],
-			[		at,        quotedbl	]	};
-    key	<AB03> {	[		c,		 C	],
-			[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<AB02> {	[		x,		 X	],
-			[    Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AC03> {	[		d,		 D	],
-			[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<AD03> {	[		e,		 E	],
-			[      Cyrillic_u,	Cyrillic_U	]	};
-    key	<AE04> {	[		4,	    dollar	],
-			[	currency,        semicolon	]	};
-    key	<AE03> {	[		3,	numbersign	],
-			[	numbersign,     numerosign	]	};
-    key	<AB04> {	[		v,		 V	],
-			[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<AC04> {	[		f,		 F	],
-			[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<AD05> {	[		t,		 T	],
-			[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<AD04> {	[		r,		 R	],
-			[     Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[		5,	   comma	]	};
-    key	<AB06> {	[		n,		 N	],
-			[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<AB05> {	[		b,		 B	],
-			[     Ukrainian_i,     Ukrainian_I	]	};
-    key	<AC06> {	[		h,		 H	],
-			[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<AC05> {	[		g,		 G	],
-			[     Cyrillic_pe,     Cyrillic_PE	]	};
-    key	<AD06> {	[		y,		 Y	],
-			[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[	asciicircum,	     colon	]	};
-    key	<AB07> {	[		m,		 M	],
-			[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<AC07> {	[		j,		 J	],
-			[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<AD07> {	[		u,		 U	],
-			[    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[	ampersand,	    question	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[	dollar,		dollar		]	};
-    key	<AB08> {	[	    comma,	      less	],
-			[     Cyrillic_be,          Cyrillic_BE	]	};
-    key	<AC08> {	[		k,		 K	],
-			[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<AD08> {	[		i,		 I	],
-			[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AD09> {	[		o,		 O	],
-			[  Byelorussian_shortu,  Byelorussian_SHORTU	]	};
-    key	<AE10> {	[		0,	parenright	],
-			[		0,	parenright	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[		9,	 parenleft	]	};
-    key	<AB09> {	[	   period,	   greater	],
-			[     Cyrillic_yu,       Cyrillic_YU	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	    slash,	     comma	]	};
-    key	<AC09> {	[		l,		 L	],
-			[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<AC10> {	[	semicolon,	     colon	],
-			[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<AD10> {	[		p,		 P	],
-			[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<AE11> {	[	    minus,	underscore	],
-			[	    minus,	underscore	]	};
-    key	<AC11> {	[      apostrophe,	  quotedbl	],
-			[      bar,	      Cyrillic_E	]	};
-    key	<AD11> {	[     bracketleft,	 braceleft	],
-			[     bracketleft,     Cyrillic_HA	]	};
-    key	<AE12> {	[	    equal,	      plus	],
-			[	    equal,	      plus	]	};
-    key	<AD12> {	[    bracketright,	braceright	],
-			[	bracketright,	apostrophe	]	};
-    key	<BKSL> {	[	backslash,	       bar	],
-			[	backslash,	slash		]	};
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "winkeys" {
-    include "by(basic)"
-    key	<AE04> {	[		4,	    dollar	],
-			[		4,       semicolon	]	};
-    key	<AE03> {	[		3,	numbersign	],
-			[		3,      numbersign	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[		5,	   percent	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[		6,	     colon	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[		7,	  question	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[		8,	  asterisk	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	   period,	     comma	]	};
-    key	<BKSL> {	[	backslash,	       bar	],
-			[	    slash,             bar	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "by(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "by(Sundeadkeys)" // for naming consistency
-};
-
--- a/src/xorg/keytables/sun-src/symbols/ca_bi	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "basic" {
-    include "us(basic)"
-
-   key <TLDE> { [ slash, bar           ], [ backslash                  ]};
-   key <AE01> { [ 1, exclam            ], [ plusminus                  ]};
-   key <AE02> { [ 2, at                ]                                };
-   key <AE03> { [ 3, numbersign        ], [ sterling                   ]};
-   key <AE04> { [ 4, dollar            ], [ cent                       ]};
-   key <AE05> { [ 5, percent           ], [ currency                   ]};
-   key <AE06> { [ 6, question 	       ], [ notsign	               ]};
-   key <AE07> { [ 7, ampersand         ], [ braceleft                  ]};
-   key <AE08> { [ 8, asterisk          ], [ braceright                 ]};
-   key <AE09> { [ 9, parenleft         ], [ bracketleft                ]};
-   key <AE10> { [ 0, parenright        ], [ bracketright               ]};
-   key <AE11> { [ minus, underscore    ], [ onehalf	               ]};
-   key <AE12> { [ equal, plus          ], [ notsign                    ]};
-  
-   key <AD03> { [ e, E                 ], [ EuroSign		       ]};
-   key <AD09> { [ o, O		       ], [ section		       ]};
-   key <AD10> { [ p, P                 ], [ paragraph                  ]};
-   key <AD11> { [ dead_circumflex, dead_diaeresis], [ dead_grave       ]};
-   key <AD12> { [ ccedilla, Ccedilla   ], [ asciitilde                 ]};
-
-   key <AC10> { [ semicolon, colon     ], [ degree                     ]};
-   key <AC11> { [ egrave, Egrave       ], [ braceleft                  ]};
-   key <AC12> { [ agrave, Agrave       ], [ braceright                 ]};
-   key <BKSL> { [ agrave, Agrave       ], [ braceright                 ]};
-
-   key <LSGT> { [ uacute, Uacute       ]                                };
-   key <AB01> { [ z, Z                 ], [ guillemotleft              ]};
-   key <AB02> { [ x, X                 ], [ guillemotright             ]};
-   key <AB07> { [ m, M                 ], [ mu                         ]};
-   key <AB08> { [ comma, quoteright    ], [ less                       ]};
-   key <AB09> { [ period, quotedbl     ], [ greater                    ]};
-   key <AB10> { [ eacute, Eacute       ], [ quoteleft                  ]};
-   
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "ca_bi(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "ca_bi(Sundeadkeys)"
-}; 
--- a/src/xorg/keytables/sun-src/symbols/ca_enhanced	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-// This file was inspired by XFree86 version 3.3.2
-// as distributed with RedHat Linux 5.1
-// This file was created by Eric Moreau, 1998-09-27
-// I am reachable at [email protected]
-//
-// $XFree86$
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Those are intened to be modifications to the symbols
-// defined by /usr/X11R6/lib/X11/xkb/symbols/ca
-//
-// Most of the french canadian keyboards availables on PCs
-// are mapped like this.
-// Note that I remaped the ISO9995-3 keyboard but took
-// care of not loosing symbols.
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-    include "ca(basic)"
-    key <TLDE> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ numbersign, bar, backslash ],
-		symbols[Group2]= [ backslash, exclamdown ]
-		};
-    key <AE01> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 1, exclam, plusminus ],
-		symbols[Group2]= [ plusminus, onesuperior ]
-		};
-    key <AE02> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 2, quotedbl, at ],
-		symbols[Group2]= [ at, oneeighth ]
-		};
-    key <AE03> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 3, slash, sterling ],
-		symbols[Group2]= [ sterling ]
-		};
-    key <AE04> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 4, dollar, cent ],
-		symbols[Group2]= [ cent ]
-		};
-    key <AE05> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 5, percent, currency ],
-		symbols[Group2]= [ currency, threeeighths ]
-		};
-    key <AE06> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 6, question, notsign ],
-		symbols[Group2]= [ notsign, fiveeighths ]
-		};
-    key <AE07> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 7, ampersand, brokenbar ],
-		symbols[Group2]= [ brokenbar, seveneighths ]
-		};
-    key <AE08> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 8, asterisk, twosuperior ],
-		symbols[Group2]= [ twosuperior, trademark ]
-		};
-    key <AE09> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 9, parenleft, threesuperior ],
-		symbols[Group2]= [ threesuperior ]
-		};
-    key <AE10> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 0, parenright, onequarter ],
-		symbols[Group2]= [ onequarter ]
-		};
-    key <AE11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ minus, underscore, onehalf ],
-		symbols[Group2]= [ onehalf, questiondown ]
-		};
-    key <AE12> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ equal, plus, threequarters ],
-		symbols[Group2]= [ threequarters, dead_ogonek ]
-		};
-
-    key <AD01> {
-		symbols[Group1]= [ q, Q ],
-		symbols[Group2]= [ oslash, Ooblique ]
-		};
-    key <AD04> {
-		symbols[Group1]= [ r, R ],
-		symbols[Group2]= [ thorn, Thorn ]
-		};
-    key <AD09> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ o, O, section ],
-		symbols[Group2]= [ section, Greek_OMEGA ]
-		};
-    key <AD10> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ p, P, paragraph ],
-		symbols[Group2]= [ paragraph, registered ]
-		};
-    key <AD11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ dead_circumflex, dead_circumflex, bracketleft ],
-		symbols[Group2]= [ bracketleft, dead_abovering ]
-		};
-    key <AD12> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ dead_cedilla, dead_diaeresis, bracketright ],
-		symbols[Group2]= [ bracketright, horizconnector ]
-		};
-
-    key <AC10> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ semicolon, colon, asciitilde ],
-		symbols[Group2]= [ asciitilde, dead_doubleacute ]
-		};
-    key <AC11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ dead_grave, dead_grave, braceleft ],
-		symbols[Group2]= [ braceleft, dead_caron ]
-		};
-
-    key <AB01> {
-		symbols[Group1]= [ z, Z ],
-		symbols[Group2]= [ dead_belowdot, dead_abovedot ]
-		};
-    key <AB07> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ m, M, mu ],
-		symbols[Group2]= [ mu, masculine ]
-		};
-    key <AB08> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ comma, quoteright, horizconnector ],
-		symbols[Group2]= [ dead_macron, multiply ]
-		};
-    key <AB09> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ period, period, periodcentered ],
-		symbols[Group2]= [ periodcentered, division ]
-		};
-    key <AB10> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ eacute, Eacute, dead_acute ],
-		symbols[Group2]= [ dead_acute ]
-		};
-    key <BKSL> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ less, greater, braceright ],
-		symbols[Group2]= [ braceright, dead_breve ]
-		};
-
-    key <LSGT> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ guillemotleft, guillemotright, degree ],
-		symbols[Group2]= [ degree ]
-		};
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "ca_enhanced(basic)"    
-    key <AD11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ SunFA_Circum, SunFA_Circum, bracketleft ],
-		symbols[Group2]= [ bracketleft, dead_abovering ]
-		};
-    key <AD12> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ SunFA_Cedilla, SunFA_Diaeresis, bracketright ],
-		symbols[Group2]= [ bracketright, horizconnector ]
-		};
-    key <AC11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ SunFA_Grave, SunFA_Grave, braceleft ],
-		symbols[Group2]= [ braceleft, dead_caron ]
-		};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "ca_enhanced(Sundeadkeys)"
-};
--- a/src/xorg/keytables/sun-src/symbols/cz	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/cz,v 1.1 2001/05/18 23:35:35 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial alphanumeric_keys 
-xkb_symbols "basic" {
-     
-     // Describes the differences between a very simple en_US
-     // keyboard and a Czech keyboard
-     // This layout conforms to a new cz compromise standard designed 
-     // to satisfy most unix, windows and mac users.
-     // 2001 by Kamil Toman <[email protected]>
-
-     // Switching to US added by Jan Holesovsky <[email protected]>, 2001
-
-    include "us(basic)"
-
-    name[Group1]= "Czech";
-
-    key <TLDE>  { [ semicolon, dead_abovering   ],
-                  [ quoteleft,     asciitilde   ]       };
-    key <AE01>  { [      plus,          1       ],
-                  [    exclam,     asciitilde   ]       };
-    key <AE02>  { [    ecaron,          2       ],
-                  [        at,     dead_caron   ]       };
-    key <AE03>  { [    scaron,          3       ],
-                  [ numbersign,  SunFA_Circum   ]       };
-    key <AE04>  { [    ccaron,          4       ],
-                  [    dollar,     dead_breve   ]       };
-    key <AE05>  { [    rcaron,          5       ],
-                  [   percent, dead_abovering   ]       };
-    key <AE06>  { [    zcaron,          6       ],
-                  [ asciicircum,  dead_ogonek   ]       };
-    key <AE07>  { [    yacute,          7       ],
-                  [ ampersand,          grave   ]       };
-    key <AE08>  { [    aacute,          8       ],
-                  [  asterisk,  dead_abovedot   ]       };
-    key <AE09>  { [    iacute,          9       ],
-                  [ parenleft,    SunFA_Acute   ]       };
-    key <AE10>  { [    eacute,          0       ],
-                  [ parenright, dead_doubleacute]       };
-    key <AE11>  { [     equal,    percent       ],
-                  [ dead_diaeresis, backslash   ]       };
-    key <AE12>  { [ SunFA_Acute, dead_caron     ],
-                  [ dead_cedilla, minus         ]       };
-
-    key <AD01>	{ [         q,          Q 	], 
-		  [  backslash 			]	};
-    key <AD02>	{ [         w,          W 	], 
-		  [       bar 			]	};
-    key <AD03>	{ [         e,          E 	], 
-		  [    EuroSign 		]	};
-    key <AD04>	{ [         r,          R 	]	};
-    key <AD05>	{ [         t,          T 	]	};
-    key <AD06>	{ [         z,          Z 	]	};
-    key <AD07>	{ [         u,          U 	]	};
-    key <AD08>	{ [         i,          I 	]	};
-    key <AD09>	{ [         o,          O 	]	};
-    key <AD10>	{ [         p,          P 	]	};
-
-    key <AD11>	{ [    uacute,      slash 	], 
-		  [    division 		]	};
-    key <AD12>	{ [parenright,  parenleft 	], 
-		  [    multiply 		]	};
-
-    key <AC01>	{ [         a,          A 	]	};
-    key <AC02>	{ [         s,          S 	], 
-		  [   dstroke			]	};
-    key <AC03>	{ [         d,          D 	], 
-		  [     Dstroke 		]	};
-    key <AC04>	{ [         f,          F 	], 
-		  [ bracketleft 		]	};
-    key <AC05>	{ [         g,          G 	], 
-		  [ bracketright 		]	};
-    key <AC06>	{ [         h,          H 	]	};
-    key <AC07>	{ [         j,          J 	]	};
-    key <AC08>	{ [         k,          K 	], 
-		  [      lstroke 		]	};
-    key <AC09>	{ [         l,          L 	], 
-		  [      Lstroke 		]	};
-                  
-    key <AC10>	{ [     uring,   quotedbl 	], 
-		  [   dollar 			]	};
-    key <AC11>	{ [   section,     exclam 	], 
-		  [       ssharp 		]	};
-    key <BKSL>  { [ dead_diaeresis, apostrophe  ],
-                  [  backslash,            bar  ]       };
-    key <LSGT>  { [  backslash,       asterisk  ],
-                  [      slash,      brokenbar  ]       };
-    key <AB01>	{ [         y,          Y 	], 
-		  [     greater 		]	};
-    key <AB02>	{ [         x,          X 	], 
-		  [  numbersign 		]	};
-    key <AB03>	{ [         c,          C 	]	};
-    key <AB04>	{ [         v,          V 	], 
-		  [      at 			]	};
-    key <AB05>	{ [         b,          B 	],
-		  [ braceleft 			]	};
-    key <AB06>	{ [         n,          N 	],
-		  [ braceright 			]	};
-    key <AB07>	{ [         m,          M 	]	};
-    key <AB08>	{ [     comma,   question 	]	};
-    key <AB09>	{ [    period,      colon 	]	};
-    key <AB10>	{ [     minus, underscore 	]	};
-
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-include "cz(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-include "cz(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/cz_qwerty	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/cz_qwerty,v 1.1 2001/05/18 23:35:35 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // This layout should work exactly as a cz with the exception
-    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
-    // 2001 by Kamil Toman <[email protected]>
-
-    include "cz(basic)"
-
-    key <AB01> {	[	z,              Z ],
-			[	degree] 	};
-    key <AD06> { [    y,              Y]};
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "cz_qwerty(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "cz_qwerty(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/czsk	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,774 +0,0 @@
-// Czech and Slovak keyboard symbols for XKB and PC keyboard
-//
-// (C) 1997,1999 Stanislav Meduna, [email protected]
-// (C) 2000  Kamil Toman, [email protected]
-//
-// Permission is granted to anyone to use, distribute and modify
-// this file in any way, provided that the above copyright notice
-// is left intact and the author of the modification summarizes
-// the changes in this header.
-//
-// This file is distributed without any expressed or implied warranty.
-//
-// $XFree86: xc/programs/xkbcomp/symbols/czsk,v 1.8 2002/11/20 04:49:03 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-
-partial default alphanumeric_keys 
-xkb_symbols "us_sk_qwerty" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Slovak";
-
-    include "czsk(def_qwerty)"
-    include "czsk(def_us_sk)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_sk_qwertz" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Slovak";
-
-    include "czsk(def_us_qwertz)"
-    include "czsk(def_us_sk)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sk_us_qwerty" {
-    Name[Group1] = "Slovak";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_qwerty)"
-    include "czsk(def_sk_us)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sk_us_qwertz" {
-    Name[Group1] = "Slovak";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_qwertz_us)"
-    include "czsk(def_sk_us)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_sk_prog" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Slovak";
-
-    include "czsk(def_basic)"
-    include "czsk(def_qwerty)"
-    include "czsk(def_us_sk_prog)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sk_us_prog" {
-    Name[Group1] = "Slovak";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_basic)"
-    include "czsk(def_qwerty)"
-    include "czsk(def_sk_us_prog)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_cz_qwerty" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Czech";
-
-    include "czsk(def_qwerty)"
-    include "czsk(def_us_cz)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_cz_qwertz" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Czech";
-
-    include "czsk(def_us_qwertz)"
-    include "czsk(def_us_cz)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "cz_us_qwerty" {
-    Name[Group1] = "Czech";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_qwerty)"
-    include "czsk(def_cz_us)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "cz_us_qwertz" {
-    Name[Group1] = "Czech";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_qwertz_us)"
-    include "czsk(def_cz_us)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_cz_prog" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Czech";
-
-    include "czsk(def_basic)"
-    include "czsk(def_qwerty)"
-    include "czsk(def_us_cz_prog)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "cz_us_prog" {
-    Name[Group1] = "Czech";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_basic)"
-    include "czsk(def_qwerty)"
-    include "czsk(def_cz_us_prog)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_sk" {
-    include "czsk(def_basic)"
-    include "czsk(def_us_czsk)"
-    include "czsk(def_us_sk_prog)"
-    include "czsk(def_us_sk_rp)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_sk_us" {
-    include "czsk(def_basic)"
-    include "czsk(def_czsk_us)"
-    include "czsk(def_sk_us_prog)"
-    include "czsk(def_sk_us_rp)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_cz" {
-    include "czsk(def_basic)"
-    include "czsk(def_us_czsk)"
-    include "czsk(def_us_cz_prog)"
-    include "czsk(def_us_cz_rp)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_cz_us" {
-    include "czsk(def_basic)"
-    include "czsk(def_czsk_us)"
-    include "czsk(def_cz_us_prog)"
-    include "czsk(def_cz_us_rp)"
-};
-
-// added in for 1 key shifted prblem dm89450
-
-partial alphanumeric_keys 
-xkb_symbols "def_basic" {
-
-//    include "group(shift_toggle)"
- //  include "srvr_ctrl(xfree86)"
-	include "us(basic)"
-
-    // Alphanumeric keys identical to US
-    key <ESC>  {	[ Escape			],
-                        [ Escape			]       };
-
-    key <BKSP> {
-	type="CTRL+ALT",
-	symbols[Group1]= [ BackSpace,	Terminate_Server ]
-    };
-
-    key <TLDE> { [           grave,     asciitilde      ],       
-	         [           grave,     asciitilde	]	};
-
-
-    key  <TAB> {	[ 	Tab,	ISO_Left_Tab	],
-                        [ 	Tab,	ISO_Left_Tab	]       };
-    key <AD01> {	[	  q,	Q 		],
-                        [	  q,	Q 		]       };
-    key <AD02> {	[	  w,	W		],
-                        [	  w,	W		]       };
-    key <AD03> {	[	  e,	E		],
-                        [	  e,	E		]       };
-    key <AD04> {	[	  r,	R		],
-                        [	  r,	R		]       };
-    key <AD05> {	[	  t,	T		],
-                        [	  t,	T		]       };
-    key <AD07> {	[	  u,	U		],
-                        [	  u,	U		]       };
-    key <AD08> {	[	  i,	I		],
-                        [	  i,	I		]       };
-    key <AD09> {	[	  o,	O		],
-    			[	  o,    O		]	};
-    key <AD10> {	[	  p,	P		],
-                        [	  p,	P		]       };
-    key <RTRN> {	[ Return			],
-    			[ Return 			]	};
-
-    key <CAPS> {	[	Caps_Lock		],
-    			[	Caps_Lock		]	};
-    key <AC01> {	[	  a,	A 		],
-                        [	  a,	A 		]       };
-    key <AC02> {	[	  s,	S		],
-                        [	  s,	S		]       };
-    key <AC03> {	[	  d,	D		],
-                        [	  d,	D		]       };
-    key <AC04> {	[	  f,	F		],
-                        [	  f,	F		]       };
-    key <AC05> {	[	  g,	G		],
-                        [	  g,	G		]       };
-    key <AC06> {	[	  h,	H		],
-                        [	  h,	H		]       };
-    key <AC07> {	[	  j,	J		],
-                        [	  j,	J		]       };
-    key <AC08> {	[	  k,	K		],
-                        [	  k,	K		]       };
-    key <AC09> {	[	  l,	L		],
-                        [	  l,	L		]       };
-
-    key <LFSH> {	[ 	 Shift_L		],
-    			[	 Shift_L		]	};
-    key <AB02> {	[	  x,	X		],
-                        [	  x,	X		]       };
-    key <AB03> {	[	  c,	C		],
-                        [	  c,	C		]       };
-    key <AB04> {	[	  v,	V		],
-                        [	  v,	V		]       };
-    key <AB05> {	[	  b,	B		],
-                        [	  b,	B		]       };
-    key <AB06> {	[	  n,	N		],
-                        [	  n,	N		]       };
-    key <AB07> {	[	  m,	M		],
-                        [	  m,	M		]       };
-    key <BKSL> {	[ backslash,	bar		],
-                        [ backslash,	bar		]       };
-
-    key <LCTL> {	[ 	 Control_L		],
-    			[ 	 Control_L		]	};
-    key <SPCE> {	[ 	 space			],
-    			[ 	 space			]	};
-
-    key <LSGT> {	[      less,    greater		],
-                        [      less,    greater		]       };
-
-    key <LALT> {	[ 	Alt_L		],
-    			[ 	Meta_L		]	};
-    key <LWIN> {	[	Meta_L		],
-    			[	Meta_L		]	};
-    key <RWIN> {	[	Meta_R		],
-			[       Meta_R		]	};
-    key <MENU> {	[	Menu		],
-    			[	Menu		]	};
-    // End alphanumeric section
-
-    // begin modifier mappings
-    
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod3   { Mode_switch };
-
-    // Begin "Function" section
-    key <FK01> {        [        F1             ],
-			[        F1             ]       };
-    key <FK02> {        [        F2             ],
-			[        F2             ]       };
-    key <FK03> {        [        F3             ],
-			[        F3             ]       };
-    key <FK04> {        [        F4             ],
-			[        F4             ]       };
-    key <FK05> {        [        F5             ],
-			[        F5             ]       };
-    key <FK06> {        [        F6             ],
-			[        F6             ]       };
-    key <FK07> {        [        F7             ],
-			[        F7             ]       };
-    key <FK08> {        [        F8             ],
-			[        F8             ]       };
-    key <FK09> {        [        F9             ],
-			[        F9             ]       };
-    key <FK10> {        [        F10            ],
-			[        F10            ]       };
-    key <FK11> {        [        F11            ],
-			[        F11            ]       };
-    key <FK12> {        [        F12            ],
-			[        F12            ]       };
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> {
-        type= "PC_SYSRQ",
-        symbols[Group1]= [ Print, Sys_Req ]
-    };
-
-    key <PAUS> {	[ Multi_key				]	};
-    key <RALT> {        [ Mode_switch,  Multi_key       	]       };
-    key <SCLK> {	[ ISO_Next_Group, 	ISO_Next_Group	]	};
-
-    // Gray keys
-
-    key  <INS> { 	[  Insert             	],
-			[  Insert             	]       };
-    key <HOME> {        [  Home                 ],
-			[  Home                 ]       };
-    key <PGUP> {        [  Prior                ],
-			[  Prior                ]       };
-    key <DELE> {	[  Delete               ],
-			[  Delete               ]       };
-    key  <END> {        [  End                  ],
-			[  End                  ]       };
-    key <PGDN> {        [  Next                 ],
-			[  Next                 ]       };
-
-    // Cursor keys
-    key   <UP> {        [  Up                   ],
-			[  Up                   ]       };
-    key <LEFT> {        [  Left                 ],
-			[  Left                 ]       };
-    key <DOWN> {        [  Down                 ],
-			[  Down                 ]       };
-    key <RGHT> {        [  Right                ],
-			[  Right                ]       };
-
-
-    // Keypad keys
-    key <NMLK> {        [  Num_Lock, Pointer_EnableKeys         ],
-			[  Num_Lock, Pointer_EnableKeys         ]};
-    key <KPDV> {        [  KP_Divide            ],
-			[  KP_Divide            ]       };
-    key <KPMU> {        [  KP_Multiply          ],
-			[  KP_Multiply          ]       };
-    key <KPSU> {        [  KP_Subtract          ],
-			[  KP_Subtract          ]       };
-
-    key  <KP7> {        [  KP_Home,     KP_7    ],
-			[  KP_Home,     KP_7    ]       };
-    key  <KP8> {        [  KP_Up,       KP_8    ],
-			[  KP_Up,       KP_8    ]       };
-    key  <KP9> {        [  KP_Prior,    KP_9    ],
-			[  KP_Prior,    KP_9    ]       };
-    key <KPAD> {        [       KP_Add          ],
-			[       KP_Add          ]       };
-
-    key  <KP4> {        [  KP_Left,     KP_4    ],
-			[  KP_Left,     KP_4    ]       };
-    key  <KP5> {        [  KP_Begin,    KP_5    ],
-			[  KP_Begin,    KP_5    ]       };
-    key  <KP6> {        [  KP_Right,    KP_6    ],
-			[  KP_Right,    KP_6    ]       };
-
-    key  <KP1> {        [  KP_End,      KP_1    ],
-			[  KP_End,      KP_1    ]       };
-    key  <KP2> {        [  KP_Down,     KP_2    ],
-			[  KP_Down,     KP_2    ]       };
-    key  <KP3> {        [  KP_Next,     KP_3    ],
-			[  KP_Next,     KP_3    ]       };
-    key <KPEN> {        [       KP_Enter        ],
-			[       KP_Enter        ]       };
-
-    key  <KP0> {        [  KP_Insert,   KP_0    ],
-			[  KP_Insert,   KP_0    ]       };
-    key <KPDL> {        [  KP_Delete, KP_Decimal ],
-			[  KP_Delete, KP_Decimal ]      };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_czsk_us" {
-    key <AE11> {
-	[	    equal,        percent	],
-	[           minus,     underscore	]
-	};
-    key <AD11> {
-	[	   uacute,          slash	],
-	[     bracketleft,      braceleft	]
-	};
-    key <AC11> {
-	[	  section,         exclam	],
-	[      apostrophe,       quotedbl	]
-	};
-    key <AB08> {
-	[	    comma,	 question	],
-	[	    comma,	     less	]
-	};
-    key <AB09> {
-	[	   period,	    colon	],
-	[	   period,	  greater	]
-	};
-    key <AB10> {
-	[	    minus,     underscore	],
-	[	    slash,	 question	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_czsk" {
-    key <AE11> {
-	[           minus,     underscore	],
-	[	    equal,        percent	]
-	};
-    key <AD11> {
-	[     bracketleft,      braceleft	],
-	[	   uacute,          slash	]
-	};
-    key <AC11> {
-	[      apostrophe,       quotedbl	],
-	[	  section,         exclam	]
-	};
-    key <AB08> {
-	[	    comma,	     less	],
-	[	    comma,	 question	]
-	};
-    key <AB09> {
-	[	   period,	  greater	],
-	[	   period,	    colon	]
-	};
-    key <AB10> {
-	[	    slash,	 question	],
-	[	    minus,     underscore	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_sk_us_rp" {
-    key <AC10> {
-	[     ocircumflex,       quotedbl	],
-	[       semicolon,	    colon	]
-	};
-    key <AD12> {
-	[      adiaeresis,      parenleft	],
-	[    bracketright,     braceright	]
-	};
-    key <BKSL> {
-	[	   ncaron,	parenright	],
-	[	backslash,	      bar	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_cz_us_rp" {
-    key <AC10> {
-	[           uring,       quotedbl	],
-	[       semicolon,	    colon	]
-	};
-    key <AD12> {
-	[      parenright,      parenleft	],
-	[    bracketright,     braceright	]
-	};
-    key <BKSL> {
-	[	backslash,	      bar	],
-	[	backslash,	      bar	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_sk_rp" {
-    key <AC10> {
-	[       semicolon,	    colon	],
-	[     ocircumflex,       quotedbl	]
-	};
-    key <AD12> {
-	[    bracketright,     braceright	],
-	[      adiaeresis,      parenleft	]
-	};
-    key <BKSL> {
-	[	backslash,	      bar	],
-	[	   ncaron,	parenright	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_cz_rp" {
-    key <AC10> {
-	[       semicolon,	    colon	],
-	[           uring,       quotedbl	]
-	};
-    key <AD12> {
-	[    bracketright,     braceright	],
-	[      parenright,      parenleft	]
-	};
-    key <BKSL> {
-	[	backslash,	      bar	],
-	[	backslash,	      bar	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_qwertz_us" {
-    key <AD06> {
-	[               z,	        Z	],
-	[               y,              Y	]
-	};
-    key <AB01> {
-	[               y,	        Y	],
-	[               z,              Z	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_qwertz" {
-    key <AD06> {
-	[               y,	        Y	],
-	[               z,              Z	]
-	};
-    key <AB01> {
-	[               z,	        Z	],
-	[               y,              Y	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_qwerty" {
-    key <AD06> {
-	[               y,	        Y	],
-	[               y,              Y	]
-	};
-    key <AB01> {
-	[               z,	        Z	],
-	[               z,              Z	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_sk_prog" {
-    key <TLDE> {
-	[           grave,     asciitilde	],
-        [  dead_diaeresis,     semicolon        ]        
-	};
-    key <AE01> {
-	[		1,	   exclam	],
-	[	     plus,		1	]
-	};
-    key <AE02> {
-	[		2,	       at	],
-	[	   lcaron,		2	]
-	};
-    key <AE03> {
-	[		3,     numbersign	],
-	[	   scaron,		3	]
-	};
-    key <AE04> {
-	[		4,	   dollar	],
-	[	   ccaron,		4	]
-	};
-    key <AE05> {
-	[		5,        percent	],
-	[	   tcaron,		5	]
-	};
-    key <AE06> {
-	[		6,    asciicircum	],
-	[	   zcaron,		6	]
-	};
-    key <AE07> {
-	[		7,      ampersand	],
-	[	   yacute,		7	]
-	};
-    key <AE08> {
-	[		8,       asterisk	],
-	[	   aacute,		8	]
-	};
-    key <AE09> {
-	[		9,      parenleft	],
-	[	   iacute,		9	]
-	};
-    key <AE10> {
-	[		0,     parenright	],
-	[	   eacute,		0	]
-	};
-    key <AE12> {
-	[           equal,           plus	],
-	[      dead_acute,     dead_caron	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_cz_prog" {
-    key <TLDE> {
-	[           grave,     asciitilde	],
-        [  dead_diaeresis,     semicolon        ]        
-	};
-    key <AE01> {
-	[		1,	   exclam	],
-	[	     plus,		1	]
-	};
-    key <AE02> {
-	[		2,	       at	],
-	[	   ecaron,		2	]
-	};
-    key <AE03> {
-	[		3,     numbersign	],
-	[	   scaron,		3	]
-	};
-    key <AE04> {
-	[		4,	   dollar	],
-	[	   ccaron,		4	]
-	};
-    key <AE05> {
-	[		5,        percent	],
-	[	   rcaron,		5	]
-	};
-    key <AE06> {
-	[		6,    asciicircum	],
-	[	   zcaron,		6	]
-	};
-    key <AE07> {
-	[		7,      ampersand	],
-	[	   yacute,		7	]
-	};
-    key <AE08> {
-	[		8,       asterisk	],
-	[	   aacute,		8	]
-	};
-    key <AE09> {
-	[		9,      parenleft	],
-	[	   iacute,		9	]
-	};
-    key <AE10> {
-	[		0,     parenright	],
-	[	   eacute,		0	]
-	};
-    key <AE12> {
-	[           equal,           plus	],
-	[      dead_acute,     dead_caron	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_sk_us_prog" {
-    key <TLDE> {
-        [  dead_diaeresis,      semicolon       ],
-	[           grave,     asciitilde	]
-	};
-    key <AE01> {
-	[	     plus,		1	],
-	[		1,	   exclam	]
-	};
-    key <AE02> {
-	[	   lcaron,		2	],
-	[		2,	       at	]
-	};
-    key <AE03> {
-	[	   scaron,		3	],
-	[		3,     numbersign	]
-	};
-    key <AE04> {
-	[	   ccaron,		4	],
-	[		4,	   dollar	]
-	};
-    key <AE05> {
-	[	   tcaron,		5	],
-	[		5,        percent	]
-	};
-    key <AE06> {
-	[	   zcaron,		6	],
-	[		6,    asciicircum	]
-	};
-    key <AE07> {
-	[	   yacute,		7	],
-	[		7,      ampersand	]
-	};
-    key <AE08> {
-	[	   aacute,		8	],
-	[		8,       asterisk	]
-	};
-    key <AE09> {
-	[	   iacute,		9	],
-	[		9,      parenleft	]
-	};
-    key <AE10> {
-	[	   eacute,		0	],
-	[		0,     parenright	]
-	};
-    key <AE12> {
-	[      dead_acute,     dead_caron	],
-	[           equal,           plus	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_cz_us_prog" {
-    key <TLDE> {
-        [  dead_diaeresis,     semicolon        ],       
-	[           grave,     asciitilde	]
-	};
-    key <AE01> {
-	[	     plus,		1	],
-	[		1,	   exclam	]
-	};
-    key <AE02> {
-	[	   ecaron,		2	],
-	[		2,	       at	]
-	};
-    key <AE03> {
-	[	   scaron,		3	],
-	[		3,     numbersign	]
-	};
-    key <AE04> {
-	[	   ccaron,		4	],
-	[		4,	   dollar	]
-	};
-    key <AE05> {
-	[	   rcaron,		5	],
-	[		5,        percent	]
-	};
-    key <AE06> {
-	[	   zcaron,		6	],
-	[		6,    asciicircum	]
-	};
-    key <AE07> {
-	[	   yacute,		7	],
-	[		7,      ampersand	]
-	};
-    key <AE08> {
-	[	   aacute,		8	],
-	[		8,       asterisk	]
-	};
-    key <AE09> {
-	[	   iacute,		9	],
-	[		9,      parenleft	]
-	};
-    key <AE10> {
-	[	   eacute,		0	],
-	[		0,     parenright	]
-	};
-    key <AE12> {
-	[      dead_acute,     dead_caron	],
-	[           equal,           plus	]
-	};
-};
-
-// add in for 1 key shifted problem dm89450
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "czsk(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "czsk(Sundeadkeys)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-	include "us(basic)"
-	include "czsk(def_basic)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/de	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,210 +0,0 @@
-// $Xorg: de,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/de,v 3.14 2003/09/08 13:12:37 pascal Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple German keyboard
-
-    // Alphanumeric section
-    name[Group1]= "German";
-    key <TLDE> {	[ dead_circumflex,	degree	],
-			[   notsign 			]	};
-    key <AE02> {	[	  2,	quotedbl	],
-			[ twosuperior			]	};
-    key <AE03> {	[	  3,	section	],
-			[ threesuperior,sterling	]	};
-    key <AE04> {	[	  4,	dollar		],
-			[ onequarter,	currency	]	};
-    key <AE05> {	[	  5,	percent		],
-			[   onehalf			]	};
-    key <AE06> {	[	  6,	ampersand	],
-			[ threequarters			]	};
-    key <AE07> {	[	  7,	slash		],
-			[ braceleft			]	};
-    key <AE08> {	[	  8,	parenleft	],
-			[ bracketleft			]	};
-    key <AE09> {	[	  9,	parenright	],
-			[ bracketright,	plusminus	]	};
-    key <AE10> {	[	  0,	equal		],
-			[ braceright,	degree		]	};
-    key <AE11> {	[    ssharp,	question	],
-			[ backslash,	questiondown	]	};
-    key <AE12> {	[ dead_acute,	dead_grave	],
-			[ dead_cedilla,	dead_ogonek	]	};
-
-    key <AD01> {	[	  q,	Q 		],
-			[	 at			]	};
-    key <AD03> {	[	  e,	E		],
-			[  EuroSign			]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  z,	Z		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD11> {	[ udiaeresis,	Udiaeresis	],
-			[ dead_diaeresis 		]	};
-    key <AD12> {	[      plus,	asterisk	],
-			[ dead_tilde,	dead_macron	]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G		]	};
-    key <AC10> {	[ odiaeresis,	Odiaeresis	],
-			[ dead_doubleacute		]	};
-    key <AC11> {	[ adiaeresis,	Adiaeresis	],
-			[ dead_circumflex		]	};
-
-    key <LSGT> {	[      less,	greater		],
-			[       bar			]	};
-    key <AB01> {	[	  y,	Y 		],
-			[ guillemotleft,less		]	};
-    key <AB07> {	[	  m,	M		],
-			[	 mu			]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon		],
-			[ periodcentered, division	]	};
-    key <AB10> {	[     minus,	underscore	]	};
-    key <BKSL> {	[ numbersign,	apostrophe	],
-			[ dead_grave			]	};
-    key <RALT> {	[ Mode_switch,	Multi_key	]	};
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    // modify the default German layout to not have any dead keys
-    include "de(basic)"
-    key <TLDE> {	[ asciicircum,	degree		],
-			[   notsign 			]	};
-    key <AE12> {	[ apostrophe,	grave		],
-			[ cedilla			]	};
-    key <AD11> {	[ udiaeresis,	Udiaeresis	],
-			[ diaeresis 			]	};
-    key <AD12> {	[      plus,	asterisk	],
-			[ asciitilde,	macron		]	};
-    key <AC10> {	[ odiaeresis,	Odiaeresis	],
-			[ doubleacute			]	};
-    key <AC11> {	[ adiaeresis,	Adiaeresis	],
-			[ asciicircum			]	};
-
-    key <BKSL> {	[ numbersign,	apostrophe	],
-			[ grave				]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "deadgraveacute" {
-    // modify the default German layout to have only acute and grave
-    // as dead keys (tilde and circumflex are needed as spacing characters
-    // in many programming languages)
-    include "de(basic)"
-    key <TLDE> {	[ asciicircum,	degree		],
-			[ notsign			]	};
-    key <AD12> {	[ plus,		asterisk	],
-			[ asciitilde,   dead_macron	]	};
-    key <BKSL> {	[ numbersign,   apostrophe	],
-			[ grave				]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "deadacute" {
-    // modify the default German layout to have only acute as
-    // dead keys (ASCII grave, tilde and circumflex are needed as
-    // spacing characters in many programming languages and text formatters)
-    include "de(deadgraveacute)"
-    key <AE12> {	[ dead_acute,	grave		],
-			[ dead_cedilla,	dead_ogonek	]	};
-    key <BKSL> {	[ numbersign,	apostrophe	],
-			[ dead_grave			]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "de_ro" {
-    // add romanian-specific characters to the basic German layout.
-    // Romanian symbols are accessible with combination of <AltGr> and
-    // 'a', 's', 't', 'i', '� (&auml)' (+<Shift> for capital letters).
-    // To view romanian specific symbols, add "export LC_CTYPE=ro_RO"
-    // or "export LC_CTYPE=de_DE.utf8" to your .profile.
-
-    include "de(basic)"
-
-    name[Group1]="Romanian for German keyboard";
-
-    key <AD05> {        [         t,    T               ],
-                        [ tcedilla,     Tcedilla        ]       };
-    key <AD08> {        [         i,    I               ],
-                        [ icircumflex,  Icircumflex     ]       };
-    key <AC01> {        [         a,    A               ],
-                        [ acircumflex,  Acircumflex     ]       };
-    key <AC02> {        [         s,    S               ],
-                        [ scedilla,     Scedilla        ]       };
-    key <AC11> {        [ adiaeresis,   Adiaeresis      ],
-                        [ abreve,       Abreve          ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "de_ro_nodeadkeys" {
-    // add romanian-specific characters to the "nodeadkeys" German layout.
-    // Read the comment for de_ro !
-
-    include "de(nodeadkeys)"
-
-    key <AD05> {        [         t,    T               ],
-                        [ tcedilla,     Tcedilla        ]       };
-    key <AD08> {        [         i,    I               ],
-                        [ icircumflex,  Icircumflex     ]       };
-    key <AC01> {        [         a,    A               ],
-                        [ acircumflex,  Acircumflex     ]       };
-    key <AC02> {        [         s,    S               ],
-                        [ scedilla,     Scedilla        ]       };
-    key <AC11> {        [ adiaeresis,   Adiaeresis      ],
-                        [ abreve,       Abreve          ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "de(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "de(Sundeadkeys)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/de_CH	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-// $Xorg: de_CH,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/de_CH,v 3.4 2000/01/21 01:12:27 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss keyboard
-
-    // Alphanumeric section
-    name[Group1]= "Swiss German";
-    key <TLDE> {	[   section,	degree		]	};
-    key <AE01> {	[	  1,	plus 		],
-			[       bar			]	};
-    key <AE02> {	[	  2,	quotedbl	],
-			[        at			]	};
-    key <AE03> {	[	  3,	asterisk	],
-			[ numbersign			]	};
-    key <AE04> {	[	  4,	ccedilla	],
-			[  asciicircum 		        ]       };	
-    key <AE05> {	[	  5,	percent		],
-                        [  asciitilde                   ]       };
-    key <AE06> {	[	  6,	ampersand	],
-			[   notsign			]	};
-    key <AE07> {	[	  7,	slash		],
-			[ brokenbar			]	};
-    key <AE08> {	[	  8,	parenleft	],
-			[      cent			]	};
-    key <AE09> {	[	  9,	parenright	]	};
-    key <AE10> {	[	  0,	equal		],
-  			[     acute		        ]	};
-    key <AE11> {	[ apostrophe,	question	],
-			[ dead_acute			]	};
-    key <AE12> {	[ dead_circumflex, dead_grave	],
-			[ dead_tilde			]	};
-    key <AD03> {	[	  e,	E		],
-			[  EuroSign			]	};
-    key <AD06> {	[	  z,	Z		]	};
-    key <AD11> {	[ udiaeresis,	egrave		],
-			[ bracketleft			]	};
-    key <AD12> {	[ dead_diaeresis, exclam	],
-			[ bracketright			]	};
-    key <AC10> {	[ odiaeresis,	eacute		]	};
-    key <AC11> {	[ adiaeresis,	agrave		],
-			[  braceleft			]	};
-    key <BKSL> {	[     dollar,	sterling	],
-			[ braceright			]	};
-
-    key <LSGT> {	[      less,	greater		],
-			[ backslash			]	};
-    key <AB01> {	[	  y,	Y 		]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon		]	};
-    key <AB10> {	[     minus,	underscore	]	};
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {        [  KP_Delete,   KP_Separator    ]       };
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-};
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    // modify the default Swiss German layout to use Sun dead keys
-    include "de_CH(basic)"
-    key <AE11> {	[ apostrophe,	question	],
-			[ dead_acute			]	};
-    key <AE12> {	[ dead_circumflex,	dead_grave	],
-			[ dead_tilde			]	};
-    key <AD12> {	[ dead_diaeresis, exclam	],
-			[ bracketright			]	};
-};
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "de_CH(Sundeadkeys)"
-};
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    // modify the default Swiss German layout not to have any dead keys
-    include "de_CH(basic)"
-    key <AE11> {	[ apostrophe,	question	],
-			[ acute				]	};
-    key <AE12> {	[ asciicircum,	grave		],
-			[ asciitilde			]	};
-    key <AD12> {	[ diaeresis,	exclam		],
-			[ bracketright			]	};
-};
--- a/src/xorg/keytables/sun-src/symbols/dk	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-// $Xorg: dk,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/dk,v 3.6 2001/01/17 23:45:58 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a Danish keyboard with dead key support
-    // and all of ISO-8859-1 characters available.
-
-    name[Group1]= "Danish";
-
-    key <TLDE> {	[         onehalf,         section      ],
-			[   threequarters,       paragraph	]};
-    key <LSGT> {	[	     less,	   greater	],
-			[	backslash,         notsign	]};
-    key <SPCE> {	[	    space,	     space	],
-			[    nobreakspace,    nobreakspace	]};
-    key <AE01> {	[               1,          exclam  	],
-			[      exclamdown,     onesuperior	]};
-    key <AE02> {	[               2,        quotedbl  	],
-			[	       at,     twosuperior	]};
-    key <AE03> {	[              	3,	numbersign	],
-			[	 sterling,   threesuperior	]};
-    key <AE04> {	[               4,        currency     	],
-			[	   dollar,	onequarter	]};
-    key <AE05> {	[               5,         percent     	],
-			[        NoSymbol,	      cent	]};
-    key <AE06> {	[               6,       ampersand     	],
-			[      asciicirum,	  NoSymbol	]};
-    key <AE07> {	[               7,           slash     	],
-			[       braceleft,        division	]};
-    key <AE08> {	[               8,       parenleft     	],
-			[     bracketleft,   guillemotleft	]};
-    key <AE09> {	[               9,      parenright     	],
-			[    bracketright,  guillemotright	]};
-    key <AE10> {	[               0,           equal     	],
-                        [      braceright,          degree      ]};
-    key <AB08> {	[           comma,       semicolon     	],
-			[    dead_cedilla,     dead_ogonek	]};
-    key <AB09> {	[          period,           colon     	],
-			[  periodcentered,   dead_abovedot	]};
-    key <AB03> {        [               c,               C      ],
-                        [       copyright,        NoSymbol      ]};
-    key <AB10> {	[           minus,      underscore     	],
-			[	   hyphen,          macron	]};
-    key <AC01> {        [               a,               A      ],
-                        [     ordfeminine,       masculine      ]};
-    key <AC03> {        [               d,               D      ],
-                        [             eth,             ETH      ]};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign,            cent      ]};
-    key <AD04> {        [               r,               R      ],
-                        [      registered,        NoSymbol      ]};
-    key <AD05> {        [               t,               T      ],
-                        [           thorn,           THORN      ]};
-    key <AD08> {        [               i,               I      ],
-                        [        NoSymbol,        NoSymbol      ]};
-    key <AD09> {        [               o,               O      ],
-                        [              oe,              OE      ]};
-    key	<AC10> {	[	       ae,	        AE	]};
-    key <AE11> {	[            plus,        question      ],
-			[       plusminus,    questiondown	]};
-    key <AC11> {	[	   oslash,        Ooblique 	]};
-    key <BKSL> {	[      apostrophe,        asterisk	],
-                 	[dead_doubleacute,        multiply      ]};
-    key <AD11> {	[	    aring,           Aring 	]};
-    key <AE12> {   	[      dead_acute,      dead_grave      ],
-                 	[             bar,       brokenbar      ]};
-    key <AD12> {   	[  dead_diaeresis, dead_circumflex      ],
-                 	[      dead_tilde,      dead_caron      ]};
-
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    // For naming consistency
-    include "dk(basic)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    // For naming consistency
-    include "dk(Sundeadkeys)"
-};
-
-partial default alphanumeric_keys 
-xkb_symbols "full" {
-    include "iso9995-3(full)"
-    include "dk(basic)"
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "dk(basic)"
-    key <AE12> {	[	    acute,	     grave	],	
-			[	      bar,	    ogonek	]	};
-    key <AD12> {	[       diaeresis,     asciicircum     	],	
-			[      asciitilde,     dead_macron     	]      	};
-};
--- a/src/xorg/keytables/sun-src/symbols/dvorak	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,382 +0,0 @@
-// $XdotOrg: xc/programs/xkbcomp/symbols/dvorak,v 1.2 2004/04/23 19:54:52 eich Exp $
-// $Xorg: dvorak,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// symbols definition for a very simple dvorak layout.
-// It has basically the alphanumeric keys, punctuation, 
-// one shift key, one control key and caps lock. It 
-// uses the punctuation keys configurations common on PC 
-// keyboards (e.g. key <ABO9> is { [ period greater ] })
-
-// $XFree86: xc/programs/xkbcomp/symbols/dvorak,v 3.10 2003/08/08 06:27:09 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "srvr_ctrl(xfree86)"
-
-    name[Group1]= "Dvorak";
-    key <ESC>  {	[ Escape			]	};
-
-    // Alphanumeric section
-    key <TLDE> {	[       grave,	asciitilde	],
-			[  dead_grave,	dead_tilde	]	};
-
-    key <AE01> {	[	    1,	exclam 		]	};
-    key <AE02> {	[	    2,	at		]	};
-    key <AE03> {	[	    3,	numbersign	]	};
-    key <AE04> {	[	    4,	dollar		]	};
-    key <AE05> {	[	    5,	percent		]	};
-    key <AE06> {	[	    6,	asciicircum	],
-			[ dead_circumflex, dead_circumflex ]	};
-    key <AE07> {	[	    7,	ampersand	]	};
-    key <AE08> {	[	    8,	asterisk	]	};
-    key <AE09> {	[	    9,	parenleft	],
-			[  dead_grave			]	};
-    key <AE10> {	[	    0,	parenright	]	};
-    key <AE11> {	[ bracketleft,	braceleft	]	};
-    key <AE12> {	[ bracketright,	braceright	],
-			[  dead_tilde			]	};
-    key <BKSP> {
-	type="CTRL+ALT",
-	symbols[Group1]= [ BackSpace,	Terminate_Server ]
-    };
-
-    key  <TAB> {	[ 	  Tab,	ISO_Left_Tab	]	};
-    key <AD01> {	[  apostrophe,	quotedbl	],
-			[  dead_acute,	dead_diaeresis	] 	};
-    key <AD02> {	[	comma,	less		],
-			[ dead_cedilla,	dead_caron	]	};
-    key <AD03> {	[      period,	greater		],
-			[ dead_abovedot, periodcentered ]	};
-    key <AD04> {	[	    p,	P		]	};
-    key <AD05> {	[	    y,	Y		]	};
-    key <AD06> {	[	    f,	F		]	};
-    key <AD07> {	[	    g,	G		]	};
-    key <AD08> {	[	    c,	C		]	};
-    key <AD09> {	[	    r,	R		]	};
-    key <AD10> {	[	    l,	L		]	};
-    key <AD11> {	[	slash,	question	]	};
-    key <AD12> {	[	equal,	plus		]	};
-    key <RTRN> {	[ Return			]	};
-
-    key <CAPS> {	[	Caps_Lock		]	};
-    key <AC01> {	[	    a,	A 		]	};
-    key <AC02> {	[	    o,	O		]	};
-    key <AC03> {	[	    e,	E		]	};
-    key <AC04> {	[	    u,	U		]	};
-    key <AC05> {	[	    i,	I		]	};
-    key <AC06> {	[	    d,	D		]	};
-    key <AC07> {	[	    h,	H		]	};
-    key <AC08> {	[	    t,	T		]	};
-    key <AC09> {	[	    n,	N		]	};
-    key <AC10> {	[	    s,	S		]	};
-    key <AC11> {	[	minus,	underscore	]	};
-
-    key <LFSH> {	[	Shift_L			]	};
-    key <AB01> {	[   semicolon,	colon 		],
-			[ dead_ogonek, dead_doubleacute ]	};
-    key <AB02> {	[	    q,	Q		]	};
-    key <AB03> {	[	    j,	J		]	};
-    key <AB04> {	[	    k,	K		]	};
-    key <AB05> {	[	    x,	X		]	};
-    key <AB06> {	[	    b,	B		]	};
-    key <AB07> {	[	    m,	M		]	};
-    key <AB08> {	[	    w,	W		]	};
-    key <AB09> {	[	    v,	V		]	};
-    key <AB10> {	[	    z,	Z		]	};
-    key <BKSL> {	[   backslash,	bar		]	};
-
-    key <LCTL> {	[ 	 Control_L		]	};
-    key <SPCE> {	[ 	 space			]	};
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-};
-
-// Norwegian Dvorak
-partial alphanumeric_keys 
-xkb_symbols "no" {
-    include "dvorak(basic)"
-
-    key <TLDE> {	[	  bar,	section		],
-			[   brokenbar,	 paragraph	]	};
-
-    key <AE01> {	[	    1,	exclam 		],
-			[  exclamdown,	onesuperior	]	};
-    key <AE02> {	[	    2,	quotedbl	],
-			[	   at,	twosuperior	]	};
-    key <AE03> {	[	    3,	numbersign	],
-			[    sterling,	threesuperior	]	};
-    key <AE04> {	[	    4,	dollar		],
-			[    currency,	onequarter	]	};
-    key <AE05> {	[	    5,	percent		],
-			[     onehalf,	onehalf		]	};
-    key <AE06> {	[	    6,	ampersand	],
-			[ threequarters, threequarters	]	};
-    key <AE07> {	[	    7,	slash		],
-			[   braceleft,	division	]	};
-    key <AE08> {	[	    8,	parenleft	],
-			[ bracketleft			]	};
-    key <AE09> {	[	    9,	parenright	],
-			[ bracketright			]	};
-    key <AE10> {	[	    0,	equal		],
-			[  braceright			]	};
-    key <AE11> {	[	 plus,	question	],
-			[   plusminus,	questiondown	]	};
-    key <AE12> {	[   backslash,	grave		],
-			[  dead_acute,	dead_grave	]	};
-
-    key <AD01> {	[       aring,	Aring		],
-			[  braceright,	bracketright	]	};
-    key <AD02> {	[	comma,	semicolon	],
-			[ dead_cedilla,	cedilla		]	};
-    key <AD03> {	[      period,	colon		],
-			[ periodcentered		]	};
-    key <AD04> {	[	    p,	P		],
-			[       thorn,	THORN		]	};
-    key <AD05> {	[	    y,	Y		],
-			[         yen			]	};
-    key <AD06> {	[	    f,	F		],
-			[ ordfeminine			]	};
-    key <AD08> {	[	    c,	C		],
-			[    ccedilla,	copyright	]	};
-    key <AD09> {	[	    r,	R		],
-			[  registered			]	};
-    key <AD11> {	[  apostrophe,	asterisk	],
-			[ dead_circumflex,	acute	]	};
-    key <AD12> {	[  asciitilde,	asciicircum	],
-			[ dead_diaeresis, dead_tilde	]	};
-
-    key <AC03> {	[	    e,	E		],
-			[    EuroSign,	cent		]	};
-    key <AC05> {	[	    i,	I		],
-			[    idotless,	Iabovedot	]	};
-    key <AC06> {	[	    d,	D		],
-			[	  eth,	ETH		]	};
-    key <AC10> {	[	    s,	S		],
-			[      ssharp			]	};
-    key <AC11> {	[	minus,	underscore	],
-			[      hyphen,	diaeresis	]	};
-
-    key <AB01> {	[	   ae,	AE 		],
-			[   braceleft,	bracketleft	]	};
-    key <AB05> {	[	    x,	X		],
-			[    multiply			]	};
-    key <AB07> {	[	    m,	M		],
-			[	   mu			]	};
-    key <BKSL> {	[	 less,	greater		],
-			[ guillemotleft, guillemotright	]	};
-
-    key <SPCE> {	[	 space,	space		],
-			[ nobreakspace,	nobreakspace	]	};
-
-    key <LSGT> {	[	oslash,	Ooblique	],
-			[	   bar,	backslash	]	};
-
-};
-
-// Swedish Dvorak
-partial alphanumeric_keys 
-xkb_symbols "se" {
-    include "dvorak(no)"
-
-    key <TLDE> {	[     section,	onehalf		]	};
-
-    key <AE04> {	[	    4,	currency	],
-			[      dollar,  onequarter	]	};
-    key <AE11> {	[        plus,	question	],
-			[   backslash,  questiondown	]	};
-    key <AE12> {	[  dead_acute,  dead_grave	],
-			[  backslash,	grave		]	};
-
-    key <AD01> {	[  odiaeresis,  Odiaeresis	],
-			[  braceright,  bracketright	]	};
-    key <AD02> {	[       aring,	Aring    	]	};
-    key <AD03> {	[  adiaeresis,	Adiaeresis	]	};
-    key <AD11> {	[           q,	Q       	]	};
-    key <AD12> {	[ dead_diaeresis, dead_circumflex],
-			[ dead_tilde, asciicircum	]	};
-
-    key <AB01> {	[     comma,    semicolon	],
-			[ dead_cedilla, cedilla		]	};
-    key <AB02> {	[    period,    colon		],
-			[ periodcentered		]	};
-
-    key <BKSL> {	[      less,	greater		],
-			[       bar,    brokenbar	]	};
-
-    key <LSGT> {	[ apostrophe,   asterisk	],
-			[       bar,    backslash	]	};
-
-};
-// Swedish Dvorak alias
-partial alphanumeric_keys 
-xkb_symbols "sv" {
-    include "dvorak(se)"
-};
-
-
-// Dvorak (UK) keymap (by odaen) allowing the usage of
-// the £ and ? key and swapping the @ and " keys.
-
-partial alphanumeric_keys
-xkb_symbols "gb" {
-    include "dvorak(basic)"
-
-    key <BKSL> {	[  numbersign,  asciitilde	]	};
-    key <AE02> {	[	    2,  quotedbl	],
-			[ twosuperior,  NoSymbol	]	};
-    key <AE03> {	[	    3,  sterling	],
-			[ threesuperior, NoSymbol	]	};
-    key <AE04> {	[	    4,  dollar		],
-			[    EuroSign,  NoSymbol	]	};
-    key <LSGT> {	[   backslash,  bar		]	};
-    key <AD01> {	[  apostrophe,  at		]	};
-};
-
-// Keymap Dvorak pour le Français
-// par Josselin Mouette <[email protected]>.
-
-partial alphanumeric_keys modifier_keys 
-xkb_symbols "fr" {
-
-    include "dvorak(basic)"
-
-    name[Group1]= "French dvorak";
-
-    key <TLDE>  {       [              oe,              OE      ],
-                        [              ae,              AE      ]       };
-    key <AE01>  {       [           slash,               1      ],
-                        [       ampersand,     onesuperior      ]       };
-    key <AE02>  {       [            plus,               2      ],
-                        [      asciitilde,     twosuperior      ]       };
-    key <AE03>  {       [           minus,               3      ], 
-                        [      numbersign,   threesuperior      ]       };
-    key <AE04>  {       [        asterisk,               4      ],
-                        [            less,   guillemotleft      ]       };
-    key <AE05>  {       [           equal,               5      ],
-                        [         greater,  guillemotright      ]       };
-    key <AE06>  {       [       backslash,               6      ],
-                        [              at,         notsign      ]       };
-    key <AE07>  {       [       parenleft,               7      ],
-                        [ dead_circumflex,        multiply      ]       };
-    key <AE08>  {       [           grave,               8      ],
-                        [      dead_grave,        division      ]       };
-    key <AE09>  {       [      parenright,               9      ],
-                        [     asciicircum,       plusminus      ]       };
-    key <AE10>  {       [        quotedbl,               0      ],
-                        [  dead_diaeresis,  dead_diaeresis      ]       };
-    key <AE11>  {       [     bracketleft,       braceleft      ],
-                        [             bar,          degree      ]       };
-    key <AE12>  {       [    bracketright,      braceright      ],
-                        [         percent                       ]       };
-
-    key <AD01>  {       [           colon,        question      ],
-                        [        question,    questiondown      ]       };
-    key <AD02>  {       [          agrave,          Agrave      ],
-                        [           aring,           Aring      ]       };
-    key <AD03>  {       [          eacute,          Eacute      ],
-                        [        EuroSign,            cent      ]       };
-    key <AD04>  {       [               g,               G      ],
-                        [          oslash,        Ooblique      ]       };
-    key <AD05>  {       [          period,          exclam      ],
-                        [  periodcentered,      exclamdown      ]       };
-    key <AD06>  {       [               h,               H      ],
-                        [             eth,             ETH      ]       };
-    key <AD07>  {       [               v,               V      ]       };
-    key <AD08>  {       [               c,               C      ],
-                        [       copyright,      registered      ]       };
-    key <AD09>  {       [               m,               M      ],
-                        [              mu,              mu      ]       };
-    key <AD10>  {       [               k,               K      ],
-                        [          dollar,          dollar      ]       };
-    key <AD11>  {       [          egrave,          Egrave      ],
-                        [        sterling,        sterling      ]       };
-    key <AD12>  {       [               z,               Z      ],
-                        [             yen                       ]       };
-
-    key <AC01>  {       [               o,               O      ],
-                        [     ocircumflex,     Ocircumflex      ]       };
-    key <AC02>  {       [               a,               A      ],
-                        [     acircumflex,     Acircumflex      ]       };
-    key <AC03>  {       [               u,               U      ],
-                        [     ucircumflex,     Ucircumflex      ]       };
-    key <AC04>  {       [               e,               E      ],
-                        [     ecircumflex,     Ecircumflex      ]       };
-    key <AC05>  {       [               b,               B      ],
-                        [          ssharp                       ]       };
-    key <AC06>  {       [               f,               F      ]       };
-    key <AC07>  {       [               s,               S      ]       };
-    key <AC08>  {       [               t,               T      ],
-                        [           thorn,           THORN      ]       };
-    key <AC09>  {       [               n,               N      ],
-                        [          ntilde,          Ntilde      ]       };
-    key <AC10>  {       [               d,               D      ],
-                        [         section                       ]       };
-    key <AC11>  {       [               w,               W      ],
-                        [       paragraph                       ]       };
-    key <BKSL>  {       [          ugrave,          Ugrave      ],
-                        [       masculine,     ordfeminine      ]       };
-
-    key <LSGT>  {       [        ccedilla,        Ccedilla      ],
-                        [        ccedilla,        Ccedilla      ]       };
-    key <AB01>  {       [      apostrophe,      underscore      ],
-                        [      dead_acute,          macron      ]       };
-    key <AB02>  {       [               q,               Q      ],
-                        [   guillemotleft,   guillemotleft      ]       };
-    key <AB03>  {       [           comma,       semicolon      ],
-                        [  guillemotright,  guillemotright      ]       };
-    key <AB04>  {       [               i,               I      ],
-                        [     icircumflex,     Icircumflex      ]       };
-    key <AB05>  {       [               y,               Y      ],
-                        [      ydiaeresis,      Ydiaeresis      ]       };
-    key <AB06>  {       [               x,               X      ],
-                        [      ediaeresis,      Ediaeresis      ]       };
-    key <AB07>  {       [               r,               R      ],
-                        [      udiaeresis,      Udiaeresis      ]       };
-    key <AB08>  {       [               l,               L      ],
-                        [      adiaeresis,      Adiaeresis      ]       };
-    key <AB09>  {       [               p,               P      ],
-                        [      odiaeresis,      Odiaeresis      ]       };
-    key <AB10>  {       [               j,               J      ],
-                        [      idiaeresis,      Idiaeresis      ]       };
-
-    key <SPCE>  {       [           space,           space      ],
-                        [    nobreakspace,    nobreakspace      ]       };
-    key <RALT>  {       [     Mode_switch,       Multi_key      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "dvorak(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "dvorak(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/ee	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/ee,v 1.2 2000/10/27 18:31:08 dawes Exp $
-// Estonian XKB-keymap by Ville Hallik <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Estonian keyboard
-    // This layout conforms to both EVS8:1993 and EVS8:2000 standards
-
-    name[Group1]= "Estonian";
-
-    key <TLDE> {        [      dead_caron,      dead_tilde      ]       };
-    key <AE02> {        [               2,        quotedbl      ],
-                        [              at                       ]       };
-    key <AE03> {        [               3,      numbersign      ],
-                        [        sterling                       ]       };
-    key <AE04> {        [               4,        currency      ],
-                        [          dollar                       ]       };
-    key <AE06> {        [               6,       ampersand      ]       };
-    key <AE07> {        [               7,           slash      ],
-                        [       braceleft                       ]       };
-    key <AE08> {        [               8,       parenleft      ],
-                        [     bracketleft                       ]       };
-    key <AE09> {        [               9,      parenright      ],
-                        [    bracketright                       ]       };
-    key <AE10> {        [               0,           equal      ],
-                        [      braceright                       ]       };
-    key <AE11> {        [            plus,        question      ],
-                        [       backslash                       ]       };
-    key <AE12> {        [      dead_acute,      dead_grave      ],
-                        [       quoteleft,      quoteright      ]       };
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign                       ]       };
-    key <AD11> {        [      udiaeresis,      Udiaeresis      ]       };
-    key <AD12> {        [          otilde,          Otilde      ],
-                        [         section                       ]       };
-    key <AC02> {        [               s,               S      ],
-                        [          scaron,          Scaron      ]       };
-    key <AC10> {        [      odiaeresis,      Odiaeresis      ]       };
-    key <AC11> {        [      adiaeresis,      Adiaeresis      ],
-                        [ dead_circumflex                       ]       };
-    key <AB01> {        [               z,               Z      ],
-                        [          zcaron,          Zcaron      ]       };
-    key <AB08> {        [           comma,       semicolon      ],
-                        [            less                       ]       };
-    key <AB09> {        [          period,           colon      ],
-                        [         greater                       ]       };
-    key <AB10> {        [           minus,      underscore      ]       };
-    key <BKSL> {        [      apostrophe,        asterisk      ],
-                        [         onehalf                       ]       };
-    key <LSGT> {        [            less,         greater      ],
-                        [             bar                       ]       };
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "ee(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "ee(Sundeadkeys)"   // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic Estonian layout to eliminate all dead keys
-
-    include "ee(basic)"
-    key <TLDE> {        [     asciicircum,      asciitilde      ]       };
-    key <AE12> {        [      apostrophe,           grave      ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/el	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-// $XFree86$
-//
-// Hellenic keyboard map for XFree86
-// Original version:
-//	Kostas Gewrgiou <[email protected]>
-// Heavily modified by:
-//	Vasilis Vasaitis <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys alternate_group
-xkb_symbols "basic" {
-
-    include "el(bare)"
-
-    key <TLDE> { [],	[     grave,	asciitilde	]	};
-    key <AE01> { [],	[	  1,	exclam 		]	};
-    key <AE02> { [],	[	  2,	at		]	};
-    key <AE03> { [],	[	  3,	numbersign	]	};
-    key <AE04> { [],	[	  4,	dollar		]	};
-    key <AE05> { [],	[	  5,	percent		]	};
-    key <AE06> { [],	[	  6,	asciicircum	]	};
-    key <AE07> { [],	[	  7,	ampersand	]	};
-    key <AE08> { [],	[	  8,	asterisk	]	};
-    key <AE09> { [],	[	  9,	parenleft	]	};
-    key <AE10> { [],	[	  0,	parenright	]	};
-    key <AE11> { [],	[     minus,	underscore	]	};
-    key <AE12> { [],	[     equal,	plus		]	};
-
-
-    
-    key <AD11> { [],	[ bracketleft,	braceleft	]	};
-    key <AD12> { [],	[ bracketright,	braceright	]	};
-
-    key <AC11> { [],	[ apostrophe,	quotedbl	]	};
-
-    key <AB08> { [],	[     comma,	less		]	};
-    key <AB09> { [],	[    period,	greater		]	};
-    key <AB10> { [],	[     slash,	question	]	};
-    key <BKSL> { [],	[ backslash,	bar		]	};
-
-};
-
-hidden partial alphanumeric_keys alternate_group
-xkb_symbols "bare" {
-
-    name[Group2] = "ISO8859-7";
-
-    key <AD01> { [], [	semicolon,		colon		] };
-    key <AD02> { [], [	Greek_finalsmallsigma,	Greek_SIGMA	] };
-    key <AD03> { [], [	Greek_epsilon,		Greek_EPSILON	] };
-    key <AD04> { [], [	Greek_rho,		Greek_RHO	] };
-    key <AD05> { [], [	Greek_tau,		Greek_TAU	] };
-    key <AD06> { [], [	Greek_upsilon,		Greek_UPSILON	] };
-    key <AD07> { [], [	Greek_theta,		Greek_THETA	] };
-    key <AD08> { [], [	Greek_iota,		Greek_IOTA	] };
-    key <AD09> { [], [	Greek_omicron,		Greek_OMICRON	] };
-    key <AD10> { [], [	Greek_pi,		Greek_PI	] };
-
-    key <AC01> { [], [	Greek_alpha,		Greek_ALPHA	] };
-    key <AC02> { [], [	Greek_sigma,		Greek_SIGMA	] };
-    key <AC03> { [], [	Greek_delta,		Greek_DELTA	] };
-    key <AC04> { [], [	Greek_phi,		Greek_PHI	] };
-    key <AC05> { [], [	Greek_gamma,		Greek_GAMMA	] };
-    key <AC06> { [], [	Greek_eta,		Greek_ETA	] };
-    key <AC07> { [], [	Greek_xi,		Greek_XI	] };
-    key <AC08> { [], [	Greek_kappa,		Greek_KAPPA	] };
-    key <AC09> { [], [	Greek_lamda,		Greek_LAMDA	] };
-    key <AC10> { [], [	dead_acute,		dead_diaeresis	] };
-
-    key <AB01> { [], [	Greek_zeta,		Greek_ZETA	] };
-    key <AB02> { [], [	Greek_chi,		Greek_CHI	] };
-    key <AB03> { [], [	Greek_psi,		Greek_PSI	] };
-    key <AB04> { [], [	Greek_omega,		Greek_OMEGA	] };
-    key <AB05> { [], [	Greek_beta,		Greek_BETA	] };
-    key <AB06> { [], [	Greek_nu,		Greek_NU	] };
-    key <AB07> { [], [	Greek_mu,		Greek_MU	] };
-
-    key <LSGT> { [], [	guillemotleft,		guillemotright	] };
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "extended" {
-
-    include "el(basic)"
-
-    key.type = "THREE_LEVEL";
-
-    key <AE05> { [	5,		percent,	EuroSign	],
-		 [	5,		percent,	EuroSign	] };
-
-    key <AD01> { [], [	semicolon,	colon,		periodcentered	] };
-
-    key <AD03> { [	e,		E,		EuroSign	],
-		 [	Greek_epsilon,	Greek_EPSILON,	EuroSign	] };
-
-    key <AC10> { [	semicolon,	colon,		periodcentered	] };
-
-    key <AB08> { [	comma,		less,		guillemotleft	],
-		 [	comma,		less,		guillemotleft	] };
-
-    key <AB09> { [	period,		greater,	guillemotright	],
-		 [	period,		greater,	guillemotright	] };
-
-    key <RALT> {	[	ISO_Level3_Shift	]	};
-
-    modifier_map Mod5 { ISO_Level3_Shift };
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "polytonic" {
-
-    include "el(extended)"
-
-    key.type = "THREE_LEVEL";
-
-    key <AD11> { [], [ 	dead_tilde,	dead_diaeresis,	dead_macron	] };
-    key <AD12> { [], [	dead_iota,	VoidSymbol,	dead_breve	] };
-
-    key <AC10> { [], [	dead_acute,		dead_horn	] };
-    key <AC11> { [], [	dead_grave,		dead_ogonek	] };
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "Sundeadkeys" {
-
-    include "el(basic)"
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "sundeadkeys" {
-
-    include "el(Sundeadkeys)"
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "nodeadkeys" {
-
-    include "el(basic)"
-
-    key <AC10> { [], [	semicolon,		colon		] };
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/es	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-// $Xorg: es,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// Modified for a real Spanish Keyboard by Jon Tombs
-// $XFree86: xc/programs/xkbcomp/symbols/es,v 3.4 2000/10/27 18:31:08 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Spanish keybaord
-
-    name[Group1]= "Spanish";
-
-    key <TLDE> {        [       masculine,     ordfeminine      ],
-                        [       backslash,       backslash      ]       };
-    key <LSGT> {        [            less,         greater      ],
-                        [             bar,       brokenbar      ]       };
-    key <AE01> {        [               1,      exclam          ],
-                        [             bar,      exclamdown      ]       };
-    key <AE02> {        [               2,        quotedbl      ],
-                        [              at,       oneeighth      ]       };
-    key <AE03> {        [               3,  periodcentered      ],
-                        [      numbersign,        sterling      ]       };
-    key <AE04> {        [               4,          dollar      ],
-                        [      dead_tilde,          dollar      ]       };
-    key <AE06> {        [               6,       ampersand      ],
-                        [         notsign,     fiveeighths      ]       };
-    key <AE07> {        [               7,           slash      ]       };
-    key <AE08> {        [               8,       parenleft      ]       };
-    key <AB08> {        [           comma,       semicolon      ]       };
-    key <AE10> {        [               0,           equal      ]       };
-    key <AE09> {        [               9,      parenright      ]       };
-    key <AB09> {        [          period,           colon      ]       };
-    key <AB10> {        [           minus,      underscore      ]       };
-    key <AC10> {        [          ntilde,          Ntilde      ],
-                        [      asciitilde,dead_doubleacute      ]       };
-    key <AE11> {        [      apostrophe,        question      ]       };
-    key <AC11> {        [      dead_acute,  dead_diaeresis      ],
-                        [       braceleft,       braceleft      ]       };
-    key <BKSL> {        [        ccedilla,        Ccedilla      ],
-                        [      braceright,      dead_breve      ]       };
-    key <AD11> {        [      dead_grave, dead_circumflex      ],
-                        [     bracketleft,  dead_abovering      ]       };
-    key <AE12> {        [      exclamdown,    questiondown      ],
-                        [      asciitilde,      asciitilde      ]       };
-    key <AD12> {        [            plus,        asterisk      ],
-                        [    bracketright,     dead_macron      ]       };
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign,            cent      ]       };
-
-    // End alphanumeric section
-
-    // Begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "es(basic)"
-
-    key <AC11> {        [     SunFA_Acute, SunFA_Diaeresis      ],
-                        [       braceleft,       braceleft      ]       };
-    key <AD11> {        [     SunFA_Grave,    SunFA_Circum      ],
-                        [     bracketleft,  dead_abovering      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "es(Sundeadkeys)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    include "es(basic)"
-
-    key <AC10> {        [          ntilde,          Ntilde      ],
-                        [      asciitilde,     doubleacute      ]       };
-    key <AC11> {        [           acute,       diaeresis      ],
-                        [       braceleft,       braceleft      ]       };
-    key <BKSL> {        [        ccedilla,        Ccedilla      ],
-                        [      braceright,           breve      ]       };
-    key <AD11> {        [           grave,     asciicircum      ],
-                        [     bracketleft,          degree      ]       };
-    key <AD12> {        [            plus,        asterisk      ],
-                        [    bracketright,          macron      ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/fi	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-// $Xorg: fi,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/fi,v 3.9 2002/12/19 01:07:54 dawes Exp $   
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
- xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a Finnish keyboard with dead key support
-    // and all of ISO-8859-1 and ISO-8859-15 characters available.
-
-    name[Group1]= "Finnish";
-
-    key <TLDE> {        [         section,         onehalf      ],
-                        [      onequarter,   threequarters      ]};
-    key <LSGT> {        [            less,         greater      ],
-                        [             bar,       brokenbar      ]};
-    // AltGr+<SPCE> is pressed accidentally too often after AltGr+<LSGT>,
-    // hence AltGr+<SPCE> produces now space, not nobreakspace.
-    key <SPCE> {        [           space,           space      ],
-                        [           space,    nobreakspace      ]};
-    key <AE01> {        [               1,          exclam      ],
-                        [      exclamdown,     onesuperior      ]};
-    key <AE02> {        [               2,        quotedbl      ],
-                        [              at,     twosuperior      ]};
-    key <AE03> {        [               3,      numbersign      ],
-                        [        sterling,   threesuperior      ]};
-    key <AE04> {        [               4,        currency      ],
-                        [          dollar,            cent      ]};
-    key <AE05> {        [               5,         percent      ],
-                        [        EuroSign,       masculine      ]};
-    key <AE06> {        [               6,       ampersand      ],
-                        [             yen,     ordfeminine      ]};
-    key <AE07> {        [               7,           slash      ],
-                        [       braceleft,       plusminus      ]};
-    key <AE08> {        [               8,       parenleft      ],
-                        [     bracketleft,   guillemotleft      ]};
-    key <AE09> {        [               9,      parenright      ],
-                        [    bracketright,  guillemotright      ]};
-    key <AE10> {        [               0,           equal      ],
-                        [      braceright,          degree      ]};
-    key <AB08> {        [           comma,       semicolon      ],
-                        [    dead_cedilla,     dead_ogonek      ]};
-    key <AB09> {        [          period,           colon      ],
-                        [  periodcentered,         notsign      ]};
-    key <AB01> {        [               z,               Z      ],
-                        [          zcaron,          Zcaron      ]};
-    key <AB02> {        [               x,               X      ],
-                        [        multiply,        division      ]};
-    key <AB03> {        [               c,               C      ],
-                        [       copyright,            cent      ]};
-    key <AB05> {        [               b,               B      ],
-                        [          ssharp,        NoSymbol      ]};
-    key <AB06> {        [               n,               N      ],
-                        [          ntilde,          Ntilde      ]};
-    key <AB07> {        [               m,               M      ],
-                        [              mu,        NoSymbol      ]};
-    key <AB10> {        [           minus,      underscore      ],
-                        [          hyphen,          macron      ]};
-    key <AC02> {        [               s,               S      ],
-                        [          scaron,          Scaron      ]};
-    key <AC03> {        [               d,               D      ],
-                        [             eth,             ETH      ]};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign,            cent      ]};
-    key <AD04> {        [               r,               R      ],
-                        [      registered,        NoSymbol      ]};
-    key <AD05> {        [               t,               T      ],
-                        [           thorn,           THORN      ]};
-    key <AD10> {        [               p,               P      ],
-                        [       paragraph,        NoSymbol      ]};
-    key <AC10> {        [      odiaeresis,      Odiaeresis      ],
-                        [          oslash,        Ooblique      ]};
-    key <AE11> {        [            plus,        question      ],
-                        [       backslash,    questiondown      ]};
-    key <AC11> {        [      adiaeresis,      Adiaeresis      ],
-                        [              ae,              AE      ]};
-    key <BKSL> {        [      apostrophe,        asterisk      ],
-                        [        NoSymbol,        NoSymbol      ]};
-    key <AD11> {        [           aring,           Aring      ],
-                        [              oe,              OE      ]};
-    key <AE12> {        [      dead_acute,      dead_grave      ],
-                        [        NoSymbol,        NoSymbol      ]};
-    key <AD12> {        [  dead_diaeresis, dead_circumflex      ],
-                        [      dead_tilde,      dead_caron      ]};
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {        [  KP_Delete,   KP_Separator    ]       };
-    // End "Keypad" section
-
-    // Begin modifier mappings
-
-    modifier_map Shift          { Shift_L };
-    modifier_map Lock           { Caps_Lock };
-    modifier_map Control        { Control_L };
-    modifier_map Mod3           { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "fi(basic)"         // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "fi(Sundeadkeys)"   // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    // Modifies the basic Finnish layout to eliminate all dead keys
-
-    include "fi(basic)"         // for consistent naming
-
-    key <AB08> {        [           comma,       semicolon      ],
-                        [         cedilla,          ogonek      ]};
-    key <AE12> {        [           acute,           grave      ],
-                        [        NoSymbol,        NoSymbol      ]};
-    key <AD12> {        [       diaeresis,     asciicircum      ],
-                        [      asciitilde,           caron      ]};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/fr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-// $Xorg: fr,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-
-// $XFree86: xc/programs/xkbcomp/symbols/fr,v 3.5 2000/10/27 18:31:09 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple French keybaord
-
-    name[Group1]= "French";
-    key <TLDE> {        [     twosuperior                       ]       };
-    key <AE01> {        [       ampersand,               1      ],
-                        [     onesuperior,      exclamdown      ]       };
-    key <AE02> {        [          eacute,               2      ],
-                        [      dead_tilde,       oneeighth      ]       };
-    key <AE03> {        [        quotedbl,               3      ],
-                        [      numbersign,        sterling      ]       };
-    key <AE04> {        [      apostrophe,               4      ],
-                        [       braceleft,          dollar      ]       };
-    key <AE05> {        [       parenleft,               5      ],
-                        [     bracketleft,    threeeighths      ]       };
-    key <AE06> {        [           minus,               6      ],
-                        [             bar,     fiveeighths      ]       };
-    key <AE07> {        [          egrave,               7      ],
-                        [      dead_grave,    seveneighths      ]       };
-    key <AE08> {        [      underscore,               8      ],
-                        [       backslash,       trademark      ]       };
-    key <AE09> {        [        ccedilla,               9      ],
-                        [     asciicircum,       plusminus      ]       };
-    key <AE10> {        [          agrave,               0      ],
-                        [              at,          degree      ]       };
-    key <AE11> {        [      parenright,          degree      ],
-                        [    bracketright,    questiondown      ]       };
-    key <AE12> {        [           equal,            plus      ],
-                        [      braceright,     dead_ogonek      ]       };
-    key <AD01> {        [               a,               A      ],
-                        [              ae,              AE      ]       };
-    key <AD02> {        [               z,               Z      ],
-                        [   guillemotleft,            less      ]       };
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign,            cent      ]       };
-    key <AD11> {        [ dead_circumflex,  dead_diaeresis      ]       };
-    key <AD12> {        [          dollar,        sterling      ],
-                        [        currency,     dead_macron      ]       };
-    key <AC01> {        [               q,               Q      ],
-                        [              at,     Greek_OMEGA      ]       };
-    key <AC10> {        [               m,               M      ],
-                        [              mu,       masculine      ]       };
-    key <AC11> {        [          ugrave,         percent      ]       };
-    key <LSGT> {        [            less,         greater      ]       };
-    key <AB01> {        [               w,               W      ],
-                        [         lstroke,         Lstroke      ]       };
-    key <AB07> {        [           comma,        question      ],
-                        [      dead_acute, dead_doubleacute     ]       };
-    key <AB08> {        [       semicolon,          period      ]       };
-    key <AB09> {        [           colon,           slash      ]       };
-    key <AB10> {        [          exclam,         section      ]       };
-    key <BKSL> {        [        asterisk,              mu      ]       };
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // Modifies the basic French layout to use the Sun dead keys
-
-    include "fr(basic)"
-    key <AD11> {        [    SunFA_Circum, SunFA_Diaeresis      ]       };
-    key <AB07> {        [           comma,        question      ],
-                        [     SunFA_Acute,dead_doubleacute      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "fr(Sundeadkeys)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic French layout to eliminate all dead keys
-
-    include "fr(basic)"
-    key <AE12> {        [           equal,            plus      ],
-                        [      braceright,          ogonek      ]       };
-    key <AD11> {        [     asciicircum,       diaeresis      ]       };
-    key <AD12> {        [          dollar,        sterling      ],
-                        [        currency,          macron      ]       };
-    key <AB07> {        [           comma,        question      ],
-                        [           acute,     doubleacute      ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/fr_CH	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// $Xorg: fr_CH,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/fr_CH,v 3.4 2000/01/21 01:12:27 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss/French keybaord
-
-    include "de_CH(basic)"
-    name[Group1]= "Swiss French";
-
-    override key <AD11> {
-	[ egrave,	udiaeresis	],
-	[ bracketleft			]
-    };
-    override key <AC10> {
-	[ eacute,	odiaeresis	]
-    };
-    override key <AC11> {
-	[ agrave,	adiaeresis	],
-	[  braceleft			]
-    };
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {        [  KP_Delete,   KP_Decimal      ]       };
-    // End "Keypad" section
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    // modify the default Swiss French layout to use Sun dead keys
-    include "fr_CH(basic)"
-    key <TLDE> {        [   section,    degree          ]       };
-    key <AE01> {        [         1,    plus            ],
-                        [       bar                     ]       };
-    key <AE02> {        [         2,    quotedbl        ],
-                        [        at                     ]       };
-    key <AE03> {        [         3,    asterisk        ],
-                        [ numbersign                    ]       };
-    key <AE04> {        [         4,    ccedilla        ],
-                        [  asciicircum                  ]       };
-    key <AE05> {        [         5,    percent         ],
-                        [  asciitilde                   ]       };
-    key <AE06> {        [         6,    ampersand       ],
-                        [   notsign                     ]       };
-    key <AE07> {        [         7,    slash           ],
-                        [ brokenbar                     ]       };
-    key <AE08> {        [         8,    parenleft       ],
-                        [      cent                     ]       };
-    key <AE09> {        [         9,    parenright      ]       };
-    key <AE10> {        [         0,    equal           ],
-                        [     acute                     ]       };
-    key <AE11> {        [ apostrophe,   question        ],
-                        [ dead_acute                    ]       };
-    key <AE12> {        [ dead_circumflex, dead_grave   ],
-                        [ dead_tilde                    ]       };
-    key <AD12> {	[ dead_diaeresis, exclam	],
-			[ bracketright			]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "fr_CH(Sundeadkeys)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    // modify the default Swiss French layout not to have any dead keys
-    include "fr_CH(basic)"
-    key <AE11> {	[ apostrophe,	question	],
-			[ acute				]	};
-    key <AE12> {	[ asciicircum,	grave		],
-			[ asciitilde			]	};
-    key <AD12> {	[ diaeresis,	exclam		],
-			[ bracketright			]	};
-    key <AE06> {        [         6,    ampersand       ],
-                        [   notsign,    ampersand 	]       };
-    key <AE07> {        [         7,    slash           ],
-                       [ brokenbar,    slash           ]       };
-    key <AE08> {        [         8,    parenleft       ],
-                        [      cent,    parenleft   ]       };
-};
--- a/src/xorg/keytables/sun-src/symbols/ge_la	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-// ge_la (Georgian "latin layout")
-
-//  From the comments of the xmodmap file:
-//
-//  Georgian keyboard map, in the so called "latin" layout.
-//  1999, Pablo Saratxaga <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-//  Georgian mode is toggled by Right_Ctrl key and shifted by AltGr key.
-//  uppercase in georgian mode gives the lower case ascii, this can be useful
-//  to type whithout switching mode.
-//
-//  the layout has been copied from
-//  http://members.tripod.com/~beso/html/L-K-COD.HTM
-//  with some few changes it is:
-//
-//  `~   1!1! 2@2@ 3 3  4$4$ 5% 6^6^ 7&7& 8*8* 9(9( 0)0) -_-_ =+=+ \|\| BackSp
-//  Tab     qQქq wWწჭ eEეe rRრr tTტღ yYყთ uUუu iIიi oOოo Ppპp [{[{ ]}]}
-//  CapsLock aAაa sSსშ dDდd fFფf gGგg hHჰh jJჯჟ kKკk lLლl ;:;: '"'"  Return
-//  Shift «»   zZზძ xXხx cCცჩ vVვv bBბb nNნn mMმm ,<,< .>.> /?/?  Shift
-//  Ctrl   Alt        Space Space Space NonBreakingSpace     ModeShift  ModeLock
-//
-//  the chars ჱჲჳჴჵჶ     are not mapped...
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-	include "us(basic)"
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Georgian "latin layout" keyboard
-
-    name[Group2]= "Georgian";
-
-    key <AD01> {[],	[ 0x010010e5,	q	]	};
-    key <AD02> {[],	[ 0x010010ec,	0x010010ed	]	};
-    key <AD03> {[],	[ 0x010010d4,	e	]       };
-    key <AD04> {[],	[ 0x010010e0,	0x010010e6	]	};
-    key <AD05> {[],	[ 0x010010e2,	0x010010d7	]       };
-    key <AD06> {[],	[ 0x010010e7,	y	]       };
-    key <AD07> {[],	[ 0x010010e3,	u	]       };
-    key <AD08> {[],	[ 0x010010d8,	i	]       };
-    key <AD09> {[],	[ 0x010010dd,	o	]       };
-    key <AD10> {[],	[ 0x010010de,	p	]	};
-    key <AD11> {[],	[ bracketleft,	braceleft	]	};
-    key <AD12> {[],	[ bracketright,	braceright	]	};
-
-    key <AC01> {[],	[ 0x010010d0,	a		]	};
-    key <AC02> {[],	[ 0x010010e1,	0x010010e8	]       };
-    key <AC03> {[],	[ 0x010010d3,	d		]       };
-    key <AC04> {[],	[ 0x010010e4,	f		]	};
-    key <AC05> {[],	[ 0x010010d2,	g		]       };
-    key <AC06> {[],	[ 0x010010f0,	h		]       };
-    key <AC07> {[],	[ 0x010010ef,	0x010010df	]	};
-    key <AC08> {[],	[ 0x010010d9,	k		]	};
-    key <AC09> {[],	[ 0x010010da,	l	]       };
-    key <AC10> {[],	[ semicolon, colon	]       };
-    key <AC11> {[],	[ apostrophe, quotedbl	]	};
-    key <BKSL> {[],	[ backslash,    bar     ]   };
-
-    key <LSGT> {[],	[ guillemotleft,guillemotright	]       };
-    key <AB01> {[],	[ 0x010010d6,	0x010010eb	]       };
-    key <AB02> {[],	[ 0x010010ee,	x		]       };
-    key <AB03> {[],	[ 0x010010ea,	0x010010e9	]       };
-    key <AB04> {[],	[ 0x010010d5,	v		]       };
-    key <AB05> {[],	[ 0x010010d1,	b		]       };
-    key <AB06> {[],	[ 0x010010dc,	n		]	};
-    key <AB07> {[],	[ 0x010010db,	m		]	};
-    key <AB08> {[],	[ comma,		less		]	};
-    key <AB09> {[],	[ period,		greater	]	};
-    key <AB10> {[],	[ slash,		question	]	};
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "ge_la(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "ge_la(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/ge_ru	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-// ge_ru (Georgian "russian layout")
-
-//  From the comments of the xmodmap file:
-//
-//  Georgian keyboard map, in the so called "russian" layout.
-//  1999, Pablo Saratxaga <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-//
-//  Georgian mode is toggled by Right_Ctrl key and shifted by AltGr key.
-//  uppercase in georgian mode gives the lower case ascii, this can be useful
-//  to type whithout switching mode.
-//
-//  the layout has been copied from
-//  http://members.tripod.com/~beso/html/RU-K-COD.HTM
-//  with some few changes it is:
-//
-//  `~^~ 1!1! 2@2  3 3  4$4; 5%5: 6^6, 7&7. 8*8* 9(9( 0)0) -_-_ =+ | \|   BackSp
-//  Tab     qQღq wWცw eEუe rRკr tTეt yYნy uUგu iIშi oOწp [{ხ[ ]}ჯ]
-//  CapsLock aAფa sSთs dDვd fFაf gGპg hHრh jJოj kKლk lLდ; ;:ჟ: '"ძ%  Return
-//  Shift «»   zZჭz xXჩx cCსc vVმv bBიb nNტn mMქm ,<ბ< .>ყ> /?ჰ?  Shift
-//  Ctrl   Alt        Space Space Space NonBreakingSpace     ModeShift  ModeLock
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-	include "us(basic)"
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Georgian "russian layout" keyboard
-
-    name[Group2]= "Georgian";
-
-    key <TLDE> {[],	[ asciicircum,	asciitilde	]	};
-    key <AE01> {[],	[         1,    exclam          ]       };
-    key <AE02> {[],	[         2,    at              ]       }; // 2 0xeb 
-    key <AE03> {[],	[         3,    numbersign      ]       }; // 3 0xec
-    key <AE04> {[],	[         4,    semicolon       ]       };
-    key <AE05> {[],	[         5,    colon           ]       };
-    key <AE06> {[],	[         6,    comma           ]       };
-    key <AE07> {[],	[         7,    period          ]       };
-    key <AE08> {[],	[         8,    asterisk        ]       };
-    key <AE09> {[],	[         9,    parenleft       ]       };
-    key <AE10> {[],	[         0,    parenright      ]       };
-    key <AE11> {[],	[     minus,    underscore      ]       };
-    key <AE12> {[],	[ numbersign,   bar             ]       };
-
-    key <AD01> {[],	[ 0x010010e6,	q	]	};
-    key <AD02> {[],	[ 0x010010ea,	w	]	};
-    key <AD03> {[],	[ 0x010010e3,	e	]       };
-    key <AD04> {[],	[ 0x010010d9,	r	]	};
-    key <AD05> {[],	[ 0x010010d4,	t	]       };
-    key <AD06> {[],	[ 0x010010dc,	y	]       };
-    key <AD07> {[],	[ 0x010010d2,	u	]       };
-    key <AD08> {[],	[ 0x010010e8,	i	]       };
-    key <AD09> {[],	[ 0x010010ec,	o	]       };
-    key <AD10> {[],	[ 0x010010d6,	p	]	};
-    key <AD11> {[],	[ 0x010010ee,	bracketleft	]	};
-    key <AD12> {[],	[ 0x010010ef,	bracketright	]	};
-
-    key <AC01> {[],	[ 0x010010e4,	a		]	};
-    key <AC02> {[],	[ 0x010010d7,	s		]       };
-    key <AC03> {[],	[ 0x010010d5,	d		]       };
-    key <AC04> {[],	[ 0x010010d0,	f		]	};
-    key <AC05> {[],	[ 0x010010de,	g		]       };
-    key <AC06> {[],	[ 0x010010e0,	h		]       };
-    key <AC07> {[],	[ 0x010010dd,	j		]	};
-    key <AC08> {[],	[ 0x010010da,	k		]	};
-    key <AC09> {[],	[ 0x010010d3,	l	]       };
-    key <AC10> {[],	[ 0x010010df,	semicolon	]       };
-    key <AC11> {[],	[ 0x010010eb,	percent	]	};
-    key <BKSL> {[],	[ backslash,    bar     ]   }; // 0xe9 0xea
-
-    key <LSGT> {[],	[ guillemotleft,guillemotright	]       }; // 0xab 0xbb 0xe7 0xe8
-    key <AB01> {[],	[ 0x010010ed,	z		]       };
-    key <AB02> {[],	[ 0x010010e9,	x		]       };
-    key <AB03> {[],	[ 0x010010e1,	c		]       };
-    key <AB04> {[],	[ 0x010010db,	v		]       };
-    key <AB05> {[],	[ 0x010010d8,	b		]       };
-    key <AB06> {[],	[ 0x010010e2,	n		]	};
-    key <AB07> {[],	[ 0x010010e5,	m		]	};
-    key <AB08> {[],	[ 0x010010d1,	less		]	};
-    key <AB09> {[],	[ 0x010010e7,	greater	]	};
-    key <AB10> {[],	[ 0x010010f0,	question	]	};
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "ge_ru(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "ge_ru(Sundeadkeys)"
-}; 
--- a/src/xorg/keytables/sun-src/symbols/gr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/el,v 1.3 2002/06/03 22:19:48 dawes Exp
-//
-// Hellenic keyboard map for XFree86
-// Original version:
-//      Kostas Gewrgiou <[email protected]>
-// Heavily modified by:
-//      Vasilis Vasaitis <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-default partial alphanumeric_keys alternate_group
-xkb_symbols "basic" {
-    include "us(basic)"
- 
-    include "el(bare)"
- 
-    key <TLDE> { [],    [     grave,    asciitilde      ]       };
-    key <AE01> { [],    [         1,    exclam          ]       };
-    key <AE02> { [],    [         2,    at              ]       };
-    key <AE03> { [],    [         3,    numbersign      ]       };
-    key <AE04> { [],    [         4,    dollar          ]       };
-    key <AE05> { [],    [         5,    percent         ]       };
-    key <AE06> { [],    [         6,    asciicircum     ]       };
-    key <AE07> { [],    [         7,    ampersand       ]       };
-    key <AE08> { [],    [         8,    asterisk        ]       };
-    key <AE09> { [],    [         9,    parenleft       ]       };
-    key <AE10> { [],    [         0,    parenright      ]       };
-    key <AE11> { [],    [     minus,    underscore      ]       };
-    key <AE12> { [],    [     equal,    plus            ]       };
- 
-    key <AD11> { [],    [ bracketleft,  braceleft       ]       };
-    key <AD12> { [],    [ bracketright, braceright      ]       };
- 
-    key <AC11> { [],    [ apostrophe,   quotedbl        ]       };
- 
-    key <AB08> { [],    [     comma,    less            ]       };
-    key <AB09> { [],    [    period,    greater         ]       };
-    key <AB10> { [],    [     slash,    question        ]       };
-    key <BKSL> { [],    [ backslash,    bar             ]       };
- 
-};
- 
-hidden partial alphanumeric_keys alternate_group
-xkb_symbols "bare" {
- 
-    name[Group2] = "ISO8859-7";
-                                                                                
-    key <AD01> { [], [  semicolon,              colon           ] };
-    key <AD02> { [], [  Greek_finalsmallsigma,  Greek_SIGMA     ] };
-    key <AD03> { [], [  Greek_epsilon,          Greek_EPSILON   ] };
-    key <AD04> { [], [  Greek_rho,              Greek_RHO       ] };
-    key <AD05> { [], [  Greek_tau,              Greek_TAU       ] };
-    key <AD06> { [], [  Greek_upsilon,          Greek_UPSILON   ] };
-    key <AD07> { [], [  Greek_theta,            Greek_THETA     ] };
-    key <AD08> { [], [  Greek_iota,             Greek_IOTA      ] };
-    key <AD09> { [], [  Greek_omicron,          Greek_OMICRON   ] };
-    key <AD10> { [], [  Greek_pi,               Greek_PI        ] };
- 
-    key <AC01> { [], [  Greek_alpha,            Greek_ALPHA     ] };
-    key <AC02> { [], [  Greek_sigma,            Greek_SIGMA     ] };
-    key <AC03> { [], [  Greek_delta,            Greek_DELTA     ] };
-    key <AC04> { [], [  Greek_phi,              Greek_PHI       ] };
-    key <AC05> { [], [  Greek_gamma,            Greek_GAMMA     ] };
-    key <AC06> { [], [  Greek_eta,              Greek_ETA       ] };
-    key <AC07> { [], [  Greek_xi,               Greek_XI        ] };
-    key <AC08> { [], [  Greek_kappa,            Greek_KAPPA     ] };
-    key <AC09> { [], [  Greek_lamda,            Greek_LAMDA     ] };
-    key <AC10> { [], [  dead_acute,             dead_diaeresis  ] };
-                                                                                
-    key <AB01> { [], [  Greek_zeta,             Greek_ZETA      ] };
-    key <AB02> { [], [  Greek_chi,              Greek_CHI       ] };
-    key <AB03> { [], [  Greek_psi,              Greek_PSI       ] };
-    key <AB04> { [], [  Greek_omega,            Greek_OMEGA     ] };
-    key <AB05> { [], [  Greek_beta,             Greek_BETA      ] };
-    key <AB06> { [], [  Greek_nu,               Greek_NU        ] };
-    key <AB07> { [], [  Greek_mu,               Greek_MU        ] };
- 
-    key <LSGT> { [], [  guillemotleft,          guillemotright  ] };
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "extended" {
- 
-    include "el(basic)"
- 
-    key.type = "THREE_LEVEL";
- 
-    key <AE05> { [      5,              percent,        EuroSign        ],
-                 [      5,              percent,        EuroSign        ] };
-                                                                                
-    key <AD01> { [], [  semicolon,      colon,          periodcentered  ] };
- 
-    key <AD03> { [      e,              E,              EuroSign        ],
-                 [      Greek_epsilon,  Greek_EPSILON,  EuroSign        ] };
- 
-    key <AC10> { [      semicolon,      colon,          periodcentered  ] };
- 
-    key <AB08> { [      comma,          less,           guillemotleft   ],
-                 [      comma,          less,           guillemotleft   ] };
- 
-    key <AB09> { [      period,         greater,        guillemotright  ],
-                 [      period,         greater,        guillemotright  ] };
- 
-    key <RALT> {        [       ISO_Level3_Shift        ]       };
- 
-    modifier_map Mod5 { ISO_Level3_Shift };
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "polytonic" {
-                                                                                
-    include "el(extended)"
- 
-    key.type = "THREE_LEVEL";
- 
-    key <AD11> { [], [  dead_tilde,     dead_diaeresis, dead_macron     ] };
-    key <AD12> { [], [  dead_iota,      VoidSymbol,     dead_breve      ] };
- 
-    key <AC10> { [], [  dead_acute,             dead_horn       ] };
-    key <AC11> { [], [  dead_grave,             dead_ogonek     ] };
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "Sundeadkeys" {
- 
-    include "el(basic)"
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "sundeadkeys" {
-                                                                                
-    include "el(Sundeadkeys)"
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "nodeadkeys" {
- 
-    include "el(basic)"
- 
-    key <AC10> { [], [  semicolon,              colon           ] };
- 
-};
-
--- a/src/xorg/keytables/sun-src/symbols/hr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-// Croatian keyboards
-// by Vlatko Kosturjak (kost at linux.hr)
-// Taken from Slovenian keyboards
-// by Marko Samastur ([email protected]) and
-// Primoz Peterlin ([email protected])
-//
-// Changelog
-// =========
-// 2003-04-11 Fixes from joy (AltGr+, i AltGr+.)
-// 2003-04-03 Added <KPDL> (Delete/Separator)
-// 2000-02-06 Initial version
-//
-// xc/programs/xkbcomp/symbols/hr
-// $XFree86: xc/programs/xkbcomp/symbols/hr,v 1.2 2003/04/13 18:22:19 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a Slovenian keybaord
-    // by Marko Samastur ([email protected])
-
-    // Alphanumeric section
-    name[Group1]= "Croatian";
-    key <TLDE> {        [ dead_cedilla, dead_diaeresis  ]       };
-    key <AE01> {        [         1,    exclam          ],
-                        [ asciitilde                    ]       };
-    key <AE02> {        [         2,    quotedbl        ],
-                        [ dead_caron                    ]       };
-    key <AE03> {        [         3,    numbersign      ],
-                        [ dead_circumflex               ]       };
-    key <AE04> {        [         4,    dollar          ],
-                        [ dead_breve                    ]       };
-    key <AE05> {        [         5,    percent         ],
-                        [ dead_abovering                ]       };
-    key <AE06> {        [         6,    ampersand       ],
-                        [ dead_ogonek                   ]       };
-    key <AE07> {        [         7,    slash           ],
-                        [ quoteleft                     ]       };
-    key <AE08> {        [         8,    parenleft       ],
-                        [ dead_abovedot                 ]       };
-    key <AE09> {        [         9,    parenright      ],
-                        [ dead_acute                    ]       };
-    key <AE10> {        [         0,    equal           ],
-                        [ dead_doubleacute              ]       };
-    key <AE11> {        [ apostrophe,   question        ],
-                        [ dead_diaeresis                ]       };
-    key <AE12> {        [ plus,          asterisk       ],
-                        [ dead_cedilla                  ]       };
-
-    key <AD01> {        [         q,    Q               ],
-                        [ backslash                     ]       };
-    key <AD02> {        [         w,    W               ],
-                        [ bar                           ]       };
-    key <AD03> {        [         e,    E               ],
-                        [  EuroSign                     ]       };
-    key <AD05> {        [         t,    T               ]       };
-    key <AD06> {        [         z,    Z               ]       };
-    key <AD07> {        [         u,    U               ]       };
-    key <AD08> {        [         i,    I               ]       };
-    key <AD09> {        [         o,    O               ]       };
-    key <AD10> {        [         p,    P               ]       };
-    key <AD11> {        [ scaron,       Scaron          ],
-                        [ division                      ]       };
-    key <AD12> {        [      dstroke, Dstroke         ],
-                        [ multiply                      ]       };
-    key <AC04> {        [         f,    F               ],
-                        [ bracketleft                   ]       };
-    key <AC05> {        [         g,    G               ],
-                        [ bracketright                  ]       };
-    key <AC08> {        [         k,    K               ],
-                        [ lstroke                       ]       };
-    key <AC09> {        [         l,    L               ],
-                        [ Lstroke                       ]       };
-    key <AC10> {        [ ccaron,       Ccaron          ]       };
-    key <AC11> {        [ cacute,       Cacute          ],
-                        [ ssharp                        ]       };
-
-    key <LSGT> {        [      less,    greater         ]       };
-    key <AB01> {        [         y,    Y               ]       };
-    key <AB04> {        [         v,    V               ],
-                        [ at                            ]       };
-    key <AB05> {        [         b,    B               ],
-                        [ braceleft                     ]       };
-    key <AB06> {        [         n,    N               ],
-                        [ braceright                    ]       };
-    key <AB07> {        [         m,    M               ],
-                        [ section                       ]       };
-    key <AB08> {        [     comma,    semicolon       ]       };
-    key <AB09> {        [    period,    colon           ]       };
-    key <AB10> {        [     minus,    underscore      ]       };
-    key <BKSL> {        [ zcaron,       Zcaron          ],
-                        [ currency                      ]       };
-    key <KPDL> {        [ KP_Delete,    KP_Separator    ]       };
-    key <RALT> {        [ Mode_switch,  Multi_key       ]       };
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "hr(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "hr(Sundeadkeys)" // for naming consistency
-};
--- a/src/xorg/keytables/sun-src/symbols/hr_US	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-// Croatian-US keyboards
-// by Vlatko Kosturjak (kost at linux.hr)
-//
-// Changelog
-// =========
-// 2003-04-03 Added <KPDL> (Delete/Separator)
-// 2002-11-20 Initial version
-//
-// xc/programs/xkbcomp/symbols/hr_US
-// $XFree86$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-
-
-default partial alphanumeric_keys 
-xkb_symbols "basic" {
-	include "us(basic)"
-
-    // Describes the differences between US/ASCII
-    // keyboard and a Croatian-US keyboard
-    // by Vlatko Kosturjak (kost at linux.hr)
-
-    // Alphanumeric section
-    name[Group1]= "Croatian(US)";
-    key <AD01> {	[	  q,	Q 		],
-			[ backslash			]	};
-    key <AD02> {	[	  w,	W 		],
-			[ bar				]	};
-    key <AD03> {	[	  e,	E		],
-			[  EuroSign			]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  y,	Y		],
-    			[	  z,    Z		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD11> {	[ bracketleft, braceleft	],
-    			[ scaron,	Scaron		] 	};
-    key <AD12> {	[ bracketright, braceright	],
-    			[      dstroke,	Dstroke		]	};
-    key <AC04> {	[	  f,	F		],
-			[ bracketleft			]	};
-    key <AC05> {	[	  g,	G		],
-			[ bracketright			]	};
-    key <AC08> {	[	  k,	K		],
-			[ lstroke			]	};
-    key <AC09> {	[	  l,	L		],
-			[ Lstroke			]	};
-    key <AC10> {	[ semicolon, 	colon		],
-    			[ ccaron,	Ccaron		]	};
-    key <AC11> {	[ apostrophe,	quotedbl	],
-    			[ cacute,	Cacute		]	};
-
-
-    key <LSGT> {	[ less,		greater		],
-			[	bar			]	};
-    key <AB01> {	[	  z,	Z 		],
-    			[	  y,	Y		]	};
-    key <AB04> {	[	  v,	V 		],
-			[ at				]	};
-    key <AB05> {	[	  b,	B 		],
-			[ braceleft			]	};
-    key <AB06> {	[	  n,	N 		],
-			[ braceright			]	};
-    key <AB07> {	[	  m,	M		],
-			[ section			]	};
-    key <AB08> {	[     comma,	less		],
-    			[ semicolon			]	};
-    key <AB09> {	[    period,	greater		],
-    			[ colon				]	};
-    key <AB10> {	[ slash,	question	],
-    			[     minus,	underscore	]	};
-    key <BKSL> {	[ backslash,	bar		],
-    			[ zcaron,	Zcaron		]	};
-    key <KPDL> {	[ KP_Delete,	KP_Separator	]	};
-    key <RALT> {	[ Mode_switch,	Multi_key	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "hr(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "hr(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/hu_qwerty	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// Hungarian keyboard symbols for XKB and 101-key qwerty PC keyboard
-//
-// $XFree86$
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Check also ../rules/xfree86.lst
-
-
-default partial
-xkb_symbols "default" {
-    include "hu(101_qwerty_comma)"
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-    include "us(basic)"
-    include "hu(Sundeadkeys)" 
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "hu(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/il	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-// $XConsortium: il /main/3 1997/12/18 12:40:12 rch $
-//
-// $XFree86$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple us
-    // keyboard and a very simple Israelian keyboard
-
-    // uses the kbd layout in use in Israel.
-
-    name[Group2]= "Israelian";
-
-	include "us(basic)"
-
-    key <TLDE> {[ grave,  asciitilde ],	[ semicolon,	asciitilde	]	};
-    key <AE04> {[],	[         4,    dollar          ]       };
-    key <AE05> {[],	[         5,    percent         ]       };
-    key <AE06> {[],	[         6,    asciicircum     ]       };
-    key <AD01> {[],	[ slash,	Q		]	};
-    key <AD02> {[],	[ apostrophe,	W		]	};
-    key <AD03> {[],	[ hebrew_qoph,	E		]       };
-    key <AD04> {[],	[ hebrew_resh,	R		]	};
-    key <AD05> {[],	[ hebrew_aleph,	T		]       };
-    key <AD06> {[],	[ hebrew_tet,	Y		]       };
-    key <AD07> {[],	[ hebrew_waw,	U		]       };
-    key <AD08> {[],	[ hebrew_finalnun,	I	]       };
-    key <AD09> {[],	[ hebrew_finalmem,	O	]       };
-    key <AD10> {[],	[ hebrew_pe,	P		]	};
-
-    key <AC01> {[],	[ hebrew_shin,	A		]	};
-    key <AC02> {[],	[ hebrew_dalet,	S		]       };
-    key <AC03> {[],	[ hebrew_gimel,	D		]       };
-    key <AC04> {[],	[ hebrew_kaph,	F		]	};
-    key <AC05> {[],	[ hebrew_ayin,	G		]       };
-    key <AC06> {[],	[ hebrew_yod,	H		]       };
-    key <AC07> {[],	[ hebrew_chet,	J		]	};
-    key <AC08> {[],	[ hebrew_lamed,	K		]	};
-    key <AC09> {[],	[ hebrew_finalkaph,	L	]       };
-    key <AC10> {[],	[ hebrew_finalpe,	colon	]       };
-    key <AC11> {[],	[ comma,	quotedbl	]	};
-    key <LSGT> { [ less, greater   ],  [ less, greater  ]	};
-    key <AB01> {[],	[ hebrew_zain,	Z		]       };
-    key <AB02> {[],	[ hebrew_samech,	X	]       };
-    key <AB03> {[],	[ hebrew_bet,	C		]       };
-    key <AB04> {[],	[ hebrew_he,	V		]       };
-    key <AB05> {[],	[ hebrew_nun,	B		]       };
-    key <AB06> {[],	[ hebrew_mem,	N		]	};
-    key <AB07> {[],	[ hebrew_zade,	M		]	};
-    key <AB08> {[  comma,  less  ],	[ hebrew_taw,	less		]	};
-    key <AB09> {[ period,  greater  ],	[ hebrew_finalzade,	greater	]	};
-    key <AB10> {[],	[ period,	question	]	};
-
-    // The following may get overriden by the iso9995-3(basic101) symbols.
-    // therefore they are included here. 
-    // Including them isn't a great idea (for instance: what if group 1 uses
-    // UK keyboard mapping, and maps shift-3 to sterling? This mapping won't
-    // preserve that, and I'm not sure that this is a good feature.
-    key <AE01> {[],	[         1,    exclam          ]       };
-    key <AE02> {[],	[         2,    at              ]       };
-    key <AE03> {[],	[         3,    numbersign      ]       };
-    key <AE04> {[],	[         4,    dollar          ]       };
-    key <AE05> {[],	[         5,    percent         ]       };
-    key <AE06> {[],	[         6,    asciicircum     ]       };
-    key <AE07> {[],	[         7,    ampersand       ]       };
-    key <AE08> {[],	[         8,    asterisk        ]       };
-    key <AE09> {[],	[         9,    parenleft       ]       };
-    key <AE10> {[],	[         0,    parenright      ]       };
-    key <AE11> {[],	[     minus,    underscore      ]       };
-    key <AE12> {[],	[     equal,    plus            ]       };
-
-    key <AD11> {[],	[ bracketleft,  braceleft       ]       };
-    key <AD12> {[],	[ bracketright, braceright      ]       };
-
-    key <BKSL> {[],	[ backslash,    bar             ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "il(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "il(Sundeadkeys)" // for consistent naming
-};
-
-
-// end of file /usr/X11/lib/X11/xkb/symbols/il
--- a/src/xorg/keytables/sun-src/symbols/il_phonetic	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-// $XConsortium: il_phonetic /main/3 1997/12/18 12:40:12 rch $
-//
-// $XFree86$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Israelian keyboard
-
-    // uses the phonetic layout from old Slackware 'il.map' file
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Israelian";
-
-include "us(basic)"
-
-    key <AE12> {        [     equal,    plus            ],
-			[ hebrew_doublelowline, hebrew_doublelowline ]};
-
-    key <AD01> {        [         q,    Q               ],
-			[ hebrew_qoph, hebrew_qoph	]	};
-    key <AD02> {        [         w,    W               ],
-			[ hebrew_waw, hebrew_waw	]	};
-    key <AD03> {        [         e,    E               ],
-			[ hebrew_aleph, hebrew_aleph	]       };
-    key <AD04> {        [         r,    R               ],
-			[ hebrew_resh, hebrew_resh	]	};
-    key <AD05> {        [         t,    T               ],
-			[ hebrew_taw, hebrew_tet	]       };
-    key <AD06> {        [         y,    Y               ],
-			[ hebrew_ayin, hebrew_ayin	]       };
-    key <AD07> {        [         u,    U               ],
-			[ hebrew_waw, hebrew_waw	]       };
-    key <AD08> {        [         i,    I               ],
-			[ hebrew_yod, hebrew_yod	]       };
-    key <AD09> {        [         o,    O               ],
-			[ hebrew_samech, hebrew_samech	]       };
-    key <AD10> {        [         p,    P               ],
-			[ hebrew_pe, hebrew_finalpe	]	};
-
-    key <AC01> {        [         a,    A               ],
-			[ hebrew_aleph, hebrew_aleph	]	};
-    key <AC02> {        [         s,    S               ],
-			[ hebrew_shin, hebrew_shin	]       };
-    key <AC03> {        [         d,    D               ],
-			[ hebrew_dalet, hebrew_dalet	]       };
-    key <AC04> {        [         f,    F               ],
-			[ hebrew_pe, hebrew_finalpe	]	};
-    key <AC05> {        [         g,    G               ],
-			[ hebrew_gimel, hebrew_gimel	]       };
-    key <AC06> {        [         h,    H               ],
-			[ hebrew_he, hebrew_he		]       };
-    key <AC07> {        [         j,    J               ],
-			[ hebrew_yod, hebrew_yod	]	};
-    key <AC08> {        [         k,    K               ],
-			[ hebrew_kaph, hebrew_finalkaph	]	};
-    key <AC09> {        [         l,    L               ],
-			[ hebrew_lamed, hebrew_lamed	]       };
-
-    key <AB01> {        [         z,    Z               ],
-			[ hebrew_zain, hebrew_zain	]       };
-    key <AB02> {        [         x,    X               ],
-			[ hebrew_chet, hebrew_chet	]       };
-    key <AB03> {        [         c,    C               ],
-			[ hebrew_zade, hebrew_finalzade	]       };
-    key <AB04> {        [         v,    V               ],
-			[ hebrew_waw, hebrew_waw	]       };
-    key <AB05> {        [         b,    B               ],
-			[ hebrew_bet, hebrew_bet	]       };
-    key <AB06> {        [         n,    N               ],
-			[ hebrew_nun, hebrew_finalnun	]	};
-    key <AB07> {        [         m,    M               ],
-			[ hebrew_mem, hebrew_finalmem	]	};
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "us(basic)"
-        include "il_phonetic(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "il_phonetic(Sundeadkeys)"
-};
-
-
--- a/src/xorg/keytables/sun-src/symbols/is	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-// $Xorg: is,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-// XKB keyboard by Hrafnkell Eiriksson - [email protected]
-//     fixes by Olafur Osvaldsson - [email protected]
-// $XFree86: xc/programs/xkbcomp/symbols/is,v 3.7 2002/11/26 01:57:24 dawes Exp $
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and an Icelandic one - hopefully
-
-    // Alphanumeric section
-    name[Group1]= "Icelandic";
-    key <TLDE> {        [ dead_abovering, dead_diaeresis       ],
-                        [   notsign                     ]       };
-    key <AE02> {        [         2,    quotedbl        ],
-                        [ twosuperior                   ]       };
-    key <AE03> {        [         3,    numbersign      ],
-                        [ threesuperior,sterling        ]       };
-    key <AE04> {        [         4,    dollar          ],
-                        [ onequarter,   currency        ]       };
-    key <AE05> {        [         5,    percent         ],
-                        [   onehalf                     ]       };
-    key <AE06> {        [         6,    ampersand       ],
-                        [ threequarters                 ]       };
-    key <AE07> {        [         7,    slash           ],
-                        [ braceleft                     ]       };
-    key <AE08> {        [         8,    parenleft       ],
-                        [ bracketleft                   ]       };
-    key <AE09> {        [         9,    parenright      ],
-                        [ bracketright, plusminus       ]       };
-    key <AE10> {        [         0,    equal           ],
-                        [ braceright,   degree          ]       };
-    key <AE11> {        [    odiaeresis, Odiaeresis     ],
-                        [ backslash,    questiondown    ]       };
-    key <AE12> {        [ minus,        underscore      ],
-                        [ ccedilla                      ]       };
-    key <AD01> {        [         q,    Q               ],
-                        [        at                     ]       };
-    key <AD03> {        [         e,    E               ],
-                        [  EuroSign,    cent            ]       };
-//    key <AD05> {      [         t,    T               ]       };
-//    key <AD06> {      [         z,    Z               ]       };
-//    key <AD07> {      [         u,    U               ]       };
-//    key <AD08> {      [         i,    I               ]       };
-    key <AD11> {        [ eth,                  Eth     ],
-                        [ dead_diaeresis                ]       };
-    key <AD12> {        [ apostrophe ,  question        ],
-                        [  dead_tilde,   dead_macron     ]       };
-//    key <AC04> {      [         f,    F               ]       };
-//    key <AC05> {      [         g,    G               ]       };
-    key <AC10> {        [ ae,                   AE      ],
-                        [ asciicircum                   ]       };
-    key <AC11> {        [ dead_acute,   dead_acute	],
-                        [ dead_circumflex               ]       };
-
-    key <LSGT> {        [      less,    greater         ],
-                        [       bar                     ]       };
-//    key <AB01> {      [         y,    Y               ],
-//                      [ guillemotleft, less           ]       };
-//    key <AB07> {      [         m,    M               ],
-//                      [        mu                     ]       };
-    key <AB08> {        [     comma,    semicolon       ]       };
-    key <AB09> {        [    period,    colon           ],
-                        [ periodcentered, division      ]       };
-    key <AB10> {        [     thorn,    Thorn   ]       };
-    key <BKSL> {        [ plus,         asterisk        ],
-                        [ grave                 ]       };
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    include "ralt(mode_switch)"
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    // modify the default Icelandic layout to use Sun dead keys
-    include "is(basic)"
-//    key <TLDE> {        [ SunFA_Circum, degree          ],
-//                        [   notsign                     ]       };
-//    key <AE12> {        [ SunFA_Acute,  SunFA_Grave     ],
-//                        [ SunFA_Cedilla                 ]       };
-//    key <AD11> {        [ udiaeresis,   Udiaeresis      ],
-//                        [ SunFA_Diaeresis               ]       };
-//    key <AD12> {        [      plus,    asterisk        ],
-//                        [ SunFA_Tilde,  dead_macron     ]       };
-//    key <AC10> {        [ odiaeresis,   Odiaeresis      ],
-//                        [ SunFA_Acute                   ]       };
-//    key <AC11> {        [ adiaeresis,   Adiaeresis      ],
-//                        [ SunFA_Circum                  ]       };
-//    key <BKSL> {        [ numbersign,   acute           ],
-//                        [ SunFA_Grave                   ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "is(Sundeadkeys)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    // modify the default Icelandic layout to not have any dead keys
-    include "is(basic)"
-    key <TLDE> {        [ degree, 	diaeresis       ],
-                        [ notsign                     ]       };
-    key <AE12> {        [ minus,        underscore      ],
-                        [ ccedilla                      ]       };
-    key <AD11> {        [ eth,                  Eth     ],
-                        [ diaeresis  			]       };
-    key <AD12> {        [ apostrophe ,  question        ],
-                        [ asciitilde,   macron     ]       };
-    key <AC10> {        [ ae,                   AE      ],
-                        [ asciicircum                   ]       };
-    key <AC11> {        [ acute,   	acute		],
-                        [ asciicircum			]       };
-    key <BKSL> {        [ plus,         asterisk        ],
-                        [ grave                 ]       };
-
-//    key <TLDE> {        [ asciicircum,  degree          ],
-//                        [   notsign                     ]       };
-//    key <AE12> {        [ apostrophe,   grave           ],
-//                        [ cedilla                       ]       };
-//    key <AD11> {        [ udiaeresis,   Udiaeresis      ],
-//                        [ diaeresis                     ]       };
-//    key <AD12> {        [      plus,    asterisk        ],
-//                        [ asciitilde,   macron          ]       };
-//    key <AC10> {        [ odiaeresis,   Odiaeresis      ],
-//                        [ acute                         ]       };
-//    key <AC11> {        [ adiaeresis,   Adiaeresis      ],
-//                        [ asciicircum                   ]       };
-//    key <BKSL> {        [ numbersign,   acute           ],
-//                        [ grave                         ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/it	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-// $XConsortium: it /main/3 1996/08/31 12:19:59 kaleb $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Italian keybaord
-
-    name[Group1]= "Italian";
-
-    key <TLDE> {	[       backslash,             bar      ]	};
-    key <AE02> {	[               2,        quotedbl     	]	};
-    key <AE03> {	[               3,        sterling     	]	};
-    key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash     	]	};
-    key <AE08> {	[               8,       parenleft     	],	
-                        [       braceleft,               8      ]       };
-    key <AB08> {	[           comma,       semicolon     	]	};
-    key <AE10> {	[               0,           equal     	]	};
-    key <AE09> {	[               9,      parenright     	],	
-                        [      braceright,               9      ]       };
-    key <AB09> {	[          period,           colon     	]	};
-    key <AB10> {	[           minus,      underscore     	]	};
-    key	<AC10> {	[	   ograve,        ccedilla  	],	
-			[              at,dead_doubleacute	]	};
-    key <AE11> {	[      apostrophe,        question      ],	
-			[	    grave,    questiondown	]	};
-    key <AC11> {	[          agrave,          degree 	],	
-			[      numbersign,      numbersign	]	};
-    key <AD11> {	[	   egrave,          eacute     	],	
-			[     bracketleft,  dead_abovering	]	};
-    key <AE12> {	[          igrave,     asciicircum	],	
-			[      asciitilde,     dead_ogonek	]	};
-    key <AD12> {	[            plus,        asterisk     	],	
-			[    bracketright,     dead_macron     	]      	};
-    key <LSGT> {	[	    less,        greater	],
-			[	     bar,	brokenbar	]	};
-    key <BKSL> {	[          ugrave,         section	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic italian layout to eliminate all dead keys
-
-    include "it(basic)"
-    key	<AC10> {	[	   ograve,        ccedilla  	],	
-			[              at,     doubleacute	]	};
-    key <AD11> {	[	   egrave,          eacute     	],	
-			[     bracketleft,          degree	]	};
-    key <AE12> {	[          igrave,     asciicircum	],	
-			[      asciitilde,          ogonek	]	};
-    key <AD12> {	[            plus,        asterisk     	],	
-			[    bracketright,          macron     	]      	};
-};
--- a/src/xorg/keytables/sun-src/symbols/kan	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// $XFree86$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Inscript layout for Kannada  
-    // Author : G Karunakar <[email protected]>
-    // Date   : Wed Nov 13 17:22:58 IST 2002
-    // Kannada digits mapped in basic only
-
-
-	include "us(basic)"
-
-    name[Group2]= "Kannada";
-
-    key <TLDE> { [], [  0x01000cca, 0x01000c92	] };
-    key <AE01> { [], [  0x01000ce7, 0x01000c8d	] };
-    key <AE02> { [], [  0x01000ce8, 0x01000cc5 	] };
-    key <AE03> { [], [  0x01000ce9 	] };
-    key <AE04> { [], [  0x01000cea 	] };
-    key <AE05> { [], [  0x01000ceb 	] };
-    key <AE06> { [], [  0x01000cec  	] };
-    key <AE07> { [], [  0x01000ced	] };
-    key <AE08> { [], [  0x01000cee  	] };
-    key <AE09> { [], [  0x01000cef  	] };
-    key <AE10> { [], [  0x01000ce6 	] };
-    key <AE11> { [], [  0x01000c83   	] };
-    key <AE12> { [], [ 	0x01000cc3, 0x01000c8b	] };
-
-    key <AD01> { [], [   0x01000ccc, 0x01000c94	] };
-    key <AD02> { [], [   0x01000cc8, 0x01000c90 ] };
-    key <AD03> { [], [   0x01000cbe, 0x01000c86 ] };
-    key <AD04> { [], [   0x01000cc0, 0x01000c88	] };
-    key <AD05> { [], [   0x01000cc2, 0x01000c8a	] };
-    key <AD06> { [], [   0x01000cac, 0x01000cad	] };
-    key <AD07> { [], [   0x01000cb9, 0x01000c99	] };
-    key <AD08> { [], [   0x01000c97, 0x01000c98 ] };
-    key <AD09> { [], [   0x01000ca6, 0x01000ca7	] };
-    key <AD10> { [], [   0x01000c9c, 0x01000c9d	] };
-    key <AD11> { [], [   0x01000ca1, 0x01000ca2	] };
-    key <AD12> { [], [   0x01000cbc, 0x01000c9e	] };
- 
-    key <AC01> { [], [ 	 0x01000ccb, 0x01000c93	] };
-    key <AC02> { [], [   0x01000cc7, 0x01000c8f	] };
-    key <AC03> { [], [   0x01000ccd, 0x01000c85	] };
-    key <AC04> { [], [   0x01000cbf, 0x01000c87	] };
-    key <AC05> { [], [   0x01000cc1, 0x01000c89	] };
-    key <AC06> { [], [   0x01000caa, 0x01000cab ] };
-    key <AC07> { [], [   0x01000cb0, 0x01000cb1	] };
-    key <AC08> { [], [   0x01000c95, 0x01000c96	] };
-    key <AC09> { [], [   0x01000ca4, 0x01000ca5	] };
-    key <AC10> { [], [   0x01000c9a, 0x01000c9b	] };
-    key <AC11> { [], [   0x01000c9f, 0x01000ca0 ] };
- 
-    key <AB01> { [], [ 	 0x01000cc6, 0x01000c8e ] };
-    key <AB02> { [], [ 	 0x01000c82, 0x01000c81	] };
-    key <AB03> { [], [   0x01000cae, 0x01000ca3	] };
-    key <AB04> { [], [   0x01000ca8, 0x01000ca9	] };
-    key <AB05> { [], [ 	 0x01000cb5, 0x01000cb4	] };
-    key <AB06> { [], [   0x01000cb2, 0x01000cb3	] };
-    key <AB07> { [], [   0x01000cb8, 0x01000cb6	] };
-    key <AB08> { [], [   comma     , 0x01000cb7	] };
-    key <AB09> { [], [   period    , 0x01000ce4	] };
-    key <AB10> { [], [   0x01000caf, 0x01000040	] };
-    key <BKSL> { [], [   0x01000cc9, 0x01000c91	] };
-    key <RALT> {
-	symbols[Group1] = [ Mode_switch , Multi_key ],
-	virtualMods = AltGr
-    };
-
-    modifier_map Shift	{ Shift_L };
-    modifier_map Lock	{ Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "kan(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "kan(Sundeadkeys)"
-}; 
--- a/src/xorg/keytables/sun-src/symbols/kz	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-//
-// Kazakhstan standard keyboard
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Kazakhstan keyboard
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Kazakhstan";
-
-
-
-    key <AE01> {        [                       1,                  exclam      ],
-                        [                quotedbl,                  exclam      ]       };
-    key <AE06> {        [                       6,             asciicircum      ],
-                        [                   comma,               semicolon      ]       };
-    key <AE07> {        [                       7,               ampersand      ],
-                        [                  period,                   colon      ]       };
-    key <AB10> {        [                   slash,                question      ], 
-                        [              numerosign,                question      ]       };
-
-key.type[group2]="ALPHABETIC";
-
-    key <TLDE> {        [               parenleft,              parenright      ],
-                        [             Cyrillic_io,             Cyrillic_IO      ]       };
-    key <AE02> {        [                       2,                      at      ],
-                        [          Cyrillic_schwa,          Cyrillic_SCHWA      ]       };
-    key <AE03> {        [                       3,              numbersign      ],
-                        [             Ukrainian_i,             Ukrainian_I      ]       };
-    key <AE04> {        [                       4,                  dollar      ],
-                        [   Cyrillic_en_descender,   Cyrillic_EN_descender      ]       };
-    key <AE05> {        [                       5,                 percent      ],
-                        [        Cyrillic_ghe_bar,        Cyrillic_GHE_bar      ]       };
-    key <AE08> {        [                       8,                asterisk      ],
-                        [     Cyrillic_u_straight,     Cyrillic_U_straight      ]       };
-    key <AE09> {        [                       9,               parenleft      ],
-                        [ Cyrillic_u_straight_bar, Cyrillic_U_straight_bar      ]       };
-    key <AE10> {        [                       0,              parenright      ],
-                        [   Cyrillic_ka_descender,   Cyrillic_KA_descender      ]       };
-    key <AE11> {        [                   minus,              underscore      ],
-                        [          Cyrillic_o_bar,          Cyrillic_O_bar      ]       };
-    key <AE12> {        [                   equal,                    plus      ],
-                        [           Cyrillic_shha,           Cyrillic_SHHA      ]       };
-
-    key <AD01> {        [                       q,                       Q      ],
-                        [         Cyrillic_shorti,         Cyrillic_SHORTI      ]       };
-    key <AD02> {        [                       w,                       W      ],
-                        [            Cyrillic_tse,            Cyrillic_TSE      ]       };
-    key <AD03> {        [                       e,                       E      ],
-                        [              Cyrillic_u,              Cyrillic_U      ]       };
-    key <AD04> {        [                       r,                       R      ],
-                        [             Cyrillic_ka,             Cyrillic_KA      ]       };
-    key <AD05> {        [                       t,                       T      ],
-                        [             Cyrillic_ie,             Cyrillic_IE      ]       };
-    key <AD06> {        [                       y,                       Y      ],
-                        [             Cyrillic_en,             Cyrillic_EN      ]       };
-    key <AD07> {        [                       u,                       U      ],
-                        [            Cyrillic_ghe,            Cyrillic_GHE      ]       };
-    key <AD08> {        [                       i,                       I      ],
-                        [            Cyrillic_sha,            Cyrillic_SHA      ]       };
-    key <AD09> {        [                       o,                       O      ],
-                        [          Cyrillic_shcha,          Cyrillic_SHCHA      ]       };
-    key <AD10> {        [                       p,                       P      ],
-                        [             Cyrillic_ze,             Cyrillic_ZE      ]       };
-    key <AD11> {        [             bracketleft,               braceleft      ],
-                        [             Cyrillic_ha,             Cyrillic_HA      ]       };
-    key <AD12> {        [            bracketright,              braceright      ],
-                        [       Cyrillic_hardsign,       Cyrillic_HARDSIGN      ]       };
-    key <BKSL> {        [               backslash,                     bar      ],
-                        [               backslash,                   slash      ]       };
-
-    key <AC01> {        [                       a,                       A      ],
-                        [             Cyrillic_ef,             Cyrillic_EF      ]       };
-    key <AC02> {        [                       s,                       S      ],
-                        [           Cyrillic_yeru,           Cyrillic_YERU      ]       };
-    key <AC03> {        [                       d,                       D      ],
-                        [             Cyrillic_ve,             Cyrillic_VE      ]       };
-    key <AC04> {        [                       f,                       F      ],
-                        [              Cyrillic_a,              Cyrillic_A      ]       };
-    key <AC05> {        [                       g,                       G      ],
-                        [             Cyrillic_pe,             Cyrillic_PE      ]       };
-    key <AC06> {        [                       h,                       H      ],
-                        [             Cyrillic_er,             Cyrillic_ER      ]       };
-    key <AC07> {        [                       j,                       J      ],
-                        [              Cyrillic_o,              Cyrillic_O      ]       };
-    key <AC08> {        [                       k,                       K      ],
-                        [             Cyrillic_el,             Cyrillic_EL      ]       };
-    key <AC09> {        [                       l,                       L      ],
-                        [             Cyrillic_de,             Cyrillic_DE      ]       };
-    key <AC10> {        [               semicolon,                   colon      ],
-                        [            Cyrillic_zhe,            Cyrillic_ZHE      ]       };
-    key <AC11> {        [              apostrophe,                quotedbl      ],
-                        [              Cyrillic_e,              Cyrillic_E      ]       };
-
-    key <AB01> {        [                       z,                       Z      ],
-                        [             Cyrillic_ya,             Cyrillic_YA      ]       };
-    key <AB02> {        [                       x,                       X      ],
-                        [            Cyrillic_che,            Cyrillic_CHE      ]       };
-    key <AB03> {        [                       c,                       C      ],
-                        [             Cyrillic_es,             Cyrillic_ES      ]       };
-    key <AB04> {        [                       v,                       V      ],
-                        [             Cyrillic_em,             Cyrillic_EM      ]       };
-    key <AB06> {        [                       n,                       N      ],
-                        [             Cyrillic_te,             Cyrillic_TE      ]       };
-    key <AB05> {        [                       b,                       B      ],
-                        [              Cyrillic_i,              Cyrillic_I      ]       };
-    key <AB07> {        [                       m,                       M      ],
-                        [       Cyrillic_softsign,       Cyrillic_SOFTSIGN      ]       };
-    key <AB08> {        [                   comma,                    less      ],
-                        [             Cyrillic_be,             Cyrillic_BE      ]       };
-    key <AB09> {        [                  period,                 greater      ],
-                        [             Cyrillic_yu,             Cyrillic_YU      ]       };
-
-    key <LSGT> {        [                    less,                 greater      ],
-                        [                     bar,               brokenbar      ]       };
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-include "kz(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-include "kz(Sundeadkeys)" // for naming consistency
-};
-
--- a/src/xorg/keytables/sun-src/symbols/la	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-// $XConsortium: es /main/3 1996/08/31 12:19:38 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/la,v 1.1 2001/11/21 22:28:52 dawes Exp $
-// Modified for a real Latin American Keyboard by Fabian Mandelbaum
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Latin American keybaord
-
-    name[Group1]= "Latin American";
-
-    key <TLDE> {	[             bar,          degree      ],	
-    			[	  notsign,         notsign 	]	};
-    key <LSGT> {	[	     less,	   greater	],
-			[	      bar,       brokenbar	]	};
-    key <AE01> {	[         	1,	exclam 		],
-			[	      bar,	exclamdown	]	};
-    key <AE02> {	[               2,        quotedbl     	],	
-			[	       at,	 oneeighth	]	};
-    key <AE03> {	[               3,      numbersign     	],	
-			[  periodcentered,        sterling	]	};
-    key <AE04> {	[               4,          dollar     	],	
-			[      asciitilde,          dollar	]	};
-    key <AE06> {	[               6,       ampersand     	],	
-			[	  notsign,     fiveeighths	]	};
-    key <AE07> {	[               7,           slash     	]	};
-    key <AE08> {	[               8,       parenleft     	]	};
-    key <AB08> {	[           comma,       semicolon     	]	};
-    key <AE10> {	[               0,           equal     	]	};
-    key <AE09> {	[               9,      parenright     	]	};
-    key <AB09> {	[          period,           colon     	]	};
-    key <AB10> {	[           minus,      underscore     	]	};
-    key	<AC10> {	[	   ntilde,          Ntilde  	],	
-			[      asciitilde,dead_doubleacute	]	};
-    key <AE11> {	[      apostrophe,        question      ]	};
-    key <AC11> {	[       braceleft,     bracketleft 	],	
-			[ dead_circumflex,       braceleft	]	};
-    key <BKSL> {	[      braceright,    bracketright	],
-			[      dead_grave,      braceright	]	};
-    key <AD11> {	[      dead_acute,  dead_diaeresis 	]	};
-    key <AE12> {	[    questiondown,      exclamdown	]	};
-    key <AD12> {	[            plus,        asterisk	],
-			[      asciitilde,     dead_macron	]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign,            cent      ]	};
-
-    // End alphanumeric section
-
-    // Begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "la(basic)"
-
-    key <AC11> {	[     SunFA_Acute, SunFA_Diaeresis 	],	
-			[	braceleft,       braceleft	]	};
-    key <AD11> {	[     SunFA_Grave,    SunFA_Circum     	],	
-			[     bracketleft,  dead_abovering	]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "la(Sundeadkeys)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "la(basic)"
-
-    key	<AC10> {	[	   ntilde,          Ntilde  	],	
-			[      asciitilde,     doubleacute	]	};
-    key <AC11> {	[           acute,       diaeresis 	],	
-			[	braceleft,       braceleft	]	};
-    key <BKSL> {	[	 ccedilla,        Ccedilla	],
-			[      braceright,           breve	]	};
-    key <AD11> {	[	    grave,     asciicircum     	],	
-			[     bracketleft,          degree	]	};
-    key <AD12> {	[            plus,        asterisk	],
-			[    bracketright,          macron	]	};
-};
--- a/src/xorg/keytables/sun-src/symbols/lt	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-// $XFree86$
-// Lithuanian keyboard map by Ričardas Čepas <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Describes popular Lithuanian keymap 'Baltic' aka querty/numeric
-// Don't rename this file because it includes 'lt'
-// Extensions:  „ “ instead of 9 0 in Lithuanian mode, endash/Euro on 102nd key
-//  Usage:  setxkbmap -option grp:shift_toggle 'lt'
-//   # +lt(left_switch) turns key between left ctrl and shift on "German" keyboards into AltGr
-// Option	"XkbModel"	"pc105"
-// Option	"XkbLayout"	"lt+lt(left_switch)"
-//   # Double shift toggles between numbers and Lithuanian letters, you may choose other keys
-// Option	"XkbOptions"	"grp:shift_toggle"
-
-
-partial default alphanumeric_keys modifier_keys 
-xkb_symbols "basic" {
-
-include "us(basic)"
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Lithuanian";
-    include "lt(us_group2)"
-
-    key	<AE01> {	[		1,	    exclam	],
-			[	  onequarter,	    1	]	};
-    key	<AE02> {	[		2,		at	],
-			[	   onehalf,	    doublequote]	};
-    key	<AE03> {	[		3,	numbersign	],
-			[	  threequarters,	   3	]	};
-    key	<AE04> {	[		4,	    dollar	],
-			[	currency,	 4	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[	  cent,	   5	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[	   degree,	    6	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[	  section,	   7	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[	  multiply,	   question	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[ doublelowquotemark,    parenleft	]	};
-    key	<AE10> {	[		0,	parenright	],
-// this is actually right quote for Lithuanian
-			[ leftdoublequotemark,  parenright	]	};
-
-
-
-    key	<AE12> {	[	    equal,	      plus	],
-			[	   zcaron,	    Zcaron	]	};
-    key	<LSGT> {	[	   endash,	  EuroSign 	],
-			[	   endash,	  EuroSign 	]	};
-
-    key <AD01> {	[], [	  q,	Q 		],	 
-			    [	  onesuperior,    aogonek] 	};
-    key <AD02> {	[], [	  w,	W		],
-			    [	  twosuperior,	  zcaron]};
-    key <AD03> {	[], [	  e,	E		],
-			    [	  threesuperior]	};
-		
-    key <AD04> {	[], [	  r,	R		],
-			    [ 	  registered]			};
-    key <AD05> {	[], [	  t,	T		]	};
-    key <AD06> {	[], [	  y,	Y		]	};
-    key <AD07> {	[], [	  u,	U		]	};
-    key <AD08> {	[], [	  i,	I		]	};
-    key <AD09> {	[], [	  o,	O		]	};
-    key <AD10> {	[], [	  p,	P		]	};
-    key <AD11> {	[], [ bracketleft,	braceleft	],	
-			    [         iogonek,         Iogonek      ]        };
-    key <AD12> {	[], [ bracketright,	braceright	]	};
-
-    key <AC01> {	[], [	  a,	A 		]	};
-    key <AC02> {	[], [	  s,	S		],	
-			    [	  ssharp]	};
-    key <AC03> {	[], [	  d,	D		]	};
-    key <AC04> {	[], [	  f,	F		]	};
-    key <AC05> {	[], [	  g,	G		]	};
-    key <AC06> {	[], [	  h,	H		]	};
-    key <AC07> {	[], [	  j,	J		]	};
-    key <AC08> {	[], [	  k,	K		]	};
-    key <AC09> {	[], [	  l,	L		],	
-			    [	  sterling ]		};
-    key <AC10> {	[], [ semicolon,	colon		],	
-			    [ uogonek,		Uogonek]	};
-    key <AC11> {	[], [ quoteright,	quotedbl	],	
-			    [ eabovedot,	Eabovedot	] };
-    key <AC12>  {	[], [ slash,		bar	]	};
-
-    key <AB01> {	[], [	  onesuperior,	twosuperior		],	
-			    [	  threesuperior]	};
-    key <AB02> {	[], [	  z,	Z 		]	};
-    key <AB03> {	[], [	  x,	X		],
-			    [     umacron,	Umacron]	};
-    key <AB04> {	[], [	  c,	C		]	};
-    key <AB05> {	[], [	  v,	V		]	};
-    key <AB06> {	[], [	  b,	B		]	};
-    key <AB07> {	[], [	  n,	N		],
-		            [	  notsign	]	};
-    key <AB08> {	[], [	  m,	M		]	};
-    key <AB09> {	[], [     comma,	less		],
-			    [	  ccaron,	Ccaron	]	};
-    key <AB10> {	[], [    period,	greater		],	
-			    [    middledot,	scaron,		Scaron] };
-    key <AB11> {	[], [     slash,	question	]	};
-    key <BKSL> {	[], [ backslash,	question		],	
-			    [ division,		eogonek] };
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_group2" {
-
-    // Keyboard must work as usual when "Lithuanian" group is locked.
-    key <TLDE> {	[], [ quoteleft,	asciitilde	]	};
-    key <AE01> {	[], [	  1,	exclam 		]	};
-    key <AE02> {	[], [	  2,	at		]	};
-    key <AE03> {	[], [	  3,	numbersign	]	};
-    key <AE04> {	[], [	  4,	dollar		]	};
-    key <AE05> {	[], [	  5,	percent		]	};
-    key <AE06> {	[], [	  6,	asciicircum	]	};
-    key <AE07> {	[], [	  7,	ampersand	]	};
-    key <AE08> {	[], [	  8,	asterisk	]	};
-    key <AE09> {	[], [	  9,	parenleft	]	};
-    key <AE10> {	[], [	  0,	parenright	]	};
-    key <AE11> {	[], [     minus,	underscore	]	};
-    key <AE12> {	[], [     equal,	plus		]	};
-
-    key <AD01> {	[], [	  q,	Q 		]	};
-    key <AD02> {	[], [	  w,	W		]	};
-    key <AD03> {	[], [	  e,	E		]	};
-    key <AD04> {	[], [	  r,	R		]	};
-    key <AD05> {	[], [	  t,	T		]	};
-    key <AD06> {	[], [	  y,	Y		]	};
-    key <AD07> {	[], [	  u,	U		]	};
-    key <AD08> {	[], [	  i,	I		]	};
-    key <AD09> {	[], [	  o,	O		]	};
-    key <AD10> {	[], [	  p,	P		]	};
-    key <AD11> {	[], [ bracketleft,	braceleft	]	};
-    key <AD12> {	[], [ bracketright,	braceright	]	};
-
-    key <AC01> {	[], [	  a,	A 		]	};
-    key <AC02> {	[], [	  s,	S		]	};
-    key <AC03> {	[], [	  d,	D		]	};
-    key <AC04> {	[], [	  f,	F		]	};
-    key <AC05> {	[], [	  g,	G		]	};
-    key <AC06> {	[], [	  h,	H		]	};
-    key <AC07> {	[], [	  j,	J		]	};
-    key <AC08> {	[], [	  k,	K		]	};
-    key <AC09> {	[], [	  l,	L		]	};
-    key <AC10> {	[], [ semicolon,	colon		]	};
-    key <AC11> {	[], [ quoteright,	quotedbl	]	};
-
-    key <AB01> {	[], [	  z,	Z 		]	};
-    key <AB02> {	[], [	  x,	X		]	};
-    key <AB03> {	[], [	  c,	C		]	};
-    key <AB04> {	[], [	  v,	V		]	};
-    key <AB05> {	[], [	  b,	B		]	};
-    key <AB06> {	[], [	  n,	N		]	};
-    key <AB07> {	[], [	  m,	M		]	};
-    key <AB08> {	[], [     comma,	less		]	};
-    key <AB09> {	[], [    period,	greater		]	};
-    key <AB10> {	[], [     slash,	question	]	};
-    key <BKSL> {	[], [ backslash,	bar		]	};
-
-};
-
-
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "lt(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "lt(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "lt(basic)" // for consistent naming
-};
-
-// definition for the extra key on 102-key keyboards between left Control and Alt
-// in case you want use it as AltGr
-xkb_symbols "left_switch" {
-    key	<LSGT> {	[     Mode_switch,	 Multi_key 	],
-			[     Mode_switch,	 Multi_key 	]	};
-    // Begin modifier mappings 
-    modifier_map Mod3   { Mode_switch };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/lv	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-include "us(basic)"
-
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Latvian keyboard.
-
-    // Alphanumeric section
-
-    name[group1]="Latvian";
-
-    key <TLDE> {        [       dead_grave,     asciitilde      ],
-                        [       question,       soft_hyphen     ]       };
-    key <AE01> {        [       1,              exclam          ],
-                        [       bar,            exclamdown      ]       };
-    key <AE02> {        [       2,              at              ],
-                        [       leftdoublequotemark,     2      ]       };
-    key <AE03> {        [       3,              numbersign      ],
-                        [       rightdoublequotemark,    3      ]       };
-    key <AE04> {        [       4,              dollar          ],
-                        [       section,        4               ]       };
-    key <AE05> {        [       5,              percent         ],
-                        [       EuroSign                        ]       };
-    key <AE06> {        [       6,              dead_circumflex ],
-                        [       slash,          6               ]       };
-    key <AE08> {        [       8,              asterisk        ],
-                        [       multiply,       8               ]       };
-    key <AE12> {        [       equal,          plus            ],
-                        [       F,              f               ]       };
-    key <AD01> {        [       q,              Q               ],
-                        [       umacron,        Umacron         ]       };
-    key <AD02> {        [       w,              W               ],
-                        [       g,              G               ]       };
-    key <AD03> {        [       e,              E               ],
-                        [       j,              J               ]       };
-    key <AD04> {        [       r,              R               ],
-                        [       r,              R               ]       };
-    key <AD05> {        [       t,              T               ],
-                        [       m,              M               ]       };
-    key <AD06> {        [       y,              Y               ],
-                        [       v,              V               ]       };
-    key <AD07> {        [       u,              U               ],
-                        [       n,              N               ]       };
-    key <AD08> {        [       i,              I               ],
-                        [       z,              Z               ]       };
-    key <AD09> {        [       o,              O               ],
-                        [       emacron,        Emacron         ]       };
-    key <AD10> {        [       p,              P               ],
-                        [       ccaron,         Ccaron          ]       };
-    key <AD11> {        [       bracketleft,    braceleft       ],
-                        [       zcaron,         Zcaron          ]       };
-    key <AD12> {        [       bracketright,   braceright      ],
-                        [       h,              h               ]       };
-    key <AC01> {        [       a,              A               ],
-                        [       scaron,         Scaron          ]       };
-    key <AC02> {        [       s,              S               ],
-                        [       u,              U               ]       };
-    key <AC03> {        [       d,              D               ],
-                        [       s,              S               ]       };
-    key <AC04> {        [       f,              F               ],
-                        [       i,              I               ]       };
-    key <AC05> {        [       g,              G               ],
-                        [       l,              L               ]       };
-    key <AC06> {        [       h,              H               ],
-                        [       d,              D               ]       };
-    key <AC07> {        [       j,              J               ],
-                        [       a,              A               ]       };
-    key <AC08> {        [       k,              K               ],
-                        [       t,              T               ]       };
-    key <AC09> {        [       l,              L               ],
-                        [       e,              E               ]       };
-    key <AC10> {        [       semicolon,      colon           ],
-                        [       C,              c               ]       };
-    key <AC11> {        [       apostrophe,     quotedbl        ],
-                        [       degree,         apostrophe      ]       };
-    key <AC12> {        [       degree,         brokenbar       ],
-                        [       kcedilla,       Kcedilla        ]       };
-    key <BKSL> {        [       degree,         bar             ]       };
-    key <LSGT> {        [       backslash,      bar             ],
-			[	gcedilla,	Gcedilla	]       };
-    key <AB01> {        [       z,              Z               ],
-                        [       ncedilla,       Ncedilla        ]       };
-    key <AB02> {        [       x,              X               ],
-                        [       b,              B               ]       };
-    key <AB03> {        [       c,              C               ],
-                        [       imacron,        Imacron         ]       };
-    key <AB04> {        [       v,              V               ],
-                        [       k,              K               ]       };
-    key <AB05> {        [       b,              B               ],
-                        [       p,              P               ]       };
-    key <AB06> {        [       n,              N               ],
-                        [       o,              O               ]       };
-    key <AB07> {        [       m,              M               ],
-                        [       amacron,        Amacron         ]       };
-    key <AB08> {        [       comma,          less            ],
-                        [       comma,        	semicolon       ]       };
-    key <AB09> {        [       period,         greater         ],
-                        [       period,          colon          ]       };
-    key <AB10> {        [       slash,          question        ],
-                        [       lcedilla,       Lcedilla        ]       };
-
-
-    // End alphanumeric section
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "lv(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "lv(Sundeadkeys)"
-
-};
--- a/src/xorg/keytables/sun-src/symbols/mk	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-// Author: Damjan Georgievski <[email protected]>
-// Revision: 1.4
-// Quick usage: setxkbmap -layout mk
-//
-// shift-leftALT and win95 menu key  toggles cyrillic/latin
-// rightALT and left win95-logo keys are Mode_switch
-// right win95-logo key is Multi_key (Compose)
-//
-// $XFree86$
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" { 
-    name[Group2]= "Macedonian";
-    key <TLDE> {  [ backslash,	bar				]	};
-    key <AE01> {  [	  1,	exclam 	], [ asciitilde		]	};
-    key <AE02> {  [	  2,	quotedbl			]	};
-    key <AE03> {  [	  3,	numbersign ], [ asciicircum	]	};
-    key <AE04> {  [       4,    dollar,    4,    dollar         ]       };
-    key <AE05> {  [       5,    percent,   5,    percent        ]       };
-    key <AE06> {  [	  6,	ampersand			]	};
-    key <AE07> {  [	  7,	slash ], [ quoteleft		]	};
-    key <AE08> {  [	  8,	parenleft			]	};
-    key <AE09> {  [	  9,	parenright			]	};
-    key <AE10> {  [	  0,	equal				]	};
-    key <AE11> {  [ apostrophe, question			]	};
-    key <AE12> {  [ plus,	asterisk			]	};
-    key <AD06> {  [ z, Z ], [     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key <AC02> {  [ ], [     Cyrillic_es,     Cyrillic_ES	]	};
-    key <AC01> {  [ ], [      Cyrillic_a,      Cyrillic_A	]	};
-    key <AD01> {  [ ], [    Cyrillic_lje,    Cyrillic_LJE	]	};
-    key <AD02> {  [ ], [    Cyrillic_nje,    Cyrillic_NJE	]	};
-    key <AB03> {  [ ], [    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key <AB02> {  [ ], [   Cyrillic_dzhe,   Cyrillic_DZHE	]	};
-    key <AC03> {  [ ], [     Cyrillic_de,     Cyrillic_DE	]	};
-    key <AD03> {  [ ], [     Cyrillic_ie,     Cyrillic_IE	]	};
-    key <AB04> {  [ ], [     Cyrillic_ve,     Cyrillic_VE	]	};
-    key <AC04> {  [ ], [     Cyrillic_ef,     Cyrillic_EF	]	};
-    key <AD05> {  [ ], [     Cyrillic_te,     Cyrillic_TE	]	};
-    key <AD04> {  [ ], [     Cyrillic_er,     Cyrillic_ER	]	};
-    key <AB06> {  [ ], [     Cyrillic_en,     Cyrillic_EN	]	};
-    key <AB05> {  [ ], [     Cyrillic_be,     Cyrillic_BE	]	};
-    key <AC06> {  [ ], [     Cyrillic_ha,     Cyrillic_HA	]	};
-    key <AC05> {  [ ], [    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key <AB01> {  [ y,  Y ], [   Macedonia_dse,   Macedonia_DSE	]	};
-    key <AB07> {  [ ], [     Cyrillic_em,     Cyrillic_EM	]	};
-    key <AC07> {  [ ], [     Cyrillic_je,     Cyrillic_JE	]	};
-    key <AD07> {  [ ], [      Cyrillic_u,      Cyrillic_U	]	};
-    key <AC08> {  [ ], [     Cyrillic_ka,     Cyrillic_KA	]	};
-    key <AD08> {  [ ], [      Cyrillic_i,      Cyrillic_I	]	};
-    key <AD09> {  [ ], [      Cyrillic_o,      Cyrillic_O	]	};
-    key <AC09> {  [ ], [     Cyrillic_el,     Cyrillic_EL	]	};
-    key <AC10> {  [ asciicircum, asciicircum ], [    Cyrillic_che,   Cyrillic_CHE	]	};
-    key <AD10> {  [ ], [     Cyrillic_pe,     Cyrillic_PE	]	};
-    key <AC11> {  [ section, section ], [   Macedonia_kje,   Macedonia_KJE	]	};
-    key <AD11> {  [  ], [    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key <AD12> {  [  ], [   Macedonia_gje,   Macedonia_GJE	]	};
-    key <BKSL> {  [ at,	at ], [    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key <AE04> {  [ ], [               4,          dollar	]	};
-    key <AE05> {  [ ], [               5,         percent	]	};
-    key <AB08> {  [ comma,       semicolon ]	};
-    key <AB09> {  [ period,           colon ]	};
-    key <AB10> {  [ minus,      underscore ]	};
-    key <LSGT> {	[       less,	greater  	]	};
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "group1" { 
-    name[Group1]= "Macedonian";
-    name[Group2]= "US/ASCII";
-    key <AB01> {  [  Cyrillic_ze,   Cyrillic_ZE	], [ z, Z ]	};
-    key <AC02> {  [  Cyrillic_es,   Cyrillic_ES	], [ s, S ]	};
-    key <AC01> {  [   Cyrillic_a,    Cyrillic_A	], [ a, A ]	};
-    key <AD01> {  [ Cyrillic_lje,  Cyrillic_LJE	], [ q, Q ]	};
-    key <AD02> {  [ Cyrillic_nje,  Cyrillic_NJE	], [ w, W ]	};
-    key <AD03> {  [  Cyrillic_ie,   Cyrillic_IE	], [ e, E ]	};
-    key <AD04> {  [  Cyrillic_er,   Cyrillic_ER	], [ r, R ]	};
-    key <AB03> {  [ Cyrillic_tse,  Cyrillic_TSE	], [ c, C ]	};
-    key <AB02> {  [Cyrillic_dzhe, Cyrillic_DZHE	], [ x, X ]	};
-    key <AC03> {  [  Cyrillic_de,   Cyrillic_DE	], [ d, D ]	};
-    key <AB04> {  [  Cyrillic_ve,   Cyrillic_VE	], [ v, V ]	};
-    key <AC04> {  [  Cyrillic_ef,   Cyrillic_EF	], [ f, F ]	};
-    key <AD05> {  [  Cyrillic_te,   Cyrillic_TE	], [ t, T ]	};
-    key <AB06> {  [  Cyrillic_en,   Cyrillic_EN	], [ n, N ]	};
-    key <AB05> {  [  Cyrillic_be,   Cyrillic_BE	], [ b, B ]	};
-    key <AC06> {  [  Cyrillic_ha,   Cyrillic_HA	], [ h, H ]	};
-    key <AC05> {  [ Cyrillic_ghe,  Cyrillic_GHE	], [ g, G ]	};
-    key <AD06> {  [Macedonia_dse, Macedonia_DSE	], [ y, Y ]	};
-    key <AB07> {  [  Cyrillic_em,   Cyrillic_EM	], [ m, M ]	};
-    key <AC07> {  [  Cyrillic_je,   Cyrillic_JE	], [ j, J ]	};
-    key <AD07> {  [   Cyrillic_u,    Cyrillic_U	], [ u, U ]	};
-    key <AC08> {  [  Cyrillic_ka,   Cyrillic_KA	], [ k, K ]	};
-    key <AD08> {  [   Cyrillic_i,    Cyrillic_I	], [ i, I ]	};
-    key <AD09> {  [   Cyrillic_o,    Cyrillic_O	], [ o, O ]	};
-    key <AD10> {  [  Cyrillic_pe,   Cyrillic_PE	], [ p, P ]	};
-    key <AC09> {  [  Cyrillic_el,   Cyrillic_EL	], [ l, L ]	};
-
-    key <AC10> {  [ Cyrillic_che,  Cyrillic_CHE	], [ semicolon, colon ] };
-    key <AC11> {  [Macedonia_kje, Macedonia_KJE	], [ quoteright, quotedbl ] }; 
-    key <AD11> {  [ Cyrillic_sha,  Cyrillic_SHA	], [ bracketleft, braceleft ] };
-    key <AD12> {  [Macedonia_gje, Macedonia_GJE	], [bracketright, braceright] };
-    key <BKSL> {  [ Cyrillic_zhe,  Cyrillic_ZHE	], [ backslash, bar ] };
-
-    key <AB10> {  [  slash,  question  ], [  slash, question  ] };
-    key <AE12> {  [  equal,       plus	], [ equal,       plus ] };
-    key <AE11> {  [  minus, underscore	], [ minus, underscore ] };
-    key <TLDE> {  [  grave, asciitilde	], [ grave, asciitilde ] };
-    key <AE01> {  [      1,     exclam	], [     1,     exclam ] };
-    key <AE02> {  [      2, doublelowquotemark ], [  2,     at ] };
-    key <AE03> {  [      3, leftdoublequotemark ], [  3, numbersign ] };
-    key <AE04> {  [      4,     dollar	], [     4,     dollar ] };
-    key <AE05> {  [      5,    percent	], [     5,    percent ] };
-    key <AE06> {  [      6,asciicircum	], [     6,asciicircum ] };
-    key <AE07> {  [      7,  ampersand	], [     7,  ampersand ] };
-    key <AE08> {  [      8,   asterisk	], [     8,   asterisk ] };
-    key <AE09> {  [      9,  parenleft	], [     9,  parenleft ] };
-    key <AE10> {  [      0, parenright	], [     0, parenright ] };
-    key <AB08> {  [  comma,  semicolon	], [  comma,    less	] };
-    key <AB09> {  [ period,      colon	], [ period, greater	] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "pc104" {
-    include "mk(basic)"
-    include "mk(win)"	
-};
-
-partial alphanumeric_keys
-xkb_symbols "win" {
-    key <RWIN> { [		Multi_key		]	};
-    key <LWIN> { [		Mode_switch		]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "mk(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "mk(Sundeadkeys)" // for naming consistency
-};
--- a/src/xorg/keytables/sun-src/symbols/mt	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-// Maltese keyboard map (based on MSA Standard DMS100)
-// by Ramon Casha ([email protected])
-//
-// $XFree86$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between the en_GB
-    // keyboard and the Maltese keyboard.
-
-    include "gb(basic)"
-    include "us(basic)"
-    name[Group1]= "Maltese";
-
-    // the following four sets are the four additional letters (C. G. H- Z.)
-    // Group 2 contains the UK equivalents
-    key <TLDE> {	[	cabovedot,	Cabovedot	],
-			[	grave,		notsign		] };
-    key <AE04> {        [       4,    dollar   ],
-			[       4,    dollar    ]           };
-    key <AE05> {  	[       5,    percent  ],
-			[	 5,    percent        ]       };
-    key <AD11> {	[	gabovedot,	Gabovedot	],
-			[	bracketleft,	braceleft	] };
-    key <AD12> {	[	hstroke,	Hstroke		],
-			[	bracketright,	braceright	] };
-    key <LSGT> {	[	zabovedot,	Zabovedot	],
-			[	backslash,	bar		] };
-
-    // Euro symbol
-    key <AE03> {	[	3,		EuroSign	],
-    			[	sterling			]	};
-
-    // Normal accented vowels
-    key <AD03> { [],	[	egrave,		Egrave		]	};
-    key <AD07> { [],	[	ugrave,		Ugrave		]	};
-    key <AD08> { [],	[	igrave,		Igrave		]	};
-    key <AD09> { [],	[	ograve,		Ograve		]	};
-    key <AC01> { [],	[	agrave,		Agrave		]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "us(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "mt(Sundeadkeys)" // for naming consistency
-};
-
--- a/src/xorg/keytables/sun-src/symbols/nl	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-// Converted keytable file to xkb/symbols/ file
-// with mk_xkb by [email protected] Tue Sep 30 00:53:29 MET DST 1997
-
-// converted from the nl-latin.map of the Linux kbd package by
-// Pablo Saratxaga <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Nederland keyboard
-
-    // Alphanumeric section
-    name[Group1]= "Nederland";
-
-    key <AE01> {	[         1,	exclam   	],
-			[ onesuperior			]	};
-    key <AE02> {	[         2,	quotedbl 	],
-			[ twosuperior			]	};
-    key <AE03> {	[         3,	numbersign	],
-			[ threesuperior			]	};
-    key <AE04> {	[         4,	dollar   	],
-			[ onequarter			]	};
-    key <AE05> {	[         5,	percent  	],
-			[ onehalf			]	};
-    key <AE06> {	[         6,	ampersand	],
-			[ threequarters			]	};
-    key <AE07> {	[         7,	underscore	],
-			[  sterling			]	};
-    key <AE08> {	[         8,	parenleft	],
-			[ braceleft			]	};
-    key <AE09> {	[         9,	parenright	],
-			[ braceright			]	};
-    key <AE10> {	[         0,	quoteright	],	
-			[ quoteleft                     ]       };              
-    key <AE11> {	[     slash,	question 	],
-			[ backslash			]	};
-    key <AE12> {	[    degree,	dead_tilde	],
-			[ dead_cedilla			]	};
-    key <AD03> {	[         e,	E        	],
-			[    EuroSign		   	]	};
-    key <AD04> {	[         r,	R        	],
-			[ paragraph			]	};
-    key <AD05> {	[         t,	T        	]	};
-    key <AD06> {	[         y,	Y        	]	};
-    key <AD07> {	[         u,	U        	]	};
-    key <AD08> {	[         i,	I        	]	};
-    key <AD09> {	[         o,	O        	]	};
-    key <AD10> {	[         p,	P        	]	};
-    key <AD11> {	[ dead_diaeresis,	dead_circumflex	],
-			[ asciitilde,	asciicircum	]	};
-    key <AD12> {	[  asterisk,	bar      	],
-                        [  asciitilde 			]	};
-    key <AC01> {	[         a,	A        	]	};
-    key <AC02> {	[         s,	S        	],
-			[    ssharp			]	};
-    key <AC03> {	[         d,	D        	]	};
-    key <AC04> {	[         f,	F        	]	};
-    key <AC10> {	[      plus,	plusminus	]	};
-    key <AC11> {	[ dead_acute,   dead_grave    	],
-			[ apostrophe,	grave		]	};
-    key <TLDE> {	[        at,	section  	],
-			[   notsign			]	};
-    key <BKSL> {	[      less,	greater  	],	
-                        [   asciicircum                 ]       };
-    key <AB01> {	[         z,	Z        	],
-			[ guillemotleft			]	};
-    key <AB02> {	[         x,	X        	],
-			[ guillemotright		]	};
-    key <AB03> {	[         c,	C        	],
-			[      cent			]	};
-    key <AB06> {	[         n,	N        	]	};
-    key <AB07> {	[         m,	M        	],
-			[  Greek_mu,	Greek_mu	]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon    	],	
-			[ periodcentered		]	};
-    key <AB10> {	[     minus,	equal    	]	};
-    key <LSGT> {	[ bracketleft,	bracketright	],
-			[ brokenbar			]	};
-
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "nl(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "nl(Sundeadkeys)"
-
-};
--- a/src/xorg/keytables/sun-src/symbols/no	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-// $Xorg: no,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/no,v 3.9 2001/01/17 23:45:59 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys 
- xkb_symbols "basic" {
- 
-     // Describes the differences between a very simple en_US
-    // keyboard and a Norwegian keyboard with dead key support
-    // and all of ISO-8859-1 characters available.
- 
-     name[Group1]= "Norwegian";
- 
-    key <TLDE> {	[             bar,         section      ],
-			[       brokenbar       		]};
-    key <LSGT> {	[	     less,	   greater	]};
-    key <SPCE> {	[	    space,	     space	],
-			[    nobreakspace,    nobreakspace	]};
-    key <AE01> {	[               1,          exclam  	]};
-    key <AE02> {	[               2,        quotedbl  	],
-			[	       at    			]};
-    key <AE03> {	[              	3,	numbersign	],
-			[	 sterling   			]};
-    key <AE04> {	[               4,        currency     	],
-			[	   dollar			]};
-    key <AE05> {	[               5,         percent     	],
-			[       asciitilde			]};
-    key <AE06> {	[               6,       ampersand     	],
-			[     asciicircum			]};
-    key <AE07> {	[               7,           slash     	],
-			[       braceleft        		]};
-    key <AE08> {	[               8,       parenleft     	],
-			[     bracketleft   			]};
-    key <AE09> {	[               9,      parenright     	],
-			[    bracketright  			]};
-    key <AE10> {	[               0,           equal     	],
-                        [      braceright 	                ]};
-    key <AB08> {	[           comma,       semicolon     	]};
-    key <AB09> {	[          period,           colon     	]};
-    key <AB03> {        [               c,               C      ],
-                        [       copyright,        NoSymbol      ]};
-    key <AB10> {	[           minus,      underscore     	]};
-    key <AC01> {        [               a,               A      ]};
-    key <AC03> {        [               d,               D      ]};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign,            cent      ]};
-    key <AD04> {        [               r,               R      ]};
-    key <AD05> {        [               t,               T      ]};
-    key <AD09> {        [               o,               O      ]};
-    key	<AC10> {	[	   oslash,        Oslash 	]}; 
-    key <AE11> {	[            plus,        question      ]};
-    key <AC11> {	[	      ae,	        AE	]};
-    key <BKSL> {	[      apostrophe,        asterisk	],
-                 	[ 	grave			        ]};
-    key <AD11> {	[	    aring,           Aring 	]};
-    key <AE12> {   	[       backslash,      dead_grave      ],
-                 	[      dead_acute          	        ]};
-    key <AD12> {   	[  dead_diaeresis, dead_circumflex      ],
-                 	[      dead_tilde       	        ]};
-
- 
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "no(basic)"
-
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "no(Sundeadkeys)"
-
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic Norwegian layout to eliminate dead keys
-
-    include "no(basic)"
-    key <AE12> {	[       backslash,           grave	],
-			[	    acute,          ogonek 	]	};
-    key <AD12> {	[       diaeresis,     asciicircum     	],	
-			[      asciitilde,          macron     	]      	};
-
-};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/pc	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,152 @@
+// $XKeyboardConfig$
+
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc,v 1.9 2003/06/09 19:59:46 dawes Exp $
+
+default partial alphanumeric_keys modifier_keys 
+xkb_symbols "pc105" {
+
+    key <ESC>  {	[ Escape			]	};
+
+    // the extra key on most European keyboards
+    key <LSGT> {	[      less,    greater,          bar,    brokenbar ]	};
+
+    // these keys are common to all layouts
+    key <BKSL> {	[ backslash,	bar		]	};
+    key <SPCE> {	[ 	 space			]	};
+
+    include "pc(function)"
+    include "pc(editing)"
+    include "keypad(x11)"
+
+    key <BKSP> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ BackSpace,   Terminate_Server ]
+    };
+
+    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+    key <RTRN> {	[ Return	]	};
+
+    key <CAPS> {	[ Caps_Lock	]	};
+
+    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
+
+    key <LFSH> {	[ Shift_L	]	};
+    key <LCTL> {	[ Control_L	]	};
+
+    key <LWIN> {	[ Super_L			]	};
+
+    key <RTSH> {	[ Shift_R	]	};
+    key <RCTL> {	[ Control_R	]	};
+
+    key <RWIN> {	[ Super_R			]	};
+
+    key <MENU> {	[ Menu			]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod2   { Num_Lock };
+
+    //  Fake keys for virtual<->real modifiers mapping 
+    key <LVL3> {	[ ISO_Level3_Shift	]	};
+    key <MDSW> {	[ Mode_switch 		]	};
+    modifier_map Mod5   { <LVL3>, <MDSW> };
+
+    key <ALT>  {	[ NoSymbol, Alt_L	]	};
+    include "altwin(meta_alt)"
+
+    key <META> {	[ NoSymbol, Meta_L	]	};
+    modifier_map Mod1   { <META> };
+
+    key <SUPR> {	[ NoSymbol, Super_L	]	};
+    modifier_map Mod4   { <SUPR> };
+
+    key <HYPR> {	[ NoSymbol, Hyper_L	]	};
+    modifier_map Mod4   { <HYPR> };
+
+    key <OUTP> { [ XF86Display ] };
+    key <KITG> { [ XF86KbdLightOnOff ] };
+    key <KIDN> { [ XF86KbdBrightnessDown ] };
+    key <KIUP> { [ XF86KbdBrightnessUp ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "function" {
+    key <FK01> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]
+    };
+    key <FK02> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]
+    };
+    key <FK03> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]
+    };
+    key <FK04> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]
+    };
+    key <FK05> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]
+    };
+    key <FK06> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]
+    };
+    key <FK07> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]
+    };
+    key <FK08> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]
+    };
+    key <FK09> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]
+    };
+    key <FK10> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]
+    };
+    key <FK11> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]
+    };
+    key <FK12> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]
+    };
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "editing" {
+    key <PRSC> {
+	type= "PC_ALT_LEVEL2",
+	symbols[Group1]= [ Print, Sys_Req ]
+    };
+    key <SCLK> {  [  Scroll_Lock	]	};
+    key <PAUS> {
+	type= "PC_CONTROL_LEVEL2",
+	symbols[Group1]= [ Pause, Break ]
+    };
+    key  <INS> {	[  Insert		]	};
+    key <HOME> {	[  Home			]	};
+    key <PGUP> {	[  Prior		]	};
+    key <DELE> {	[  Delete		]	};
+    key  <END> {	[  End			]	};
+    key <PGDN> {	[  Next			]	};
+
+    key   <UP> {	[  Up			]	};
+    key <LEFT> {	[  Left			]	};
+    key <DOWN> {	[  Down			]	};
+    key <RGHT> {	[  Right		]	};
+};
+
--- a/src/xorg/keytables/sun-src/symbols/pc/bg	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,271 +0,0 @@
-// $Xorg: ca,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-//////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1999, 2000 by Anton Zinoviev <[email protected]>
-//
-// This software may be used, modified, copied, distributed, and sold,
-// in both source and binary form provided that the above copyright
-// and these terms are retained. Under no circumstances is the author
-// responsible for the proper functioning of this software, nor does
-// the author assume any responsibility for damages incurred with its
-// use.
-//
-////////////////////////////////////////////////////////////////////////// 
-
-// $XFree86: xc/programs/xkbcomp/symbols/bg,v 3.2 2000/11/06 19:24:10 dawes Exp $
-
-// Version 1.6r1
-
-// Thanks to Ivan Pascal <[email protected]> for improvements in this file.
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-  // Describes the differences between a very simple en_US keyboard
-  // and a very simple Bulgarian keyboard.
-
-  name[Group1]= "Bulgaria";
-  
-  key <TLDE> { 	 [ quoteleft,         asciitilde	  ]    };
-  key <AE01> {   [ 1,                 exclam              ]    };
-  key <AE02> {   [ 2,                 at                  ],
-		 [ 2,		      question		  ]    };
-  key <AE03> {   [ 3,                 numbersign          ],
-                 [ 3,                 plus                ]    };
-  key <AE04> {   [ 4,                 dollar              ],
-                 [ 4,                 quotedbl            ]    };
-  key <AE05> {   [ 5,                 percent             ]    };
-  key <AE06> {   [ 6,                 asciicircum         ],
-                 [ 6,                 equal               ]    };
-  key <AE07> {   [ 7,                 ampersand           ],
-                 [ 7,                 colon               ]    };
-  key <AE08> {   [ 8,                 asterisk            ],
-                 [ 8,                 slash               ]    };
-  key <AE09> {   [ 9,                 parenleft           ],
-                 [ 9,                 underscore          ]    };
-  key <AE10> {   [ 0,                 parenright          ],
-                 [ 0,                 numerosign          ]    };
-  key <AE11> {   [ minus,             underscore          ],
-                 [ minus,             I                   ]    };
-  key <AE12> {   [ equal,             plus                ],
-                 [ period,            V                   ]    };
-
-  key <AD01> {   [ q,                 Q                   ],
-                 [ Cyrillic_yeru,    Cyrillic_YERU       ]    };
-  key <AD02> {   [ w,                 W                   ],
-                 [ Cyrillic_u,        Cyrillic_U          ]    };
-  key <AD03> {   [ e,                 E                   ],
-                 [ Cyrillic_ie,          Cyrillic_IE         ]    };
-  key <AD04> {   [ r,                 R                   ],
-                 [ Cyrillic_i,        Cyrillic_I          ]    };
-  key <AD05> {   [ t,                 T                   ],
-                 [ Cyrillic_sha,      Cyrillic_SHA        ]    };
-  key <AD06> {   [ y,                 Y                   ],
-                 [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
-  key <AD07> {   [ u,                 U                   ],
-                 [ Cyrillic_ka,       Cyrillic_KA         ]    };
-  key <AD08> {   [ i,                 I                   ],
-                 [ Cyrillic_es,       Cyrillic_ES         ]    };
-  key <AD09> {   [ o,                 O                   ],
-                 [ Cyrillic_de,       Cyrillic_DE         ]    };
-  key <AD10> {   [ p,                 P                   ],
-                 [ Cyrillic_ze,       Cyrillic_ZE         ]    };
-  key <AD11> {   [ bracketleft,       braceleft           ],
-                 [ Cyrillic_tse,      Cyrillic_TSE        ]    };
-  key <AD12> {   [ bracketright,      braceright          ],
-                 [ semicolon,         section             ]    };
-
-  key <AC01> {   [ a,                 A                   ],
-                 [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
-  key <AC02> {   [ s,                 S                   ],
-                 [ Cyrillic_ya,       Cyrillic_YA         ]    };
-  key <AC03> {   [ d,                 D                   ],
-                 [ Cyrillic_a,        Cyrillic_A          ]    };
-  key <AC04> {   [ f,                 F                   ],
-                 [ Cyrillic_o,        Cyrillic_O          ]    };
-  key <AC05> {   [ g,                 G                   ],
-                 [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
-  key <AC06> {   [ h,                 H                   ],
-                 [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
-  key <AC07> {   [ j,                 J                   ],
-                 [ Cyrillic_te,       Cyrillic_TE         ]    };
-  key <AC08> {   [ k,                 K                   ],
-                 [ Cyrillic_en,       Cyrillic_EN         ]    };
-  key <AC09> {   [ l,                 L                   ],
-                 [ Cyrillic_ve,       Cyrillic_VE         ]    };
-  key <AC10> {   [ semicolon,         colon               ],
-                 [ Cyrillic_em,       Cyrillic_EM         ]    };
-  key <AC11> {   [ quoteright,        quotedbl            ],
-                 [ Cyrillic_che,      Cyrillic_CHE        ]    };
-  key <BKSL> {   [ backslash,         bar                 ],
-                 [ parenleft,         parenright       	  ]    };
-
-  key <LSGT> {   [ less,              greater             ]    };
-  key <AB01> {   [ z,                 Z                   ],
-                 [ Cyrillic_yu,       Cyrillic_YU         ]    };
-  key <AB02> {   [ x,                 X                   ],
-                 [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
-  key <AB03> {   [ c,                 C                   ],
-                 [ Cyrillic_hardsign, Cyrillic_HARDSIGN   ]    };
-  key <AB04> {   [ v,                 V                   ],
-                 [ Cyrillic_e,        Cyrillic_E          ]    };
-  key <AB05> {   [ b,                 B                   ],
-                 [ Cyrillic_ef,       Cyrillic_EF         ]    };
-  key <AB06> {   [ n,                 N                   ],
-                 [ Cyrillic_ha,       Cyrillic_HA         ]    };
-  key <AB07> {   [ m,                 M                   ],
-                 [ Cyrillic_pe,       Cyrillic_PE         ]    };
-  key <AB08> {   [ comma,             less                ],
-                 [ Cyrillic_er,       Cyrillic_ER         ]    };
-  key <AB09> {   [ period,            greater             ],
-                 [ Cyrillic_el,       Cyrillic_EL         ]    };
-  key <AB10> {   [ slash,             question            ],
-                 [ Cyrillic_be,       Cyrillic_BE         ]    };
-    
-  // End alphanumeric section
-
-
-  // Begin modifier mappings 
-  
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "phonetic" {
-  
-  // Describes the differences between a very simple en_US keyboard
-  // and a very simple Bulgarian phonetic keyboard.
-
-  name[Group1]= "Bulgaria - Phonetic";
-  
-  key <TLDE> {   [ quoteleft,         asciitilde          ],
-                 [ Cyrillic_che,      Cyrillic_CHE        ]   };
-  key <AE01> {   [ 1,                 exclam              ]   };
-  key <AE02> {   [ 2,                 at                  ]   };
-  key <AE03> {   [ 3,                 numbersign          ]   };
-  key <AE04> {   [ 4,                 dollar              ]   };
-  key <AE05> {   [ 5,                 percent             ]   };
-  key <AE06> {   [ 6,                 asciicircum         ]   };
-  key <AE07> {   [ 7,                 ampersand           ]   };
-  key <AE08> {   [ 8,                 asterisk            ]   };
-  key <AE09> {   [ 9,                 parenleft           ]   };
-  key <AE10> {   [ 0,                 parenright          ]   };
-  key <AE11> {   [ minus,             underscore          ]   };
-  key <AE12> {   [ equal,             plus                ]   };
-
-  key <AD01> {   [ q,                 Q                   ],
-                 [ Cyrillic_ya,       Cyrillic_YA         ]    };
-  key <AD02> {   [ w,                 W                   ],
-                 [ Cyrillic_ve,       Cyrillic_VE         ]    };
-  key <AD03> {   [ e,                 E                   ],
-                 [ EuroSign,          Cyrillic_IE         ]    };
-  key <AD04> {   [ r,                 R                   ],
-                 [ Cyrillic_er,       Cyrillic_ER         ]    };
-  key <AD05> {   [ t,                 T                   ],
-                 [ Cyrillic_te,       Cyrillic_TE         ]    };
-  key <AD06> {   [ y,                 Y                   ],
-                 [ Cyrillic_hardsign, Cyrillic_HARDSIGN   ]    };
-  key <AD07> {   [ u,                 U                   ],
-                 [ Cyrillic_u,        Cyrillic_U          ]    };
-  key <AD08> {   [ i,                 I                   ],
-                 [ Cyrillic_i,        Cyrillic_I          ]    };
-  key <AD09> {   [ o,                 O                   ],
-                 [ Cyrillic_o,        Cyrillic_O          ]    };
-  key <AD10> {   [ p,                 P                   ],
-                 [ Cyrillic_pe,       Cyrillic_PE         ]    };
-  key <AD11> {   [ bracketleft,       braceleft           ],
-                 [ Cyrillic_sha,      Cyrillic_SHA        ]    };
-  key <AD12> {   [ bracketright,      braceright          ],
-                 [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
-
-  key <AC01> {   [ a,                 A                   ],
-                 [ Cyrillic_a,        Cyrillic_A          ]    };
-  key <AC02> {   [ s,                 S                   ],
-                 [ Cyrillic_es,       Cyrillic_ES         ]    };
-  key <AC03> {   [ d,                 D                   ],
-                 [ Cyrillic_de,       Cyrillic_DE         ]    };
-  key <AC04> {   [ f,                 F                   ],
-                 [ Cyrillic_ef,       Cyrillic_EF         ]    };
-  key <AC05> {   [ g,                 G                   ],
-                 [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
-  key <AC06> {   [ h,                 H                   ],
-                 [ Cyrillic_ha,       Cyrillic_HA         ]    };
-  key <AC07> {   [ j,                 J                   ],
-                 [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
-  key <AC08> {   [ k,                 K                   ],
-                 [ Cyrillic_ka,       Cyrillic_KA         ]    };
-  key <AC09> {   [ l,                 L                   ],
-                 [ Cyrillic_el,       Cyrillic_EL         ]    };
-  key <AC10> {   [ semicolon,         colon               ]    };
-  key <AC11> {   [ quoteright,        quotedbl            ]    };
-  key <BKSL> {   [ backslash,         bar                 ],
-                 [ Cyrillic_yu,       Cyrillic_YU         ]    };
-
-  key <LSGT> {   [ less,              greater             ]    };
-  key <AB01> {   [ z,                 Z                   ],
-                 [ Cyrillic_ze,       Cyrillic_ZE         ]    };
-  key <AB02> {   [ x,                 X                   ],
-                 [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
-  key <AB03> {   [ c,                 C                   ],
-                 [ Cyrillic_tse,      Cyrillic_TSE        ]    };
-  key <AB04> {   [ v,                 V                   ],
-                 [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
-  key <AB05> {   [ b,                 B                   ],
-                 [ Cyrillic_be,       Cyrillic_BE         ]    };
-  key <AB06> {   [ n,                 N                   ],
-                 [ Cyrillic_en,       Cyrillic_EN         ]    };
-  key <AB07> {   [ m,                 M                   ],
-                 [ Cyrillic_em,       Cyrillic_EM         ]    };
-  key <AB08> {   [ comma,             less                ]    };
-  key <AB09> {   [ period,            greater             ]    };
-  key <AB10> {   [ slash,             question            ]    };
-
-  // End alphanumeric section
-
-  // Begin modifier mappings 
-  
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "bg(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "bg(Sundeadkeys)" // for naming consistency
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "bg(basic)" // for naming consistency
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/by	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-//
-// belarusian standard keyboard 
-// Alexander Mikhailian <[email protected]>
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Belarusian keybaord
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Belarusian";
-
-    key	<TLDE> {	[	    grave,	asciitilde	],
-			[     Cyrillic_io,     Cyrillic_IO	]	};
-    key	<LSGT> {	[		less,		   greater	],
-			[		bar,	brokenbar	]	};
-    key	<AD01> {	[		q,		 Q	],
-			[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<AE01> {	[		1,	    exclam	]	};
-    key	<AB01> {	[		z,		 Z	],
-			[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<AC02> {	[		s,		 S	],
-			[   Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<AC01> {	[		a,		 A	],
-			[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<AD02> {	[		w,		 W	],
-			[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<AE02> {	[		2,		at	],
-			[		at,        quotedbl	]	};
-    key	<AB03> {	[		c,		 C	],
-			[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<AB02> {	[		x,		 X	],
-			[    Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AC03> {	[		d,		 D	],
-			[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<AD03> {	[		e,		 E	],
-			[      Cyrillic_u,	Cyrillic_U	]	};
-    key	<AE04> {	[		4,	    dollar	],
-			[	currency,        semicolon	]	};
-    key	<AE03> {	[		3,	numbersign	],
-			[	numbersign,     numerosign	]	};
-    key	<AB04> {	[		v,		 V	],
-			[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<AC04> {	[		f,		 F	],
-			[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<AD05> {	[		t,		 T	],
-			[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<AD04> {	[		r,		 R	],
-			[     Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[		5,	   comma	]	};
-    key	<AB06> {	[		n,		 N	],
-			[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<AB05> {	[		b,		 B	],
-			[     Ukrainian_i,     Ukrainian_I	]	};
-    key	<AC06> {	[		h,		 H	],
-			[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<AC05> {	[		g,		 G	],
-			[     Cyrillic_pe,     Cyrillic_PE	]	};
-    key	<AD06> {	[		y,		 Y	],
-			[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[	asciicircum,	     colon	]	};
-    key	<AB07> {	[		m,		 M	],
-			[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<AC07> {	[		j,		 J	],
-			[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<AD07> {	[		u,		 U	],
-			[    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[	ampersand,	    question	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[	dollar,		dollar		]	};
-    key	<AB08> {	[	    comma,	      less	],
-			[     Cyrillic_be,          Cyrillic_BE	]	};
-    key	<AC08> {	[		k,		 K	],
-			[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<AD08> {	[		i,		 I	],
-			[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AD09> {	[		o,		 O	],
-			[  Byelorussian_shortu,  Byelorussian_SHORTU	]	};
-    key	<AE10> {	[		0,	parenright	],
-			[		0,	parenright	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[		9,	 parenleft	]	};
-    key	<AB09> {	[	   period,	   greater	],
-			[     Cyrillic_yu,       Cyrillic_YU	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	    slash,	     comma	]	};
-    key	<AC09> {	[		l,		 L	],
-			[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<AC10> {	[	semicolon,	     colon	],
-			[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<AD10> {	[		p,		 P	],
-			[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<AE11> {	[	    minus,	underscore	],
-			[	    minus,	underscore	]	};
-    key	<AC11> {	[      apostrophe,	  quotedbl	],
-			[      bar,	      Cyrillic_E	]	};
-    key	<AD11> {	[     bracketleft,	 braceleft	],
-			[     bracketleft,     Cyrillic_HA	]	};
-    key	<AE12> {	[	    equal,	      plus	],
-			[	    equal,	      plus	]	};
-    key	<AD12> {	[    bracketright,	braceright	],
-			[	bracketright,	apostrophe	]	};
-    key	<BKSL> {	[	backslash,	       bar	],
-			[	backslash,	slash		]	};
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "winkeys" {
-    include "by(basic)"
-    key	<AE04> {	[		4,	    dollar	],
-			[		4,       semicolon	]	};
-    key	<AE03> {	[		3,	numbersign	],
-			[		3,      numbersign	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[		5,	   percent	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[		6,	     colon	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[		7,	  question	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[		8,	  asterisk	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	   period,	     comma	]	};
-    key	<BKSL> {	[	backslash,	       bar	],
-			[	    slash,             bar	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "by(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "by(Sundeadkeys)" // for naming consistency
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/ca_bi	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "basic" {
-    include "us(basic)"
-    include "ca_bi(basic)"
-
-   key <TLDE> { [ slash, bar           ], [ backslash                  ]};
-   key <AE01> { [ 1, exclam            ], [ plusminus                  ]};
-   key <AE02> { [ 2, at                ]                                };
-   key <AE03> { [ 3, numbersign        ], [ sterling                   ]};
-   key <AE04> { [ 4, dollar            ], [ cent                       ]};
-   key <AE05> { [ 5, percent           ], [ currency                   ]};
-   key <AE06> { [ 6, question 	       ], [ notsign	               ]};
-   key <AE07> { [ 7, ampersand         ], [ braceleft                  ]};
-   key <AE08> { [ 8, asterisk          ], [ braceright                 ]};
-   key <AE09> { [ 9, parenleft         ], [ bracketleft                ]};
-   key <AE10> { [ 0, parenright        ], [ bracketright               ]};
-   key <AE11> { [ minus, underscore    ], [ onehalf	               ]};
-   key <AE12> { [ equal, plus          ], [ notsign                    ]};
-  
-   key <AD03> { [ e, E                 ], [ EuroSign		       ]};
-   key <AD09> { [ o, O		       ], [ section		       ]};
-   key <AD10> { [ p, P                 ], [ paragraph                  ]};
-   key <AD11> { [ dead_circumflex, dead_diaeresis], [ dead_grave       ]};
-   key <AD12> { [ ccedilla, Ccedilla   ], [ asciitilde                 ]};
-
-   key <AC10> { [ semicolon, colon     ], [ degree                     ]};
-   key <AC11> { [ egrave, Egrave       ], [ braceleft                  ]};
-   key <AC12> { [ agrave, Agrave       ], [ braceright                 ]};
-   key <BKSL> { [ agrave, Agrave       ], [ braceright                 ]};
-
-   key <LSGT> { [ uacute, Uacute       ]                                };
-   key <AB01> { [ z, Z                 ], [ guillemotleft              ]};
-   key <AB02> { [ x, X                 ], [ guillemotright             ]};
-   key <AB07> { [ m, M                 ], [ mu                         ]};
-   key <AB08> { [ comma, quoteright    ], [ less                       ]};
-   key <AB09> { [ period, quotedbl     ], [ greater                    ]};
-   key <AB10> { [ eacute, Eacute       ], [ quoteleft                  ]};
-   
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "ca_bi(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "ca_bi(Sundeadkeys)"
-}; 
--- a/src/xorg/keytables/sun-src/symbols/pc/ca_enhanced	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-// This file was inspired by XFree86 version 3.3.2
-// as distributed with RedHat Linux 5.1
-// This file was created by Eric Moreau, 1998-09-27
-// I am reachable at [email protected]
-//
-// $XFree86$
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Those are intened to be modifications to the symbols
-// defined by /usr/X11R6/lib/X11/xkb/symbols/ca
-//
-// Most of the french canadian keyboards availables on PCs
-// are mapped like this.
-// Note that I remaped the ISO9995-3 keyboard but took
-// care of not loosing symbols.
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-    include "ca(basic)"
-    key <TLDE> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ numbersign, bar, backslash ],
-		symbols[Group2]= [ backslash, exclamdown ]
-		};
-    key <AE01> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 1, exclam, plusminus ],
-		symbols[Group2]= [ plusminus, onesuperior ]
-		};
-    key <AE02> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 2, quotedbl, at ],
-		symbols[Group2]= [ at, oneeighth ]
-		};
-    key <AE03> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 3, slash, sterling ],
-		symbols[Group2]= [ sterling ]
-		};
-    key <AE04> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 4, dollar, cent ],
-		symbols[Group2]= [ cent ]
-		};
-    key <AE05> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 5, percent, currency ],
-		symbols[Group2]= [ currency, threeeighths ]
-		};
-    key <AE06> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 6, question, notsign ],
-		symbols[Group2]= [ notsign, fiveeighths ]
-		};
-    key <AE07> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 7, ampersand, brokenbar ],
-		symbols[Group2]= [ brokenbar, seveneighths ]
-		};
-    key <AE08> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 8, asterisk, twosuperior ],
-		symbols[Group2]= [ twosuperior, trademark ]
-		};
-    key <AE09> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 9, parenleft, threesuperior ],
-		symbols[Group2]= [ threesuperior ]
-		};
-    key <AE10> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ 0, parenright, onequarter ],
-		symbols[Group2]= [ onequarter ]
-		};
-    key <AE11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ minus, underscore, onehalf ],
-		symbols[Group2]= [ onehalf, questiondown ]
-		};
-    key <AE12> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ equal, plus, threequarters ],
-		symbols[Group2]= [ threequarters, dead_ogonek ]
-		};
-
-    key <AD01> {
-		symbols[Group1]= [ q, Q ],
-		symbols[Group2]= [ oslash, Ooblique ]
-		};
-    key <AD04> {
-		symbols[Group1]= [ r, R ],
-		symbols[Group2]= [ thorn, Thorn ]
-		};
-    key <AD09> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ o, O, section ],
-		symbols[Group2]= [ section, Greek_OMEGA ]
-		};
-    key <AD10> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ p, P, paragraph ],
-		symbols[Group2]= [ paragraph, registered ]
-		};
-    key <AD11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ dead_circumflex, dead_circumflex, bracketleft ],
-		symbols[Group2]= [ bracketleft, dead_abovering ]
-		};
-    key <AD12> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ dead_cedilla, dead_diaeresis, bracketright ],
-		symbols[Group2]= [ bracketright, horizconnector ]
-		};
-
-    key <AC10> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ semicolon, colon, asciitilde ],
-		symbols[Group2]= [ asciitilde, dead_doubleacute ]
-		};
-    key <AC11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ dead_grave, dead_grave, braceleft ],
-		symbols[Group2]= [ braceleft, dead_caron ]
-		};
-
-    key <AB01> {
-		symbols[Group1]= [ z, Z ],
-		symbols[Group2]= [ dead_belowdot, dead_abovedot ]
-		};
-    key <AB07> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ m, M, mu ],
-		symbols[Group2]= [ mu, masculine ]
-		};
-    key <AB08> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ comma, quoteright, horizconnector ],
-		symbols[Group2]= [ dead_macron, multiply ]
-		};
-    key <AB09> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ period, period, periodcentered ],
-		symbols[Group2]= [ periodcentered, division ]
-		};
-    key <AB10> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ eacute, Eacute, dead_acute ],
-		symbols[Group2]= [ dead_acute ]
-		};
-    key <BKSL> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ less, greater, braceright ],
-		symbols[Group2]= [ braceright, dead_breve ]
-		};
-
-    key <LSGT> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ guillemotleft, guillemotright, degree ],
-		symbols[Group2]= [ degree ]
-		};
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "ca_enhanced(basic)"    
-    key <AD11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ SunFA_Circum, SunFA_Circum, bracketleft ],
-		symbols[Group2]= [ bracketleft, dead_abovering ]
-		};
-    key <AD12> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ SunFA_Cedilla, SunFA_Diaeresis, bracketright ],
-		symbols[Group2]= [ bracketright, horizconnector ]
-		};
-    key <AC11> {
-		type[Group1]="THREE_LEVEL",
-		symbols[Group1]= [ SunFA_Grave, SunFA_Grave, braceleft ],
-		symbols[Group2]= [ braceleft, dead_caron ]
-		};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "ca_enhanced(Sundeadkeys)"
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/cz	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/cz,v 1.1 2001/05/18 23:35:35 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial alphanumeric_keys 
-xkb_symbols "basic" {
-     
-     // Describes the differences between a very simple en_US
-     // keyboard and a Czech keyboard
-     // This layout conforms to a new cz compromise standard designed 
-     // to satisfy most unix, windows and mac users.
-     // 2001 by Kamil Toman <[email protected]>
-
-     // Switching to US added by Jan Holesovsky <[email protected]>, 2001
-
-    include "us(basic)"
-
-    name[Group1]= "Czech";
-
-    key <TLDE>	{ [ semicolon, dead_abovering 	]	};
-    key <AE01>	{ [      plus,          1 	],  
-		  [ asciitilde 			]	};
-    key <AE02>	{ [    ecaron,          2 	],  
-		  [ dead_caron 			]	};
-    key <AE03>	{ [    scaron,          3 	],  
-		  [ dead_circumflex 		] 	};
-    key <AE04>	{ [    ccaron,          4 	],  
-		  [ dead_breve 			]	};
-    key <AE05>	{ [    rcaron,          5 	],  
-		  [ dead_abovering 		] 	};
-    key <AE06>	{ [    zcaron,          6 	],  
-		  [ dead_ogonek 		]	};
-    key <AE07>	{ [    yacute,          7 	],  
-		  [ grave 			]	};
-    key <AE08>	{ [    aacute,          8 	],  
-		  [ dead_abovedot		]	};
-    key <AE09>	{ [    iacute,          9 	],  
-		  [ dead_acute 			]	};
-    key <AE10>	{ [    eacute,          0 	],  
-		  [ dead_doubleacute 		] 	};
-    key <AE11>	{ [     equal,    percent 	],  
-		  [ dead_diaeresis 		]	};
-    key <AE12>	{ [ dead_acute, dead_caron 	], 
-		  [ dead_cedilla 		]	};
-
-    key <AD01>	{ [         q,          Q 	], 
-		  [  backslash 			]	};
-    key <AD02>	{ [         w,          W 	], 
-		  [       bar 			]	};
-    key <AD03>	{ [         e,          E 	], 
-		  [    EuroSign 		]	};
-    key <AD04>	{ [         r,          R 	]	};
-    key <AD05>	{ [         t,          T 	]	};
-    key <AD06>	{ [         z,          Z 	]	};
-    key <AD07>	{ [         u,          U 	]	};
-    key <AD08>	{ [         i,          I 	]	};
-    key <AD09>	{ [         o,          O 	]	};
-    key <AD10>	{ [         p,          P 	]	};
-
-    key <AD11>	{ [    uacute,      slash 	], 
-		  [    division 		]	};
-    key <AD12>	{ [parenright,  parenleft 	], 
-		  [    multiply 		]	};
-
-    key <AC01>	{ [         a,          A 	]	};
-    key <AC02>	{ [         s,          S 	], 
-		  [   dstroke			]	};
-    key <AC03>	{ [         d,          D 	], 
-		  [     Dstroke 		]	};
-    key <AC04>	{ [         f,          F 	], 
-		  [ bracketleft 		]	};
-    key <AC05>	{ [         g,          G 	], 
-		  [ bracketright 		]	};
-    key <AC06>	{ [         h,          H 	]	};
-    key <AC07>	{ [         j,          J 	]	};
-    key <AC08>	{ [         k,          K 	], 
-		  [      lstroke 		]	};
-    key <AC09>	{ [         l,          L 	], 
-		  [      Lstroke 		]	};
-                  
-    key <AC10>	{ [     uring,   quotedbl 	], 
-		  [   dollar 			]	};
-    key <AC11>	{ [   section,     exclam 	], 
-		  [       ssharp 		]	};
-    key <BKSL>	{ [ dead_diaeresis, apostrophe 	], 
-		  [ currency 			]	};
-    key <LSGT>	{ [ ampersand,        asterisk 	], 
-		  [    less 			]	};
-    key <AB01>	{ [         y,          Y 	], 
-		  [     greater 		]	};
-    key <AB02>	{ [         x,          X 	], 
-		  [  numbersign 		]	};
-    key <AB03>	{ [         c,          C 	]	};
-    key <AB04>	{ [         v,          V 	], 
-		  [      at 			]	};
-    key <AB05>	{ [         b,          B 	],
-		  [ braceleft 			]	};
-    key <AB06>	{ [         n,          N 	],
-		  [ braceright 			]	};
-    key <AB07>	{ [         m,          M 	]	};
-    key <AB08>	{ [     comma,   question 	]	};
-    key <AB09>	{ [    period,      colon 	]	};
-    key <AB10>	{ [     minus, underscore 	]	};
-
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-include "cz(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-include "cz(Sundeadkeys)"
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/cz_qwerty	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/cz_qwerty,v 1.1 2001/05/18 23:35:35 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // This layout should work exactly as a cz with the exception
-    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
-    // 2001 by Kamil Toman <[email protected]>
-
-    include "cz(basic)"
-
-    key <AB01> {	[	z,              Z ],
-			[	degree] 	};
-    key <AD06> { [    y,              Y]};
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "cz(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "cz(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/czsk	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,774 +0,0 @@
-// Czech and Slovak keyboard symbols for XKB and PC keyboard
-//
-// (C) 1997,1999 Stanislav Meduna, [email protected]
-// (C) 2000  Kamil Toman, [email protected]
-//
-// Permission is granted to anyone to use, distribute and modify
-// this file in any way, provided that the above copyright notice
-// is left intact and the author of the modification summarizes
-// the changes in this header.
-//
-// This file is distributed without any expressed or implied warranty.
-//
-// $XFree86: xc/programs/xkbcomp/symbols/czsk,v 1.8 2002/11/20 04:49:03 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-
-partial default alphanumeric_keys 
-xkb_symbols "us_sk_qwerty" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Slovak";
-
-    include "czsk(def_qwerty)"
-    include "czsk(def_us_sk)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_sk_qwertz" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Slovak";
-
-    include "czsk(def_us_qwertz)"
-    include "czsk(def_us_sk)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sk_us_qwerty" {
-    Name[Group1] = "Slovak";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_qwerty)"
-    include "czsk(def_sk_us)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sk_us_qwertz" {
-    Name[Group1] = "Slovak";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_qwertz_us)"
-    include "czsk(def_sk_us)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_sk_prog" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Slovak";
-
-    include "czsk(def_basic)"
-    include "czsk(def_qwerty)"
-    include "czsk(def_us_sk_prog)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sk_us_prog" {
-    Name[Group1] = "Slovak";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_basic)"
-    include "czsk(def_qwerty)"
-    include "czsk(def_sk_us_prog)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_cz_qwerty" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Czech";
-
-    include "czsk(def_qwerty)"
-    include "czsk(def_us_cz)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_cz_qwertz" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Czech";
-
-    include "czsk(def_us_qwertz)"
-    include "czsk(def_us_cz)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "cz_us_qwerty" {
-    Name[Group1] = "Czech";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_qwerty)"
-    include "czsk(def_cz_us)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "cz_us_qwertz" {
-    Name[Group1] = "Czech";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_qwertz_us)"
-    include "czsk(def_cz_us)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_cz_prog" {
-    Name[Group1] = "US/ASCII";
-    Name[Group2] = "Czech";
-
-    include "czsk(def_basic)"
-    include "czsk(def_qwerty)"
-    include "czsk(def_us_cz_prog)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "cz_us_prog" {
-    Name[Group1] = "Czech";
-    Name[Group2] = "US/ASCII";
-
-    include "czsk(def_basic)"
-    include "czsk(def_qwerty)"
-    include "czsk(def_cz_us_prog)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_sk" {
-    include "czsk(def_basic)"
-    include "czsk(def_us_czsk)"
-    include "czsk(def_us_sk_prog)"
-    include "czsk(def_us_sk_rp)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_sk_us" {
-    include "czsk(def_basic)"
-    include "czsk(def_czsk_us)"
-    include "czsk(def_sk_us_prog)"
-    include "czsk(def_sk_us_rp)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_cz" {
-    include "czsk(def_basic)"
-    include "czsk(def_us_czsk)"
-    include "czsk(def_us_cz_prog)"
-    include "czsk(def_us_cz_rp)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_cz_us" {
-    include "czsk(def_basic)"
-    include "czsk(def_czsk_us)"
-    include "czsk(def_cz_us_prog)"
-    include "czsk(def_cz_us_rp)"
-};
-
-// added in for 1 key shifted prblem dm89450
-
-partial alphanumeric_keys 
-xkb_symbols "def_basic" {
-
-//    include "group(shift_toggle)"
- //  include "srvr_ctrl(xfree86)"
-	include "us(basic)"
-
-    // Alphanumeric keys identical to US
-    key <ESC>  {	[ Escape			],
-                        [ Escape			]       };
-
-    key <BKSP> {
-	type="CTRL+ALT",
-	symbols[Group1]= [ BackSpace,	Terminate_Server ]
-    };
-
-    key <TLDE> { [           grave,     asciitilde      ],       
-	         [           grave,     asciitilde	]	};
-
-
-    key  <TAB> {	[ 	Tab,	ISO_Left_Tab	],
-                        [ 	Tab,	ISO_Left_Tab	]       };
-    key <AD01> {	[	  q,	Q 		],
-                        [	  q,	Q 		]       };
-    key <AD02> {	[	  w,	W		],
-                        [	  w,	W		]       };
-    key <AD03> {	[	  e,	E		],
-                        [	  e,	E		]       };
-    key <AD04> {	[	  r,	R		],
-                        [	  r,	R		]       };
-    key <AD05> {	[	  t,	T		],
-                        [	  t,	T		]       };
-    key <AD07> {	[	  u,	U		],
-                        [	  u,	U		]       };
-    key <AD08> {	[	  i,	I		],
-                        [	  i,	I		]       };
-    key <AD09> {	[	  o,	O		],
-    			[	  o,    O		]	};
-    key <AD10> {	[	  p,	P		],
-                        [	  p,	P		]       };
-    key <RTRN> {	[ Return			],
-    			[ Return 			]	};
-
-    key <CAPS> {	[	Caps_Lock		],
-    			[	Caps_Lock		]	};
-    key <AC01> {	[	  a,	A 		],
-                        [	  a,	A 		]       };
-    key <AC02> {	[	  s,	S		],
-                        [	  s,	S		]       };
-    key <AC03> {	[	  d,	D		],
-                        [	  d,	D		]       };
-    key <AC04> {	[	  f,	F		],
-                        [	  f,	F		]       };
-    key <AC05> {	[	  g,	G		],
-                        [	  g,	G		]       };
-    key <AC06> {	[	  h,	H		],
-                        [	  h,	H		]       };
-    key <AC07> {	[	  j,	J		],
-                        [	  j,	J		]       };
-    key <AC08> {	[	  k,	K		],
-                        [	  k,	K		]       };
-    key <AC09> {	[	  l,	L		],
-                        [	  l,	L		]       };
-
-    key <LFSH> {	[ 	 Shift_L		],
-    			[	 Shift_L		]	};
-    key <AB02> {	[	  x,	X		],
-                        [	  x,	X		]       };
-    key <AB03> {	[	  c,	C		],
-                        [	  c,	C		]       };
-    key <AB04> {	[	  v,	V		],
-                        [	  v,	V		]       };
-    key <AB05> {	[	  b,	B		],
-                        [	  b,	B		]       };
-    key <AB06> {	[	  n,	N		],
-                        [	  n,	N		]       };
-    key <AB07> {	[	  m,	M		],
-                        [	  m,	M		]       };
-    key <BKSL> {	[ backslash,	bar		],
-                        [ backslash,	bar		]       };
-
-    key <LCTL> {	[ 	 Control_L		],
-    			[ 	 Control_L		]	};
-    key <SPCE> {	[ 	 space			],
-    			[ 	 space			]	};
-
-    key <LSGT> {	[      less,    greater		],
-                        [      less,    greater		]       };
-
-    key <LALT> {	[ 	Alt_L		],
-    			[ 	Meta_L		]	};
-    key <LWIN> {	[	Meta_L		],
-    			[	Meta_L		]	};
-    key <RWIN> {	[	Meta_R		],
-			[       Meta_R		]	};
-    key <MENU> {	[	Menu		],
-    			[	Menu		]	};
-    // End alphanumeric section
-
-    // begin modifier mappings
-    
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod3   { Mode_switch };
-
-    // Begin "Function" section
-    key <FK01> {        [        F1             ],
-			[        F1             ]       };
-    key <FK02> {        [        F2             ],
-			[        F2             ]       };
-    key <FK03> {        [        F3             ],
-			[        F3             ]       };
-    key <FK04> {        [        F4             ],
-			[        F4             ]       };
-    key <FK05> {        [        F5             ],
-			[        F5             ]       };
-    key <FK06> {        [        F6             ],
-			[        F6             ]       };
-    key <FK07> {        [        F7             ],
-			[        F7             ]       };
-    key <FK08> {        [        F8             ],
-			[        F8             ]       };
-    key <FK09> {        [        F9             ],
-			[        F9             ]       };
-    key <FK10> {        [        F10            ],
-			[        F10            ]       };
-    key <FK11> {        [        F11            ],
-			[        F11            ]       };
-    key <FK12> {        [        F12            ],
-			[        F12            ]       };
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> {
-        type= "PC_SYSRQ",
-        symbols[Group1]= [ Print, Sys_Req ]
-    };
-
-    key <PAUS> {	[ Multi_key				]	};
-    key <RALT> {        [ Mode_switch,  Multi_key       	]       };
-    key <SCLK> {	[ ISO_Next_Group, 	ISO_Next_Group	]	};
-
-    // Gray keys
-
-    key  <INS> { 	[  Insert             	],
-			[  Insert             	]       };
-    key <HOME> {        [  Home                 ],
-			[  Home                 ]       };
-    key <PGUP> {        [  Prior                ],
-			[  Prior                ]       };
-    key <DELE> {	[  Delete               ],
-			[  Delete               ]       };
-    key  <END> {        [  End                  ],
-			[  End                  ]       };
-    key <PGDN> {        [  Next                 ],
-			[  Next                 ]       };
-
-    // Cursor keys
-    key   <UP> {        [  Up                   ],
-			[  Up                   ]       };
-    key <LEFT> {        [  Left                 ],
-			[  Left                 ]       };
-    key <DOWN> {        [  Down                 ],
-			[  Down                 ]       };
-    key <RGHT> {        [  Right                ],
-			[  Right                ]       };
-
-
-    // Keypad keys
-    key <NMLK> {        [  Num_Lock, Pointer_EnableKeys         ],
-			[  Num_Lock, Pointer_EnableKeys         ]};
-    key <KPDV> {        [  KP_Divide            ],
-			[  KP_Divide            ]       };
-    key <KPMU> {        [  KP_Multiply          ],
-			[  KP_Multiply          ]       };
-    key <KPSU> {        [  KP_Subtract          ],
-			[  KP_Subtract          ]       };
-
-    key  <KP7> {        [  KP_Home,     KP_7    ],
-			[  KP_Home,     KP_7    ]       };
-    key  <KP8> {        [  KP_Up,       KP_8    ],
-			[  KP_Up,       KP_8    ]       };
-    key  <KP9> {        [  KP_Prior,    KP_9    ],
-			[  KP_Prior,    KP_9    ]       };
-    key <KPAD> {        [       KP_Add          ],
-			[       KP_Add          ]       };
-
-    key  <KP4> {        [  KP_Left,     KP_4    ],
-			[  KP_Left,     KP_4    ]       };
-    key  <KP5> {        [  KP_Begin,    KP_5    ],
-			[  KP_Begin,    KP_5    ]       };
-    key  <KP6> {        [  KP_Right,    KP_6    ],
-			[  KP_Right,    KP_6    ]       };
-
-    key  <KP1> {        [  KP_End,      KP_1    ],
-			[  KP_End,      KP_1    ]       };
-    key  <KP2> {        [  KP_Down,     KP_2    ],
-			[  KP_Down,     KP_2    ]       };
-    key  <KP3> {        [  KP_Next,     KP_3    ],
-			[  KP_Next,     KP_3    ]       };
-    key <KPEN> {        [       KP_Enter        ],
-			[       KP_Enter        ]       };
-
-    key  <KP0> {        [  KP_Insert,   KP_0    ],
-			[  KP_Insert,   KP_0    ]       };
-    key <KPDL> {        [  KP_Delete, KP_Decimal ],
-			[  KP_Delete, KP_Decimal ]      };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_czsk_us" {
-    key <AE11> {
-	[	    equal,        percent	],
-	[           minus,     underscore	]
-	};
-    key <AD11> {
-	[	   uacute,          slash	],
-	[     bracketleft,      braceleft	]
-	};
-    key <AC11> {
-	[	  section,         exclam	],
-	[      apostrophe,       quotedbl	]
-	};
-    key <AB08> {
-	[	    comma,	 question	],
-	[	    comma,	     less	]
-	};
-    key <AB09> {
-	[	   period,	    colon	],
-	[	   period,	  greater	]
-	};
-    key <AB10> {
-	[	    minus,     underscore	],
-	[	    slash,	 question	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_czsk" {
-    key <AE11> {
-	[           minus,     underscore	],
-	[	    equal,        percent	]
-	};
-    key <AD11> {
-	[     bracketleft,      braceleft	],
-	[	   uacute,          slash	]
-	};
-    key <AC11> {
-	[      apostrophe,       quotedbl	],
-	[	  section,         exclam	]
-	};
-    key <AB08> {
-	[	    comma,	     less	],
-	[	    comma,	 question	]
-	};
-    key <AB09> {
-	[	   period,	  greater	],
-	[	   period,	    colon	]
-	};
-    key <AB10> {
-	[	    slash,	 question	],
-	[	    minus,     underscore	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_sk_us_rp" {
-    key <AC10> {
-	[     ocircumflex,       quotedbl	],
-	[       semicolon,	    colon	]
-	};
-    key <AD12> {
-	[      adiaeresis,      parenleft	],
-	[    bracketright,     braceright	]
-	};
-    key <BKSL> {
-	[	   ncaron,	parenright	],
-	[	backslash,	      bar	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_cz_us_rp" {
-    key <AC10> {
-	[           uring,       quotedbl	],
-	[       semicolon,	    colon	]
-	};
-    key <AD12> {
-	[      parenright,      parenleft	],
-	[    bracketright,     braceright	]
-	};
-    key <BKSL> {
-	[	backslash,	      bar	],
-	[	backslash,	      bar	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_sk_rp" {
-    key <AC10> {
-	[       semicolon,	    colon	],
-	[     ocircumflex,       quotedbl	]
-	};
-    key <AD12> {
-	[    bracketright,     braceright	],
-	[      adiaeresis,      parenleft	]
-	};
-    key <BKSL> {
-	[	backslash,	      bar	],
-	[	   ncaron,	parenright	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_cz_rp" {
-    key <AC10> {
-	[       semicolon,	    colon	],
-	[           uring,       quotedbl	]
-	};
-    key <AD12> {
-	[    bracketright,     braceright	],
-	[      parenright,      parenleft	]
-	};
-    key <BKSL> {
-	[	backslash,	      bar	],
-	[	backslash,	      bar	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_qwertz_us" {
-    key <AD06> {
-	[               z,	        Z	],
-	[               y,              Y	]
-	};
-    key <AB01> {
-	[               y,	        Y	],
-	[               z,              Z	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_qwertz" {
-    key <AD06> {
-	[               y,	        Y	],
-	[               z,              Z	]
-	};
-    key <AB01> {
-	[               z,	        Z	],
-	[               y,              Y	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_qwerty" {
-    key <AD06> {
-	[               y,	        Y	],
-	[               y,              Y	]
-	};
-    key <AB01> {
-	[               z,	        Z	],
-	[               z,              Z	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_sk_prog" {
-    key <TLDE> {
-	[           grave,     asciitilde	],
-        [  dead_diaeresis,     semicolon        ]        
-	};
-    key <AE01> {
-	[		1,	   exclam	],
-	[	     plus,		1	]
-	};
-    key <AE02> {
-	[		2,	       at	],
-	[	   lcaron,		2	]
-	};
-    key <AE03> {
-	[		3,     numbersign	],
-	[	   scaron,		3	]
-	};
-    key <AE04> {
-	[		4,	   dollar	],
-	[	   ccaron,		4	]
-	};
-    key <AE05> {
-	[		5,        percent	],
-	[	   tcaron,		5	]
-	};
-    key <AE06> {
-	[		6,    asciicircum	],
-	[	   zcaron,		6	]
-	};
-    key <AE07> {
-	[		7,      ampersand	],
-	[	   yacute,		7	]
-	};
-    key <AE08> {
-	[		8,       asterisk	],
-	[	   aacute,		8	]
-	};
-    key <AE09> {
-	[		9,      parenleft	],
-	[	   iacute,		9	]
-	};
-    key <AE10> {
-	[		0,     parenright	],
-	[	   eacute,		0	]
-	};
-    key <AE12> {
-	[           equal,           plus	],
-	[      dead_acute,     dead_caron	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_us_cz_prog" {
-    key <TLDE> {
-	[           grave,     asciitilde	],
-        [  dead_diaeresis,     semicolon        ]        
-	};
-    key <AE01> {
-	[		1,	   exclam	],
-	[	     plus,		1	]
-	};
-    key <AE02> {
-	[		2,	       at	],
-	[	   ecaron,		2	]
-	};
-    key <AE03> {
-	[		3,     numbersign	],
-	[	   scaron,		3	]
-	};
-    key <AE04> {
-	[		4,	   dollar	],
-	[	   ccaron,		4	]
-	};
-    key <AE05> {
-	[		5,        percent	],
-	[	   rcaron,		5	]
-	};
-    key <AE06> {
-	[		6,    asciicircum	],
-	[	   zcaron,		6	]
-	};
-    key <AE07> {
-	[		7,      ampersand	],
-	[	   yacute,		7	]
-	};
-    key <AE08> {
-	[		8,       asterisk	],
-	[	   aacute,		8	]
-	};
-    key <AE09> {
-	[		9,      parenleft	],
-	[	   iacute,		9	]
-	};
-    key <AE10> {
-	[		0,     parenright	],
-	[	   eacute,		0	]
-	};
-    key <AE12> {
-	[           equal,           plus	],
-	[      dead_acute,     dead_caron	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_sk_us_prog" {
-    key <TLDE> {
-        [  dead_diaeresis,      semicolon       ],
-	[           grave,     asciitilde	]
-	};
-    key <AE01> {
-	[	     plus,		1	],
-	[		1,	   exclam	]
-	};
-    key <AE02> {
-	[	   lcaron,		2	],
-	[		2,	       at	]
-	};
-    key <AE03> {
-	[	   scaron,		3	],
-	[		3,     numbersign	]
-	};
-    key <AE04> {
-	[	   ccaron,		4	],
-	[		4,	   dollar	]
-	};
-    key <AE05> {
-	[	   tcaron,		5	],
-	[		5,        percent	]
-	};
-    key <AE06> {
-	[	   zcaron,		6	],
-	[		6,    asciicircum	]
-	};
-    key <AE07> {
-	[	   yacute,		7	],
-	[		7,      ampersand	]
-	};
-    key <AE08> {
-	[	   aacute,		8	],
-	[		8,       asterisk	]
-	};
-    key <AE09> {
-	[	   iacute,		9	],
-	[		9,      parenleft	]
-	};
-    key <AE10> {
-	[	   eacute,		0	],
-	[		0,     parenright	]
-	};
-    key <AE12> {
-	[      dead_acute,     dead_caron	],
-	[           equal,           plus	]
-	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "def_cz_us_prog" {
-    key <TLDE> {
-        [  dead_diaeresis,     semicolon        ],       
-	[           grave,     asciitilde	]
-	};
-    key <AE01> {
-	[	     plus,		1	],
-	[		1,	   exclam	]
-	};
-    key <AE02> {
-	[	   ecaron,		2	],
-	[		2,	       at	]
-	};
-    key <AE03> {
-	[	   scaron,		3	],
-	[		3,     numbersign	]
-	};
-    key <AE04> {
-	[	   ccaron,		4	],
-	[		4,	   dollar	]
-	};
-    key <AE05> {
-	[	   rcaron,		5	],
-	[		5,        percent	]
-	};
-    key <AE06> {
-	[	   zcaron,		6	],
-	[		6,    asciicircum	]
-	};
-    key <AE07> {
-	[	   yacute,		7	],
-	[		7,      ampersand	]
-	};
-    key <AE08> {
-	[	   aacute,		8	],
-	[		8,       asterisk	]
-	};
-    key <AE09> {
-	[	   iacute,		9	],
-	[		9,      parenleft	]
-	};
-    key <AE10> {
-	[	   eacute,		0	],
-	[		0,     parenright	]
-	};
-    key <AE12> {
-	[      dead_acute,     dead_caron	],
-	[           equal,           plus	]
-	};
-};
-
-// add in for 1 key shifted problem dm89450
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "czsk(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "czsk(Sundeadkeys)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-	include "us(basic)"
-	include "czsk(def_basic)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/de_CH	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-// $Xorg: de_CH,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/de_CH,v 3.4 2000/01/21 01:12:27 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss keyboard
-
-    // Alphanumeric section
-    name[Group1]= "Swiss German";
-    key <TLDE> {	[   section,	degree		]	};
-    key <AE01> {	[	  1,	plus 		],
-			[       bar			]	};
-    key <AE02> {	[	  2,	quotedbl	],
-			[        at			]	};
-    key <AE03> {	[	  3,	asterisk	],
-			[ numbersign			]	};
-    key <AE04> {	[	  4,	ccedilla	],
-			[  asciicircum 		        ]       };	
-    key <AE05> {	[	  5,	percent		],
-                        [  asciitilde                   ]       };
-    key <AE06> {	[	  6,	ampersand	],
-			[   notsign			]	};
-    key <AE07> {	[	  7,	slash		],
-			[ brokenbar			]	};
-    key <AE08> {	[	  8,	parenleft	],
-			[      cent			]	};
-    key <AE09> {	[	  9,	parenright	]	};
-    key <AE10> {	[	  0,	equal		],
-  			[     acute		        ]	};
-    key <AE11> {	[ apostrophe,	question	],
-			[ dead_acute			]	};
-    key <AE12> {	[ dead_circumflex, dead_grave	],
-			[ dead_tilde			]	};
-    key <AD03> {	[	  e,	E		],
-			[  EuroSign			]	};
-    key <AD06> {	[	  z,	Z		]	};
-    key <AD11> {	[ udiaeresis,	egrave		],
-			[ bracketleft			]	};
-    key <AD12> {	[ dead_diaeresis, exclam	],
-			[ bracketright			]	};
-    key <AC10> {	[ odiaeresis,	eacute		]	};
-    key <AC11> {	[ adiaeresis,	agrave		],
-			[  braceleft			]	};
-    key <BKSL> {	[     dollar,	sterling	],
-			[ braceright			]	};
-
-    key <LSGT> {	[      less,	greater		],
-			[ backslash			]	};
-    key <AB01> {	[	  y,	Y 		]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon		]	};
-    key <AB10> {	[     minus,	underscore	]	};
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {        [  KP_Delete,   KP_Separator    ]       };
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-};
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    // modify the default Swiss German layout to use Sun dead keys
-    include "de_CH(basic)"
-    key <AE11> {	[ apostrophe,	question	],
-			[ dead_acute			]	};
-    key <AE12> {	[ dead_circumflex,	dead_grave	],
-			[ dead_tilde			]	};
-    key <AD12> {	[ dead_diaeresis, exclam	],
-			[ bracketright			]	};
-};
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "de_CH(Sundeadkeys)"
-};
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    // modify the default Swiss German layout not to have any dead keys
-    include "de_CH(basic)"
-    key <AE11> {	[ apostrophe,	question	],
-			[ acute				]	};
-    key <AE12> {	[ asciicircum,	grave		],
-			[ asciitilde			]	};
-    key <AD12> {	[ diaeresis,	exclam		],
-			[ bracketright			]	};
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/dvorak	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,382 +0,0 @@
-// $XdotOrg: xc/programs/xkbcomp/symbols/dvorak,v 1.2 2004/04/23 19:54:52 eich Exp $
-// $Xorg: dvorak,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// symbols definition for a very simple dvorak layout.
-// It has basically the alphanumeric keys, punctuation, 
-// one shift key, one control key and caps lock. It 
-// uses the punctuation keys configurations common on PC 
-// keyboards (e.g. key <ABO9> is { [ period greater ] })
-
-// $XFree86: xc/programs/xkbcomp/symbols/dvorak,v 3.10 2003/08/08 06:27:09 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "srvr_ctrl(xfree86)"
-
-    name[Group1]= "Dvorak";
-    key <ESC>  {	[ Escape			]	};
-
-    // Alphanumeric section
-    key <TLDE> {	[       grave,	asciitilde	],
-			[  dead_grave,	dead_tilde	]	};
-
-    key <AE01> {	[	    1,	exclam 		]	};
-    key <AE02> {	[	    2,	at		]	};
-    key <AE03> {	[	    3,	numbersign	]	};
-    key <AE04> {	[	    4,	dollar		]	};
-    key <AE05> {	[	    5,	percent		]	};
-    key <AE06> {	[	    6,	asciicircum	],
-			[ dead_circumflex, dead_circumflex ]	};
-    key <AE07> {	[	    7,	ampersand	]	};
-    key <AE08> {	[	    8,	asterisk	]	};
-    key <AE09> {	[	    9,	parenleft	],
-			[  dead_grave			]	};
-    key <AE10> {	[	    0,	parenright	]	};
-    key <AE11> {	[ bracketleft,	braceleft	]	};
-    key <AE12> {	[ bracketright,	braceright	],
-			[  dead_tilde			]	};
-    key <BKSP> {
-	type="CTRL+ALT",
-	symbols[Group1]= [ BackSpace,	Terminate_Server ]
-    };
-
-    key  <TAB> {	[ 	  Tab,	ISO_Left_Tab	]	};
-    key <AD01> {	[  apostrophe,	quotedbl	],
-			[  dead_acute,	dead_diaeresis	] 	};
-    key <AD02> {	[	comma,	less		],
-			[ dead_cedilla,	dead_caron	]	};
-    key <AD03> {	[      period,	greater		],
-			[ dead_abovedot, periodcentered ]	};
-    key <AD04> {	[	    p,	P		]	};
-    key <AD05> {	[	    y,	Y		]	};
-    key <AD06> {	[	    f,	F		]	};
-    key <AD07> {	[	    g,	G		]	};
-    key <AD08> {	[	    c,	C		]	};
-    key <AD09> {	[	    r,	R		]	};
-    key <AD10> {	[	    l,	L		]	};
-    key <AD11> {	[	slash,	question	]	};
-    key <AD12> {	[	equal,	plus		]	};
-    key <RTRN> {	[ Return			]	};
-
-    key <CAPS> {	[	Caps_Lock		]	};
-    key <AC01> {	[	    a,	A 		]	};
-    key <AC02> {	[	    o,	O		]	};
-    key <AC03> {	[	    e,	E		]	};
-    key <AC04> {	[	    u,	U		]	};
-    key <AC05> {	[	    i,	I		]	};
-    key <AC06> {	[	    d,	D		]	};
-    key <AC07> {	[	    h,	H		]	};
-    key <AC08> {	[	    t,	T		]	};
-    key <AC09> {	[	    n,	N		]	};
-    key <AC10> {	[	    s,	S		]	};
-    key <AC11> {	[	minus,	underscore	]	};
-
-    key <LFSH> {	[	Shift_L			]	};
-    key <AB01> {	[   semicolon,	colon 		],
-			[ dead_ogonek, dead_doubleacute ]	};
-    key <AB02> {	[	    q,	Q		]	};
-    key <AB03> {	[	    j,	J		]	};
-    key <AB04> {	[	    k,	K		]	};
-    key <AB05> {	[	    x,	X		]	};
-    key <AB06> {	[	    b,	B		]	};
-    key <AB07> {	[	    m,	M		]	};
-    key <AB08> {	[	    w,	W		]	};
-    key <AB09> {	[	    v,	V		]	};
-    key <AB10> {	[	    z,	Z		]	};
-    key <BKSL> {	[   backslash,	bar		]	};
-
-    key <LCTL> {	[ 	 Control_L		]	};
-    key <SPCE> {	[ 	 space			]	};
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-};
-
-// Norwegian Dvorak
-partial alphanumeric_keys 
-xkb_symbols "no" {
-    include "dvorak(basic)"
-
-    key <TLDE> {	[	  bar,	section		],
-			[   brokenbar,	 paragraph	]	};
-
-    key <AE01> {	[	    1,	exclam 		],
-			[  exclamdown,	onesuperior	]	};
-    key <AE02> {	[	    2,	quotedbl	],
-			[	   at,	twosuperior	]	};
-    key <AE03> {	[	    3,	numbersign	],
-			[    sterling,	threesuperior	]	};
-    key <AE04> {	[	    4,	dollar		],
-			[    currency,	onequarter	]	};
-    key <AE05> {	[	    5,	percent		],
-			[     onehalf,	onehalf		]	};
-    key <AE06> {	[	    6,	ampersand	],
-			[ threequarters, threequarters	]	};
-    key <AE07> {	[	    7,	slash		],
-			[   braceleft,	division	]	};
-    key <AE08> {	[	    8,	parenleft	],
-			[ bracketleft			]	};
-    key <AE09> {	[	    9,	parenright	],
-			[ bracketright			]	};
-    key <AE10> {	[	    0,	equal		],
-			[  braceright			]	};
-    key <AE11> {	[	 plus,	question	],
-			[   plusminus,	questiondown	]	};
-    key <AE12> {	[   backslash,	grave		],
-			[  dead_acute,	dead_grave	]	};
-
-    key <AD01> {	[       aring,	Aring		],
-			[  braceright,	bracketright	]	};
-    key <AD02> {	[	comma,	semicolon	],
-			[ dead_cedilla,	cedilla		]	};
-    key <AD03> {	[      period,	colon		],
-			[ periodcentered		]	};
-    key <AD04> {	[	    p,	P		],
-			[       thorn,	THORN		]	};
-    key <AD05> {	[	    y,	Y		],
-			[         yen			]	};
-    key <AD06> {	[	    f,	F		],
-			[ ordfeminine			]	};
-    key <AD08> {	[	    c,	C		],
-			[    ccedilla,	copyright	]	};
-    key <AD09> {	[	    r,	R		],
-			[  registered			]	};
-    key <AD11> {	[  apostrophe,	asterisk	],
-			[ dead_circumflex,	acute	]	};
-    key <AD12> {	[  asciitilde,	asciicircum	],
-			[ dead_diaeresis, dead_tilde	]	};
-
-    key <AC03> {	[	    e,	E		],
-			[    EuroSign,	cent		]	};
-    key <AC05> {	[	    i,	I		],
-			[    idotless,	Iabovedot	]	};
-    key <AC06> {	[	    d,	D		],
-			[	  eth,	ETH		]	};
-    key <AC10> {	[	    s,	S		],
-			[      ssharp			]	};
-    key <AC11> {	[	minus,	underscore	],
-			[      hyphen,	diaeresis	]	};
-
-    key <AB01> {	[	   ae,	AE 		],
-			[   braceleft,	bracketleft	]	};
-    key <AB05> {	[	    x,	X		],
-			[    multiply			]	};
-    key <AB07> {	[	    m,	M		],
-			[	   mu			]	};
-    key <BKSL> {	[	 less,	greater		],
-			[ guillemotleft, guillemotright	]	};
-
-    key <SPCE> {	[	 space,	space		],
-			[ nobreakspace,	nobreakspace	]	};
-
-    key <LSGT> {	[	oslash,	Ooblique	],
-			[	   bar,	backslash	]	};
-
-};
-
-// Swedish Dvorak
-partial alphanumeric_keys 
-xkb_symbols "se" {
-    include "dvorak(no)"
-
-    key <TLDE> {	[     section,	onehalf		]	};
-
-    key <AE04> {	[	    4,	currency	],
-			[      dollar,  onequarter	]	};
-    key <AE11> {	[        plus,	question	],
-			[   backslash,  questiondown	]	};
-    key <AE12> {	[  dead_acute,  dead_grave	],
-			[  backslash,	grave		]	};
-
-    key <AD01> {	[  odiaeresis,  Odiaeresis	],
-			[  braceright,  bracketright	]	};
-    key <AD02> {	[       aring,	Aring    	]	};
-    key <AD03> {	[  adiaeresis,	Adiaeresis	]	};
-    key <AD11> {	[           q,	Q       	]	};
-    key <AD12> {	[ dead_diaeresis, dead_circumflex],
-			[ dead_tilde, asciicircum	]	};
-
-    key <AB01> {	[     comma,    semicolon	],
-			[ dead_cedilla, cedilla		]	};
-    key <AB02> {	[    period,    colon		],
-			[ periodcentered		]	};
-
-    key <BKSL> {	[      less,	greater		],
-			[       bar,    brokenbar	]	};
-
-    key <LSGT> {	[ apostrophe,   asterisk	],
-			[       bar,    backslash	]	};
-
-};
-// Swedish Dvorak alias
-partial alphanumeric_keys 
-xkb_symbols "sv" {
-    include "dvorak(se)"
-};
-
-
-// Dvorak (UK) keymap (by odaen) allowing the usage of
-// the £ and ? key and swapping the @ and " keys.
-
-partial alphanumeric_keys
-xkb_symbols "gb" {
-    include "dvorak(basic)"
-
-    key <BKSL> {	[  numbersign,  asciitilde	]	};
-    key <AE02> {	[	    2,  quotedbl	],
-			[ twosuperior,  NoSymbol	]	};
-    key <AE03> {	[	    3,  sterling	],
-			[ threesuperior, NoSymbol	]	};
-    key <AE04> {	[	    4,  dollar		],
-			[    EuroSign,  NoSymbol	]	};
-    key <LSGT> {	[   backslash,  bar		]	};
-    key <AD01> {	[  apostrophe,  at		]	};
-};
-
-// Keymap Dvorak pour le Français
-// par Josselin Mouette <[email protected]>.
-
-partial alphanumeric_keys modifier_keys 
-xkb_symbols "fr" {
-
-    include "dvorak(basic)"
-
-    name[Group1]= "French dvorak";
-
-    key <TLDE>  {       [              oe,              OE      ],
-                        [              ae,              AE      ]       };
-    key <AE01>  {       [           slash,               1      ],
-                        [       ampersand,     onesuperior      ]       };
-    key <AE02>  {       [            plus,               2      ],
-                        [      asciitilde,     twosuperior      ]       };
-    key <AE03>  {       [           minus,               3      ], 
-                        [      numbersign,   threesuperior      ]       };
-    key <AE04>  {       [        asterisk,               4      ],
-                        [            less,   guillemotleft      ]       };
-    key <AE05>  {       [           equal,               5      ],
-                        [         greater,  guillemotright      ]       };
-    key <AE06>  {       [       backslash,               6      ],
-                        [              at,         notsign      ]       };
-    key <AE07>  {       [       parenleft,               7      ],
-                        [ dead_circumflex,        multiply      ]       };
-    key <AE08>  {       [           grave,               8      ],
-                        [      dead_grave,        division      ]       };
-    key <AE09>  {       [      parenright,               9      ],
-                        [     asciicircum,       plusminus      ]       };
-    key <AE10>  {       [        quotedbl,               0      ],
-                        [  dead_diaeresis,  dead_diaeresis      ]       };
-    key <AE11>  {       [     bracketleft,       braceleft      ],
-                        [             bar,          degree      ]       };
-    key <AE12>  {       [    bracketright,      braceright      ],
-                        [         percent                       ]       };
-
-    key <AD01>  {       [           colon,        question      ],
-                        [        question,    questiondown      ]       };
-    key <AD02>  {       [          agrave,          Agrave      ],
-                        [           aring,           Aring      ]       };
-    key <AD03>  {       [          eacute,          Eacute      ],
-                        [        EuroSign,            cent      ]       };
-    key <AD04>  {       [               g,               G      ],
-                        [          oslash,        Ooblique      ]       };
-    key <AD05>  {       [          period,          exclam      ],
-                        [  periodcentered,      exclamdown      ]       };
-    key <AD06>  {       [               h,               H      ],
-                        [             eth,             ETH      ]       };
-    key <AD07>  {       [               v,               V      ]       };
-    key <AD08>  {       [               c,               C      ],
-                        [       copyright,      registered      ]       };
-    key <AD09>  {       [               m,               M      ],
-                        [              mu,              mu      ]       };
-    key <AD10>  {       [               k,               K      ],
-                        [          dollar,          dollar      ]       };
-    key <AD11>  {       [          egrave,          Egrave      ],
-                        [        sterling,        sterling      ]       };
-    key <AD12>  {       [               z,               Z      ],
-                        [             yen                       ]       };
-
-    key <AC01>  {       [               o,               O      ],
-                        [     ocircumflex,     Ocircumflex      ]       };
-    key <AC02>  {       [               a,               A      ],
-                        [     acircumflex,     Acircumflex      ]       };
-    key <AC03>  {       [               u,               U      ],
-                        [     ucircumflex,     Ucircumflex      ]       };
-    key <AC04>  {       [               e,               E      ],
-                        [     ecircumflex,     Ecircumflex      ]       };
-    key <AC05>  {       [               b,               B      ],
-                        [          ssharp                       ]       };
-    key <AC06>  {       [               f,               F      ]       };
-    key <AC07>  {       [               s,               S      ]       };
-    key <AC08>  {       [               t,               T      ],
-                        [           thorn,           THORN      ]       };
-    key <AC09>  {       [               n,               N      ],
-                        [          ntilde,          Ntilde      ]       };
-    key <AC10>  {       [               d,               D      ],
-                        [         section                       ]       };
-    key <AC11>  {       [               w,               W      ],
-                        [       paragraph                       ]       };
-    key <BKSL>  {       [          ugrave,          Ugrave      ],
-                        [       masculine,     ordfeminine      ]       };
-
-    key <LSGT>  {       [        ccedilla,        Ccedilla      ],
-                        [        ccedilla,        Ccedilla      ]       };
-    key <AB01>  {       [      apostrophe,      underscore      ],
-                        [      dead_acute,          macron      ]       };
-    key <AB02>  {       [               q,               Q      ],
-                        [   guillemotleft,   guillemotleft      ]       };
-    key <AB03>  {       [           comma,       semicolon      ],
-                        [  guillemotright,  guillemotright      ]       };
-    key <AB04>  {       [               i,               I      ],
-                        [     icircumflex,     Icircumflex      ]       };
-    key <AB05>  {       [               y,               Y      ],
-                        [      ydiaeresis,      Ydiaeresis      ]       };
-    key <AB06>  {       [               x,               X      ],
-                        [      ediaeresis,      Ediaeresis      ]       };
-    key <AB07>  {       [               r,               R      ],
-                        [      udiaeresis,      Udiaeresis      ]       };
-    key <AB08>  {       [               l,               L      ],
-                        [      adiaeresis,      Adiaeresis      ]       };
-    key <AB09>  {       [               p,               P      ],
-                        [      odiaeresis,      Odiaeresis      ]       };
-    key <AB10>  {       [               j,               J      ],
-                        [      idiaeresis,      Idiaeresis      ]       };
-
-    key <SPCE>  {       [           space,           space      ],
-                        [    nobreakspace,    nobreakspace      ]       };
-    key <RALT>  {       [     Mode_switch,       Multi_key      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "dvorak(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "dvorak(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/el	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-// $XFree86$
-//
-// Hellenic keyboard map for XFree86
-// Original version:
-//	Kostas Gewrgiou <[email protected]>
-// Heavily modified by:
-//	Vasilis Vasaitis <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys alternate_group
-xkb_symbols "basic" {
-
-    include "el(bare)"
-
-    key <TLDE> { [],	[     grave,	asciitilde	]	};
-    key <AE01> { [],	[	  1,	exclam 		]	};
-    key <AE02> { [],	[	  2,	at		]	};
-    key <AE03> { [],	[	  3,	numbersign	]	};
-    key <AE04> { [],	[	  4,	dollar		]	};
-    key <AE05> { [],	[	  5,	percent		]	};
-    key <AE06> { [],	[	  6,	asciicircum	]	};
-    key <AE07> { [],	[	  7,	ampersand	]	};
-    key <AE08> { [],	[	  8,	asterisk	]	};
-    key <AE09> { [],	[	  9,	parenleft	]	};
-    key <AE10> { [],	[	  0,	parenright	]	};
-    key <AE11> { [],	[     minus,	underscore	]	};
-    key <AE12> { [],	[     equal,	plus		]	};
-
-
-    
-    key <AD11> { [],	[ bracketleft,	braceleft	]	};
-    key <AD12> { [],	[ bracketright,	braceright	]	};
-
-    key <AC11> { [],	[ apostrophe,	quotedbl	]	};
-
-    key <AB08> { [],	[     comma,	less		]	};
-    key <AB09> { [],	[    period,	greater		]	};
-    key <AB10> { [],	[     slash,	question	]	};
-    key <BKSL> { [],	[ backslash,	bar		]	};
-
-};
-
-hidden partial alphanumeric_keys alternate_group
-xkb_symbols "bare" {
-
-    name[Group2] = "ISO8859-7";
-
-    key <AD01> { [], [	semicolon,		colon		] };
-    key <AD02> { [], [	Greek_finalsmallsigma,	Greek_SIGMA	] };
-    key <AD03> { [], [	Greek_epsilon,		Greek_EPSILON	] };
-    key <AD04> { [], [	Greek_rho,		Greek_RHO	] };
-    key <AD05> { [], [	Greek_tau,		Greek_TAU	] };
-    key <AD06> { [], [	Greek_upsilon,		Greek_UPSILON	] };
-    key <AD07> { [], [	Greek_theta,		Greek_THETA	] };
-    key <AD08> { [], [	Greek_iota,		Greek_IOTA	] };
-    key <AD09> { [], [	Greek_omicron,		Greek_OMICRON	] };
-    key <AD10> { [], [	Greek_pi,		Greek_PI	] };
-
-    key <AC01> { [], [	Greek_alpha,		Greek_ALPHA	] };
-    key <AC02> { [], [	Greek_sigma,		Greek_SIGMA	] };
-    key <AC03> { [], [	Greek_delta,		Greek_DELTA	] };
-    key <AC04> { [], [	Greek_phi,		Greek_PHI	] };
-    key <AC05> { [], [	Greek_gamma,		Greek_GAMMA	] };
-    key <AC06> { [], [	Greek_eta,		Greek_ETA	] };
-    key <AC07> { [], [	Greek_xi,		Greek_XI	] };
-    key <AC08> { [], [	Greek_kappa,		Greek_KAPPA	] };
-    key <AC09> { [], [	Greek_lamda,		Greek_LAMDA	] };
-    key <AC10> { [], [	dead_acute,		dead_diaeresis	] };
-
-    key <AB01> { [], [	Greek_zeta,		Greek_ZETA	] };
-    key <AB02> { [], [	Greek_chi,		Greek_CHI	] };
-    key <AB03> { [], [	Greek_psi,		Greek_PSI	] };
-    key <AB04> { [], [	Greek_omega,		Greek_OMEGA	] };
-    key <AB05> { [], [	Greek_beta,		Greek_BETA	] };
-    key <AB06> { [], [	Greek_nu,		Greek_NU	] };
-    key <AB07> { [], [	Greek_mu,		Greek_MU	] };
-
-    key <LSGT> { [], [	guillemotleft,		guillemotright	] };
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "extended" {
-
-    include "el(basic)"
-
-    key.type = "THREE_LEVEL";
-
-    key <AE05> { [	5,		percent,	EuroSign	],
-		 [	5,		percent,	EuroSign	] };
-
-    key <AD01> { [], [	semicolon,	colon,		periodcentered	] };
-
-    key <AD03> { [	e,		E,		EuroSign	],
-		 [	Greek_epsilon,	Greek_EPSILON,	EuroSign	] };
-
-    key <AC10> { [	semicolon,	colon,		periodcentered	] };
-
-    key <AB08> { [	comma,		less,		guillemotleft	],
-		 [	comma,		less,		guillemotleft	] };
-
-    key <AB09> { [	period,		greater,	guillemotright	],
-		 [	period,		greater,	guillemotright	] };
-
-    key <RALT> {	[	ISO_Level3_Shift	]	};
-
-    modifier_map Mod5 { ISO_Level3_Shift };
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "polytonic" {
-
-    include "el(extended)"
-
-    key.type = "THREE_LEVEL";
-
-    key <AD11> { [], [ 	dead_tilde,	dead_diaeresis,	dead_macron	] };
-    key <AD12> { [], [	dead_iota,	VoidSymbol,	dead_breve	] };
-
-    key <AC10> { [], [	dead_acute,		dead_horn	] };
-    key <AC11> { [], [	dead_grave,		dead_ogonek	] };
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "Sundeadkeys" {
-
-    include "el(basic)"
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "sundeadkeys" {
-
-    include "el(Sundeadkeys)"
-
-};
-
-partial alphanumeric_keys alternate_group
-xkb_symbols "nodeadkeys" {
-
-    include "el(basic)"
-
-    key <AC10> { [], [	semicolon,		colon		] };
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/fr_CH	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// $Xorg: fr_CH,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/fr_CH,v 3.4 2000/01/21 01:12:27 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss/French keybaord
-
-    include "de_CH(basic)"
-    name[Group1]= "Swiss French";
-
-    override key <AD11> {
-	[ egrave,	udiaeresis	],
-	[ bracketleft			]
-    };
-    override key <AC10> {
-	[ eacute,	odiaeresis	]
-    };
-    override key <AC11> {
-	[ agrave,	adiaeresis	],
-	[  braceleft			]
-    };
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {        [  KP_Delete,   KP_Decimal      ]       };
-    // End "Keypad" section
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    // modify the default Swiss French layout to use Sun dead keys
-    include "fr_CH(basic)"
-    key <TLDE> {        [   section,    degree          ]       };
-    key <AE01> {        [         1,    plus            ],
-                        [       bar                     ]       };
-    key <AE02> {        [         2,    quotedbl        ],
-                        [        at                     ]       };
-    key <AE03> {        [         3,    asterisk        ],
-                        [ numbersign                    ]       };
-    key <AE04> {        [         4,    ccedilla        ],
-                        [  asciicircum                  ]       };
-    key <AE05> {        [         5,    percent         ],
-                        [  asciitilde                   ]       };
-    key <AE06> {        [         6,    ampersand       ],
-                        [   notsign                     ]       };
-    key <AE07> {        [         7,    slash           ],
-                        [ brokenbar                     ]       };
-    key <AE08> {        [         8,    parenleft       ],
-                        [      cent                     ]       };
-    key <AE09> {        [         9,    parenright      ]       };
-    key <AE10> {        [         0,    equal           ],
-                        [     acute                     ]       };
-    key <AE11> {        [ apostrophe,   question        ],
-                        [ dead_acute                    ]       };
-    key <AE12> {        [ dead_circumflex, dead_grave   ],
-                        [ dead_tilde                    ]       };
-    key <AD12> {	[ dead_diaeresis, exclam	],
-			[ bracketright			]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "fr_CH(Sundeadkeys)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    // modify the default Swiss French layout not to have any dead keys
-    include "fr_CH(basic)"
-    key <AE11> {	[ apostrophe,	question	],
-			[ acute				]	};
-    key <AE12> {	[ asciicircum,	grave		],
-			[ asciitilde			]	};
-    key <AD12> {	[ diaeresis,	exclam		],
-			[ bracketright			]	};
-    key <AE06> {        [         6,    ampersand       ],
-                        [   notsign,    ampersand 	]       };
-    key <AE07> {        [         7,    slash           ],
-                       [ brokenbar,    slash           ]       };
-    key <AE08> {        [         8,    parenleft       ],
-                        [      cent,    parenleft   ]       };
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/gr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/el,v 1.3 2002/06/03 22:19:48 dawes Exp
-//
-// Hellenic keyboard map for XFree86
-// Original version:
-//      Kostas Gewrgiou <[email protected]>
-// Heavily modified by:
-//      Vasilis Vasaitis <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-default partial alphanumeric_keys alternate_group
-xkb_symbols "basic" {
-    include "us(basic)"
- 
-    include "el(bare)"
- 
-    key <TLDE> { [],    [     grave,    asciitilde      ]       };
-    key <AE01> { [],    [         1,    exclam          ]       };
-    key <AE02> { [],    [         2,    at              ]       };
-    key <AE03> { [],    [         3,    numbersign      ]       };
-    key <AE04> { [],    [         4,    dollar          ]       };
-    key <AE05> { [],    [         5,    percent         ]       };
-    key <AE06> { [],    [         6,    asciicircum     ]       };
-    key <AE07> { [],    [         7,    ampersand       ]       };
-    key <AE08> { [],    [         8,    asterisk        ]       };
-    key <AE09> { [],    [         9,    parenleft       ]       };
-    key <AE10> { [],    [         0,    parenright      ]       };
-    key <AE11> { [],    [     minus,    underscore      ]       };
-    key <AE12> { [],    [     equal,    plus            ]       };
- 
-    key <AD11> { [],    [ bracketleft,  braceleft       ]       };
-    key <AD12> { [],    [ bracketright, braceright      ]       };
- 
-    key <AC11> { [],    [ apostrophe,   quotedbl        ]       };
- 
-    key <AB08> { [],    [     comma,    less            ]       };
-    key <AB09> { [],    [    period,    greater         ]       };
-    key <AB10> { [],    [     slash,    question        ]       };
-    key <BKSL> { [],    [ backslash,    bar             ]       };
- 
-};
- 
-hidden partial alphanumeric_keys alternate_group
-xkb_symbols "bare" {
- 
-    name[Group2] = "ISO8859-7";
-                                                                                
-    key <AD01> { [], [  semicolon,              colon           ] };
-    key <AD02> { [], [  Greek_finalsmallsigma,  Greek_SIGMA     ] };
-    key <AD03> { [], [  Greek_epsilon,          Greek_EPSILON   ] };
-    key <AD04> { [], [  Greek_rho,              Greek_RHO       ] };
-    key <AD05> { [], [  Greek_tau,              Greek_TAU       ] };
-    key <AD06> { [], [  Greek_upsilon,          Greek_UPSILON   ] };
-    key <AD07> { [], [  Greek_theta,            Greek_THETA     ] };
-    key <AD08> { [], [  Greek_iota,             Greek_IOTA      ] };
-    key <AD09> { [], [  Greek_omicron,          Greek_OMICRON   ] };
-    key <AD10> { [], [  Greek_pi,               Greek_PI        ] };
- 
-    key <AC01> { [], [  Greek_alpha,            Greek_ALPHA     ] };
-    key <AC02> { [], [  Greek_sigma,            Greek_SIGMA     ] };
-    key <AC03> { [], [  Greek_delta,            Greek_DELTA     ] };
-    key <AC04> { [], [  Greek_phi,              Greek_PHI       ] };
-    key <AC05> { [], [  Greek_gamma,            Greek_GAMMA     ] };
-    key <AC06> { [], [  Greek_eta,              Greek_ETA       ] };
-    key <AC07> { [], [  Greek_xi,               Greek_XI        ] };
-    key <AC08> { [], [  Greek_kappa,            Greek_KAPPA     ] };
-    key <AC09> { [], [  Greek_lamda,            Greek_LAMDA     ] };
-    key <AC10> { [], [  dead_acute,             dead_diaeresis  ] };
-                                                                                
-    key <AB01> { [], [  Greek_zeta,             Greek_ZETA      ] };
-    key <AB02> { [], [  Greek_chi,              Greek_CHI       ] };
-    key <AB03> { [], [  Greek_psi,              Greek_PSI       ] };
-    key <AB04> { [], [  Greek_omega,            Greek_OMEGA     ] };
-    key <AB05> { [], [  Greek_beta,             Greek_BETA      ] };
-    key <AB06> { [], [  Greek_nu,               Greek_NU        ] };
-    key <AB07> { [], [  Greek_mu,               Greek_MU        ] };
- 
-    key <LSGT> { [], [  guillemotleft,          guillemotright  ] };
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "extended" {
- 
-    include "el(basic)"
- 
-    key.type = "THREE_LEVEL";
- 
-    key <AE05> { [      5,              percent,        EuroSign        ],
-                 [      5,              percent,        EuroSign        ] };
-                                                                                
-    key <AD01> { [], [  semicolon,      colon,          periodcentered  ] };
- 
-    key <AD03> { [      e,              E,              EuroSign        ],
-                 [      Greek_epsilon,  Greek_EPSILON,  EuroSign        ] };
- 
-    key <AC10> { [      semicolon,      colon,          periodcentered  ] };
- 
-    key <AB08> { [      comma,          less,           guillemotleft   ],
-                 [      comma,          less,           guillemotleft   ] };
- 
-    key <AB09> { [      period,         greater,        guillemotright  ],
-                 [      period,         greater,        guillemotright  ] };
- 
-    key <RALT> {        [       ISO_Level3_Shift        ]       };
- 
-    modifier_map Mod5 { ISO_Level3_Shift };
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "polytonic" {
-                                                                                
-    include "el(extended)"
- 
-    key.type = "THREE_LEVEL";
- 
-    key <AD11> { [], [  dead_tilde,     dead_diaeresis, dead_macron     ] };
-    key <AD12> { [], [  dead_iota,      VoidSymbol,     dead_breve      ] };
- 
-    key <AC10> { [], [  dead_acute,             dead_horn       ] };
-    key <AC11> { [], [  dead_grave,             dead_ogonek     ] };
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "Sundeadkeys" {
- 
-    include "el(basic)"
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "sundeadkeys" {
-                                                                                
-    include "el(Sundeadkeys)"
- 
-};
- 
-partial alphanumeric_keys alternate_group
-xkb_symbols "nodeadkeys" {
- 
-    include "el(basic)"
- 
-    key <AC10> { [], [  semicolon,              colon           ] };
- 
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/hr_US	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-// Croatian-US keyboards
-// by Vlatko Kosturjak (kost at linux.hr)
-//
-// Changelog
-// =========
-// 2003-04-03 Added <KPDL> (Delete/Separator)
-// 2002-11-20 Initial version
-//
-// xc/programs/xkbcomp/symbols/hr_US
-// $XFree86$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-
-
-default partial alphanumeric_keys 
-xkb_symbols "basic" {
-	include "us(basic)"
-
-    // Describes the differences between US/ASCII
-    // keyboard and a Croatian-US keyboard
-    // by Vlatko Kosturjak (kost at linux.hr)
-
-    // Alphanumeric section
-    name[Group1]= "Croatian(US)";
-    key <AD01> {	[	  q,	Q 		],
-			[ backslash			]	};
-    key <AD02> {	[	  w,	W 		],
-			[ bar				]	};
-    key <AD03> {	[	  e,	E		],
-			[  EuroSign			]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  y,	Y		],
-    			[	  z,    Z		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD11> {	[ bracketleft, braceleft	],
-    			[ scaron,	Scaron		] 	};
-    key <AD12> {	[ bracketright, braceright	],
-    			[      dstroke,	Dstroke		]	};
-    key <AC04> {	[	  f,	F		],
-			[ bracketleft			]	};
-    key <AC05> {	[	  g,	G		],
-			[ bracketright			]	};
-    key <AC08> {	[	  k,	K		],
-			[ lstroke			]	};
-    key <AC09> {	[	  l,	L		],
-			[ Lstroke			]	};
-    key <AC10> {	[ semicolon, 	colon		],
-    			[ ccaron,	Ccaron		]	};
-    key <AC11> {	[ apostrophe,	quotedbl	],
-    			[ cacute,	Cacute		]	};
-
-
-    key <LSGT> {	[ less,		greater		],
-			[	bar			]	};
-    key <AB01> {	[	  z,	Z 		],
-    			[	  y,	Y		]	};
-    key <AB04> {	[	  v,	V 		],
-			[ at				]	};
-    key <AB05> {	[	  b,	B 		],
-			[ braceleft			]	};
-    key <AB06> {	[	  n,	N 		],
-			[ braceright			]	};
-    key <AB07> {	[	  m,	M		],
-			[ section			]	};
-    key <AB08> {	[     comma,	less		],
-    			[ semicolon			]	};
-    key <AB09> {	[    period,	greater		],
-    			[ colon				]	};
-    key <AB10> {	[ slash,	question	],
-    			[     minus,	underscore	]	};
-    key <BKSL> {	[ backslash,	bar		],
-    			[ zcaron,	Zcaron		]	};
-    key <KPDL> {	[ KP_Delete,	KP_Separator	]	};
-    key <RALT> {	[ Mode_switch,	Multi_key	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "hr(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "hr(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/hu_qwerty	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-// Hungarian keyboard symbols for XKB and 101-key qwerty PC keyboard
-//
-// $XFree86$
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Check also ../rules/xfree86.lst
-
-
-default partial
-xkb_symbols "default" {
-    include "hu(101_qwerty_comma)"
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-    include "us(basic)"
-    include "hu(Sundeadkeys)" 
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "hu(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/il_phonetic	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-// $XConsortium: il_phonetic /main/3 1997/12/18 12:40:12 rch $
-//
-// $XFree86$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Israelian keyboard
-
-    // uses the phonetic layout from old Slackware 'il.map' file
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Israelian";
-
-include "us(basic)"
-
-    key <AE12> {        [     equal,    plus            ],
-			[ hebrew_doublelowline, hebrew_doublelowline ]};
-
-    key <AD01> {        [         q,    Q               ],
-			[ hebrew_qoph, hebrew_qoph	]	};
-    key <AD02> {        [         w,    W               ],
-			[ hebrew_waw, hebrew_waw	]	};
-    key <AD03> {        [         e,    E               ],
-			[ hebrew_aleph, hebrew_aleph	]       };
-    key <AD04> {        [         r,    R               ],
-			[ hebrew_resh, hebrew_resh	]	};
-    key <AD05> {        [         t,    T               ],
-			[ hebrew_taw, hebrew_tet	]       };
-    key <AD06> {        [         y,    Y               ],
-			[ hebrew_ayin, hebrew_ayin	]       };
-    key <AD07> {        [         u,    U               ],
-			[ hebrew_waw, hebrew_waw	]       };
-    key <AD08> {        [         i,    I               ],
-			[ hebrew_yod, hebrew_yod	]       };
-    key <AD09> {        [         o,    O               ],
-			[ hebrew_samech, hebrew_samech	]       };
-    key <AD10> {        [         p,    P               ],
-			[ hebrew_pe, hebrew_finalpe	]	};
-
-    key <AC01> {        [         a,    A               ],
-			[ hebrew_aleph, hebrew_aleph	]	};
-    key <AC02> {        [         s,    S               ],
-			[ hebrew_shin, hebrew_shin	]       };
-    key <AC03> {        [         d,    D               ],
-			[ hebrew_dalet, hebrew_dalet	]       };
-    key <AC04> {        [         f,    F               ],
-			[ hebrew_pe, hebrew_finalpe	]	};
-    key <AC05> {        [         g,    G               ],
-			[ hebrew_gimel, hebrew_gimel	]       };
-    key <AC06> {        [         h,    H               ],
-			[ hebrew_he, hebrew_he		]       };
-    key <AC07> {        [         j,    J               ],
-			[ hebrew_yod, hebrew_yod	]	};
-    key <AC08> {        [         k,    K               ],
-			[ hebrew_kaph, hebrew_finalkaph	]	};
-    key <AC09> {        [         l,    L               ],
-			[ hebrew_lamed, hebrew_lamed	]       };
-
-    key <AB01> {        [         z,    Z               ],
-			[ hebrew_zain, hebrew_zain	]       };
-    key <AB02> {        [         x,    X               ],
-			[ hebrew_chet, hebrew_chet	]       };
-    key <AB03> {        [         c,    C               ],
-			[ hebrew_zade, hebrew_finalzade	]       };
-    key <AB04> {        [         v,    V               ],
-			[ hebrew_waw, hebrew_waw	]       };
-    key <AB05> {        [         b,    B               ],
-			[ hebrew_bet, hebrew_bet	]       };
-    key <AB06> {        [         n,    N               ],
-			[ hebrew_nun, hebrew_finalnun	]	};
-    key <AB07> {        [         m,    M               ],
-			[ hebrew_mem, hebrew_finalmem	]	};
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "us(basic)"
-        include "il_phonetic(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "il_phonetic(Sundeadkeys)"
-};
-
-
--- a/src/xorg/keytables/sun-src/symbols/pc/kz	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Kazakhstan keyboard
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Kazakhstan";
-
-
-
-    key <AE01> {        [                       1,                  exclam      ],
-                        [                quotedbl,                  exclam      ]       };
-    key <AE06> {        [                       6,             asciicircum      ],
-                        [                   comma,               semicolon      ]       };
-    key <AE07> {        [                       7,               ampersand      ],
-                        [                  period,                   colon      ]       };
-    key <AB10> {        [                   slash,                question      ], 
-                        [              numerosign,                question      ]       };
-
-key.type[group2]="ALPHABETIC";
-
-    key <TLDE> {        [               parenleft,              parenright      ],
-                        [             Cyrillic_io,             Cyrillic_IO      ]       };
-    key <AE02> {        [                       2,                      at      ],
-                        [          Cyrillic_schwa,          Cyrillic_SCHWA      ]       };
-    key <AE03> {        [                       3,              numbersign      ],
-                        [             Ukrainian_i,             Ukrainian_I      ]       };
-    key <AE04> {        [                       4,                  dollar      ],
-                        [   Cyrillic_en_descender,   Cyrillic_EN_descender      ]       };
-    key <AE05> {        [                       5,                 percent      ],
-                        [        Cyrillic_ghe_bar,        Cyrillic_GHE_bar      ]       };
-    key <AE08> {        [                       8,                asterisk      ],
-                        [     Cyrillic_u_straight,     Cyrillic_U_straight      ]       };
-    key <AE09> {        [                       9,               parenleft      ],
-                        [ Cyrillic_u_straight_bar, Cyrillic_U_straight_bar      ]       };
-    key <AE10> {        [                       0,              parenright      ],
-                        [   Cyrillic_ka_descender,   Cyrillic_KA_descender      ]       };
-    key <AE11> {        [                   minus,              underscore      ],
-                        [          Cyrillic_o_bar,          Cyrillic_O_bar      ]       };
-    key <AE12> {        [                   equal,                    plus      ],
-                        [           Cyrillic_shha,           Cyrillic_SHHA      ]       };
-    key <AD01> {        [                       q,                       Q      ],
-                        [         Cyrillic_shorti,         Cyrillic_SHORTI      ]       };
-    key <AD02> {        [                       w,                       W      ],
-                        [            Cyrillic_tse,            Cyrillic_TSE      ]       };
-    key <AD03> {        [                       e,                       E      ],
-                        [              Cyrillic_u,              Cyrillic_U      ]       };
-    key <AD04> {        [                       r,                       R      ],
-                        [             Cyrillic_ka,             Cyrillic_KA      ]       };
-    key <AD05> {        [                       t,                       T      ],
-                        [             Cyrillic_ie,             Cyrillic_IE      ]       };
-    key <AD06> {        [                       y,                       Y      ],
-                        [             Cyrillic_en,             Cyrillic_EN      ]       };
-    key <AD07> {        [                       u,                       U      ],
-                        [            Cyrillic_ghe,            Cyrillic_GHE      ]       };
-    key <AD08> {        [                       i,                       I      ],
-                        [            Cyrillic_sha,            Cyrillic_SHA      ]       };
-    key <AD09> {        [                       o,                       O      ],
-                        [          Cyrillic_shcha,          Cyrillic_SHCHA      ]       };
-    key <AD10> {        [                       p,                       P      ],
-                        [             Cyrillic_ze,             Cyrillic_ZE      ]       };
-    key <AD11> {        [             bracketleft,               braceleft      ],
-                        [             Cyrillic_ha,             Cyrillic_HA      ]       };
-    key <AD12> {        [            bracketright,              braceright      ],
-                        [       Cyrillic_hardsign,       Cyrillic_HARDSIGN      ]       };
-    key <AC01> {        [                       a,                       A      ],
-                        [             Cyrillic_ef,             Cyrillic_EF      ]       };
-    key <AC02> {        [                       s,                       S      ],
-                        [           Cyrillic_yeru,           Cyrillic_YERU      ]       };
-    key <AC03> {        [                       d,                       D      ],
-                        [             Cyrillic_ve,             Cyrillic_VE      ]       };
-    key <AC04> {        [                       f,                       F      ],
-                        [              Cyrillic_a,              Cyrillic_A      ]       };
-    key <AC05> {        [                       g,                       G      ],
-                        [             Cyrillic_pe,             Cyrillic_PE      ]       };
-    key <AC06> {        [                       h,                       H      ],
-                        [             Cyrillic_er,             Cyrillic_ER      ]       };
-    key <AC07> {        [                       j,                       J      ],
-                        [              Cyrillic_o,              Cyrillic_O      ]       };
-    key <AC08> {        [                       k,                       K      ],
-                        [             Cyrillic_el,             Cyrillic_EL      ]       };
-    key <AC09> {        [                       l,                       L      ],
-                        [             Cyrillic_de,             Cyrillic_DE      ]       };
-    key <AC10> {        [               semicolon,                   colon      ],
-                        [            Cyrillic_zhe,            Cyrillic_ZHE      ]       };
-    key <AC11> {        [              apostrophe,                quotedbl      ],
-                        [              Cyrillic_e,              Cyrillic_E      ]       };
-    key <AB01> {        [                       z,                       Z      ],
-                        [             Cyrillic_ya,             Cyrillic_YA      ]       };
-    key <AB02> {        [                       x,                       X      ],
-                        [            Cyrillic_che,            Cyrillic_CHE      ]       };
-    key <AB03> {        [                       c,                       C      ],
-                        [             Cyrillic_es,             Cyrillic_ES      ]       };
-    key <AB04> {        [                       v,                       V      ],
-                        [             Cyrillic_em,             Cyrillic_EM      ]       };
-    key <AB06> {        [                       n,                       N      ],
-                        [             Cyrillic_te,             Cyrillic_TE      ]       };
-    key <AB05> {        [                       b,                       B      ],
-                        [              Cyrillic_i,              Cyrillic_I      ]       };
-    key <AB07> {        [                       m,                       M      ],
-                        [       Cyrillic_softsign,       Cyrillic_SOFTSIGN      ]       };
-    key <AB08> {        [                   comma,                    less      ],
-                        [             Cyrillic_be,             Cyrillic_BE      ]       };
-    key <AB09> {        [                  period,                 greater      ],
-                        [             Cyrillic_yu,             Cyrillic_YU      ]       };
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-include "kz(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-include "kz(Sundeadkeys)"
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/nl	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-// Converted keytable file to xkb/symbols/ file
-// with mk_xkb by [email protected] Tue Sep 30 00:53:29 MET DST 1997
-
-// converted from the nl-latin.map of the Linux kbd package by
-// Pablo Saratxaga <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Nederland keyboard
-
-    // Alphanumeric section
-    name[Group1]= "Nederland";
-
-    key <AE01> {	[         1,	exclam   	],
-			[ onesuperior			]	};
-    key <AE02> {	[         2,	quotedbl 	],
-			[ twosuperior			]	};
-    key <AE03> {	[         3,	numbersign	],
-			[ threesuperior			]	};
-    key <AE04> {	[         4,	dollar   	],
-			[ onequarter			]	};
-    key <AE05> {	[         5,	percent  	],
-			[ onehalf			]	};
-    key <AE06> {	[         6,	ampersand	],
-			[ threequarters			]	};
-    key <AE07> {	[         7,	underscore	],
-			[  sterling			]	};
-    key <AE08> {	[         8,	parenleft	],
-			[ braceleft			]	};
-    key <AE09> {	[         9,	parenright	],
-			[ braceright			]	};
-    key <AE10> {	[         0,	quoteright	],	
-			[ quoteleft                     ]       };              
-    key <AE11> {	[     slash,	question 	],
-			[ backslash			]	};
-    key <AE12> {	[    degree,	dead_tilde	],
-			[ dead_cedilla			]	};
-    key <AD03> {	[         e,	E        	],
-			[    EuroSign		   	]	};
-    key <AD04> {	[         r,	R        	],
-			[ paragraph			]	};
-    key <AD05> {	[         t,	T        	]	};
-    key <AD06> {	[         y,	Y        	]	};
-    key <AD07> {	[         u,	U        	]	};
-    key <AD08> {	[         i,	I        	]	};
-    key <AD09> {	[         o,	O        	]	};
-    key <AD10> {	[         p,	P        	]	};
-    key <AD11> {	[ dead_diaeresis,	dead_circumflex	],
-			[ asciitilde,	asciicircum	]	};
-    key <AD12> {	[  asterisk,	bar      	],
-                        [  asciitilde 			]	};
-    key <AC01> {	[         a,	A        	]	};
-    key <AC02> {	[         s,	S        	],
-			[    ssharp			]	};
-    key <AC03> {	[         d,	D        	]	};
-    key <AC04> {	[         f,	F        	]	};
-    key <AC10> {	[      plus,	plusminus	]	};
-    key <AC11> {	[ dead_acute,   dead_grave    	],
-			[ apostrophe,	grave		]	};
-    key <TLDE> {	[        at,	section  	],
-			[   notsign			]	};
-    key <BKSL> {	[      less,	greater  	],	
-                        [   asciicircum                 ]       };
-    key <AB01> {	[         z,	Z        	],
-			[ guillemotleft			]	};
-    key <AB02> {	[         x,	X        	],
-			[ guillemotright		]	};
-    key <AB03> {	[         c,	C        	],
-			[      cent			]	};
-    key <AB06> {	[         n,	N        	]	};
-    key <AB07> {	[         m,	M        	],
-			[  Greek_mu,	Greek_mu	]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon    	],	
-			[ periodcentered		]	};
-    key <AB10> {	[     minus,	equal    	]	};
-    key <LSGT> {	[ bracketleft,	bracketright	],
-			[ brokenbar			]	};
-
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "nl(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "nl(Sundeadkeys)"
-
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/no	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-// $XdotOrg$
-// based on a keyboard map from an 'xkb/symbols/no' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/no,v 1.3 2002/12/19 01:07:56 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a Norwegian keyboard with dead key support
-    // and all of ISO-8859-1 characters available.
-
-    include "pc/latin(type2)"
-
-    name[Group1]="Norway";
-
-    key <AE11>	{ [      plus,   question,    plusminus, questiondown ]	};
-    key <AE12>	{ [ backslash, dead_grave,   dead_acute,      notsign ]	};
-
-    key <AE05>  { [     5,        percent,      asciitilde           ] };
-    key <AE06>  { [     6,      ampersand,      asciicircum          ] };
-
-    key <AC10>	{ [    oslash,   Ooblique,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [        ae,         AE, dead_circumflex, dead_caron]	};
-    key <TLDE>	{ [       bar,    section,    brokenbar,    paragraph ]	};
-
-    key <BKSL>	{ [apostrophe,   asterisk,	grave                 ] };
-    key <LSGT>	{ [      less,    greater,      onehalf, threequarters]	};
-
-    include "keypad(comma)"
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic Norwegian layout to eliminate dead keys
-
-    include "pc/no(basic)"
-
-    name[Group1]="Norway - Eliminate dead keys";
-
-    key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
-    key <AD12>	{ [ diaeresis, asciicircum,   asciitilde,      macron ]	};
-    key <AC10>	{ [    oslash,   Ooblique,        acute,  doubleacute ]	};
-    key <AC11>	{ [        ae,         AE,  asciicircum,        caron ]	};
-    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
-    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
-};
-
-// Norwegian Dvorak
-partial alphanumeric_keys 
-xkb_symbols "dvorak" {
-    include "pc/us(dvorak)"
-
-    name[Group1]="Norway - Dvorak";
-
-    key <TLDE> { [	  bar,	section, brokenbar, paragraph	] };
-
-    key <AE01> { [	    1,	exclam, exclamdown, onesuperior	] };
-    key <AE02> { [	    2,	quotedbl,   at,     twosuperior	] };
-    key <AE03> { [	    3,	numbersign, sterling, threesuperior ] };
-    key <AE04> { [	    4,	dollar,     currency,onequarter	] };
-    key <AE05> { [	    5,	percent,    onehalf,	onehalf	] };
-    key <AE06> { [	    6,	ampersand,  threequarters, threequarters ] };
-    key <AE07> { [	    7,	slash,      braceleft, division	] };
-    key <AE08> { [	    8,	parenleft,  bracketleft		] };
-    key <AE09> { [	    9,	parenright, bracketright	] };
-    key <AE10> { [	    0,	equal,	    braceright		] };
-    key <AE11> { [	 plus,	question,   plusminus, questiondown ] };
-    key <AE12> { [   backslash,	grave,	    dead_acute,	dead_grave  ] };
-
-    key <AD01> { [       aring,	Aring,  braceright, bracketright ] };
-    key <AD02> { [	comma,	semicolon, dead_cedilla, cedilla ] };
-    key <AD03> { [      period,	colon,  periodcentered		 ] };
-    key <AD04> { [	    p,	P,      thorn,	THORN		 ] };
-    key <AD05> { [	    y,	Y,      yen			 ] };
-    key <AD06> { [	    f,	F,      ordfeminine		 ] };
-    key <AD08> { [	    c,	C,      ccedilla, copyright	 ] };
-    key <AD09> { [	    r,	R,      registered		 ] };
-    key <AD11> { [  apostrophe,	asterisk, dead_circumflex, acute ] };
-    key <AD12> { [  asciitilde,	asciicircum, dead_diaeresis, dead_tilde	] };
-
-    key <AC03> { [	    e,	E,      EuroSign,	cent	 ] };
-    key <AC05> { [	    i,	I,      idotless,       Iabovedot] };
-    key <AC06> { [	    d,	D,      eth,		ETH	 ] };
-    key <AC10> { [	    s,	S,      ssharp			 ] };
-    key <AC11> { [	minus,	underscore, hyphen,	diaeresis] };
-
-    key <AB01> { [	   ae,	AE,     braceleft,	bracketleft] };
-    key <AB05> { [	    x,	X,      multiply		 ] };
-    key <AB07> { [	    m,	M,	mu			 ] };
-    key <BKSL> { [	 less,	greater, guillemotleft, guillemotright	] };
-
-    key <SPCE> { [	 space,	space, nobreakspace, nobreakspace] };
-
-    key <LSGT> { [	oslash,	Ooblique,  bar,	backslash	 ] };
-
-};
-
-// based on
-// Northern Sami keyboards for Finland, Norway and Sweden
-//
-// Describes the differences between a very simple en_US
-// keyboard and a Norwegian Northern Sami keyboard (with
-// dead key support) according to the spec on
-// http://www.hum.uit.no/a/trond/se-lat9-no-keys.html
-// Written by B�rre Gaup <[email protected]>
-//
-// $XFree86: xc/programs/xkbcomp/symbols/sapmi,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial alphanumeric_keys
-xkb_symbols "smi" {
-    include "pc/latin"
-
-    name[Group1]= "Norway - Northern Saami";
-
-    key <AE01>	{ [         1,     exclam,    copyright,   exclamdown ]	};
-    key <AE02>	{ [         2,   quotedbl,           at,   registered ]	};
-    key <AE03>	{ [         3, numbersign,     sterling,         less ]	};
-    key <AE04>	{ [         4,     dollar,       dollar,      greater ]	};
-    key <AE05>	{ [         5,    percent,        U2022,        U2030 ]	};
-    key <AE06>	{ [         6,  ampersand,      section,    paragraph ]	};
-    key <AE07>	{ [         7,      slash,    braceleft,          bar ]	};
-    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
-    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
-    key <AE10>	{ [         0,      equal,   braceright,     notequal ]	};
-    key <AE11>	{ [      plus,   question,     division, questiondown ]	};
-    key <AE12>	{ [ backslash,      grave,        acute,   asciitilde ]	};
-
-    key <AD01>	{ [    aacute,     Aacute,            q,            Q ]	};
-    key <AD02>	{ [    scaron,     Scaron,            w,            W ]	};
-    key <AD03>	{ [         e,          E,       eacute,       Eacute ]	};
-    key <AD04>	{ [         r,          R,   registered,    trademark ]	};
-    key <AD06>	{ [         y,          Y,       yacute,       Yacute ]	};
-    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
-    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
-    key <AD09>	{ [         o,          O,           oe,           OE ]	};
-    key <AD11>	{ [     aring,      Aring,  acircumflex,  Acircumflex ]	};
-    key <AD12>	{ [       eng,        ENG,     quotedbl,  asciicircum ]	};
-
-    key <AC01>	{ [         a,          A,       agrave,       Agrave ]	};
-    key <AC02>	{ [         s,          S,       ssharp,   apostrophe ]	};
-    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};
-    key <AC05>	{ [         g,          G,       gcaron,       Gcaron ]	};
-    key <AC06>	{ [         h,          H,        U01E5,        U01E4 ]	};
-    key <AC07>	{ [         j,          J,      notsign,     multiply ]	};
-    key <AC08>	{ [         k,          K,        U01E9,        U01E8 ]	};
-    key <AC09>	{ [         l,          L,       degree,       hyphen ]	};
-    key <AC10>	{ [    oslash,   Ooblique,   odiaeresis,   Odiaeresis ]	};
-    key <AC11>	{ [        ae,         AE,   adiaeresis,   Adiaeresis ]	};
-    key <TLDE>	{ [       bar,    section,    brokenbar,    paragraph ]	};
-
-    key <BKSL>	{ [   dstroke,    Dstroke,   apostrophe,     asterisk ]	};
-    key <AB01>	{ [         z,          Z,        U0292,        U01B7 ]	};
-    key <AB02>	{ [    ccaron,     Ccaron,            x,            X ]	};
-    key <AB03>	{ [         c,          C,     ccedilla,     Ccedilla ]	};
-    key <AB04>	{ [         v,          V, lessthanequal, guillemotleft ] };
-    key <AB05>	{ [         b,          B, greaterthanequal, guillemotright ] };
-    key <AB06>	{ [         n,          N, leftsinglequotemark, leftdoublequotemark ] };
-    key <AB07>	{ [         m,          M, rightsinglequotemark, rightdoublequotemark ]	};
-    key <AB08>	{ [     comma,  semicolon, singlelowquotemark, doublelowquotemark ] };
-    key <AB09>	{ [    period,      colon,     ellipsis, periodcentered ] };
-    key <AB10>	{ [     minus, underscore,       endash,       emdash ]	};
-
-    key <LSGT>	{ type[Group1] = "FOUR_LEVEL",
-                  [    zcaron,     Zcaron,        U01EF,        U01EE ]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "smi_nodeadkeys" {
-
-    // Modifies the basic Norwegian layout to eliminate dead keys
-
-    include "pc/no(smi)"
-
-    name[Group1]= "Norway - Northern Saami, eliminate dead keys";
-
-    key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/pc	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,280 +0,0 @@
-// $XdotOrg: xc/programs/xkbcomp/symbols/pc/pc,v 1.4 2005/08/12 11:08:49 pascal Exp $
-//
-// $XFree86: xc/programs/xkbcomp/symbols/pc/pc,v 1.9 2003/06/09 19:59:46 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial hidden alphanumeric_keys modifier_keys 
-xkb_symbols "basic" {
-    include "us(basic)"
-    key <ESC>  {	[ Escape			]	};
-
-    // Alphanumeric section
-    key <TLDE> {	[     grave,	asciitilde	]	};
-    key <AE01> {	[	  1,	exclam 		]	};
-    key <AE02> {	[	  2,	at		]	};
-    key <AE03> {	[	  3,	numbersign	]	};
-    key <AE04> {	[	  4,	dollar		]	};
-    key <AE05> {	[	  5,	percent		]	};
-    key <AE06> {	[	  6,	asciicircum	]	};
-    key <AE07> {	[	  7,	ampersand	]	};
-    key <AE08> {	[	  8,	asterisk	]	};
-    key <AE09> {	[	  9,	parenleft	]	};
-    key <AE10> {	[	  0,	parenright	]	};
-    key <AE11> {	[     minus,	underscore	]	};
-    key <AE12> {	[     equal,	plus		]	};
-
-    key <BKSP> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ BackSpace,   Terminate_Server ]
-    };
-
-    key  <TAB> {	[ 	Tab,	ISO_Left_Tab	]	};
-    key <RTRN> {	[ Return			]	};
-
-    key <CAPS> {	[	Caps_Lock		]	};
-
-    key <LFSH> {	[ 	 Shift_L		]	};
-    key <BKSL> {	[ backslash,	bar		]	};
-
-    key <LCTL> {	[ 	 Control_L		]	};
-    key <SPCE> {	[ 	 space			]	};
-
-    key <RTSH> {	[ 	Shift_R		]	};
-    key <LALT> {	[ 	Alt_L	 	]	};
-    key <RCTL> {	[ 	Control_R	]	};
-    key <RALT> {        [ Mode_switch,  Multi_key       ]       };
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]
-    };
-    key <FK02> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]
-    };
-    key <FK03> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]
-    };
-    key <FK04> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]
-    };
-    key <FK05> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]
-    };
-    key <FK06> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]
-    };
-    key <FK07> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]
-    };
-    key <FK08> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]
-    };
-    key <FK09> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]
-    };
-    key <FK10> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]
-    };
-    key <FK11> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]
-    };
-    key <FK12> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]
-    };
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> {
-	type= "PC_SYSRQ",
-	symbols[Group1]= [ Print, Sys_Req ]
-    };
-    key <SYRQ> {
-	type= "PC_SYSRQ",
-	symbols[Group1]= [ Print, Sys_Req ]
-    };
-    key <SCLK> {  [  Scroll_Lock	]	};
-    key <PAUS> {
-	type= "PC_BREAK",
-	symbols[Group1]= [ Pause, Break ]
-    };
-    key <BRK> {
-	type= "PC_BREAK",
-	symbols[Group1]= [ Pause, Break ]
-    };
-    key  <INS> {	[  Insert		]	};
-    key <HOME> {	[  Home			]	};
-    key <PGUP> {	[  Prior		]	};
-    key <DELE> {	[  Delete		]	};
-    key  <END> {	[  End			]	};
-    key <PGDN> {	[  Next			]	};
-
-    key   <UP> {	[  Up			]	};
-    key <LEFT> {	[  Left			]	};
-    key <DOWN> {	[  Down			]	};
-    key <RGHT> {	[  Right		]	};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> {	[  Num_Lock, Pointer_EnableKeys		]	};
-
-// Ungrab cancels server/keyboard/pointer grabs
-    key <KPDV> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ KP_Divide,	XF86_Ungrab ]
-    };
-
-// ClsGrb kills whichever client has a grab in effect
-    key <KPMU> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ KP_Multiply,	XF86_ClearGrab ]
-    };
-
-// -VMode switches to the previous video mode
-    key <KPSU> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ KP_Subtract,	XF86_Prev_VMode ]
-    };
-
-    key  <KP7> {	[  KP_Home,	KP_7	]	};
-    key  <KP8> {	[  KP_Up,	KP_8	]	};
-    key  <KP9> {	[  KP_Prior,	KP_9	]	};
-
-// +VMode switches to the next video mode
-    key <KPAD> {
-        type="CTRL+ALT",
-        symbols[Group1]= [ KP_Add,	XF86_Next_VMode ]
-    };
-
-    key  <KP4> {	[  KP_Left,	KP_4	]	};
-    key  <KP5> {	[  KP_Begin,	KP_5	]	};
-    key  <KP6> {	[  KP_Right,	KP_6	]	};
-
-    key  <KP1> {	[  KP_End,	KP_1	]	};
-    key  <KP2> {	[  KP_Down,	KP_2	]	};
-    key  <KP3> {	[  KP_Next,	KP_3	]	};
-    key <KPEN> {	[  	KP_Enter	]	};
-    key <KPEQ> {	[  	KP_Equal	]	};
-
-    key  <KP0> {	[  KP_Insert,	KP_0	]	};
-    key <KPDL> {  	[  KP_Delete,	KP_Decimal ]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod2   { Num_Lock };
-
-    //  Fake keys for virtual<->real modifiers mapping 
-    key <LVL3> {	[ ISO_Level3_Shift	]	};
-    key <MDSW> {	[ Mode_switch 		]	};
-    modifier_map Mod5   { <LVL3>, <MDSW> };
-
-    key <ALT>  {	[ NoSymbol, Alt_L	]	};
-    modifier_map Mod1   { <ALT>, <LALT> };
-
-    key <META> {	[ NoSymbol, Meta_L	]	};
-    modifier_map Mod1   { <META> };
-
-    key <SUPR> {	[ NoSymbol, Super_L	]	};
-    modifier_map Mod4   { <SUPR> };
-
-    key <HYPR> {	[ NoSymbol, Hyper_L	]	};
-    modifier_map Mod4   { <HYPR> };
-};
-
-// definition for the PC-AT type 101 key keyboard
-xkb_symbols "pc101" {
-    include "pc/pc(basic)"
-    key <LALT> {	[ 	Alt_L,	Meta_L 		]	};
-
-};
-
-// definition for the extra key on 102-key keyboards
-xkb_symbols "pc102" {
-    include "pc/pc(pc101)"
-    key <LSGT> { [      less,    greater,          bar,    brokenbar ]	};
-};
-
-// definition for the extra keys on 104-key "Windows95" keyboards
-default
-xkb_symbols "pc104" {
-    include "pc/pc(basic)"
-    key <LALT> {	[ 	Alt_L,	Meta_L		]	};
-    key <LWIN> {	[	Super_L			]	};
-    key <RWIN> {	[	Super_R			]	};
-    key <MENU> {	[	Menu			]	};
-
-};
-
-// defintion which includes both the Windows95 keyboards _and_
-// the extra key on most European keyboards.
-xkb_symbols "pc105" {
-    include "pc/pc(pc104)"
-    key <LSGT> { [      less,    greater,          bar,    brokenbar ]	};
-};
-
-// common keys which can be overwritten in some layouts
-xkb_symbols "common" {
-
-    // Alphanumeric section
-    key <TLDE> {	[     grave,	asciitilde	]	};
-    key <AE01> {	[	  1,	exclam 		]	};
-    key <AE02> {	[	  2,	at		]	};
-    key <AE03> {	[	  3,	numbersign	]	};
-    key <AE04> {	[	  4,	dollar		]	};
-    key <AE05> {	[	  5,	percent		]	};
-    key <AE06> {	[	  6,	asciicircum	]	};
-    key <AE07> {	[	  7,	ampersand	]	};
-    key <AE08> {	[	  8,	asterisk	]	};
-    key <AE09> {	[	  9,	parenleft	]	};
-    key <AE10> {	[	  0,	parenright	]	};
-    key <AE11> {	[     minus,	underscore	]	};
-    key <AE12> {	[     equal,	plus		]	};
-
-    key <BKSL> {	[ backslash,	bar		]	};
-    key <SPCE> {	[ 	 space			]	};
-
-    // "Keypad" section
-    key <KPDL> {  	[  KP_Delete,	KP_Decimal	]	};
-
-    // extra keys on 104-key "Windows95" keyboards
-    key <LWIN> {	[	Super_L			]	};
-    key <RWIN> {	[	Super_R			]	};
-    key <MENU> {	[	Menu			]	};
-
-    // the extra key on most European keyboards
-    key <LSGT> { [      less,    greater,          bar,    brokenbar ]	};
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/pl	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-// $Xorg: pl,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/pl,v 3.5 2001/01/17 23:45:59 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple QWERTZ Polish keybaord
-
-    name[Group1]= "Polish";
-
-    key <TLDE> { [ 	dead_ogonek, 	dead_abovedot 	]	};
-
-    key <AE01> { [ 1,			exclam		],
-		 [ asciitilde  	                	]	};
-    key <AE02> { [ 2,			quotedbl	],
-		 [ dead_caron 				]	};
-    key <AE03> { [ 3,			numbersign 	],
-		 [ dead_circumflex 			]	};
-    key <AE04> { [ 4,			dollar	 	],
-		 [ dead_breve				]	};
-    key <AE05> { [ 5,			percent 	],
-		 [ dead_abovering			]	};
-    key <AE06> { [ 6,			ampersand	],
-		 [ dead_ogonek	 			]	};
-    key <AE07> { [ 7,			slash		],
-		 [ grave				]	};
-    key <AE08> { [ 8,			parenleft	],
-		 [ dead_abovedot			]	};
-    key <AE09> { [ 9,			parenright	],
-		 [ dead_acute			 	]	};
-    key <AE10> { [ 0,			equal	 	],
-		 [ dead_doubleacute			]	};
-    key <AE11> { [ plus,		question 	],
-		 [ dead_diaeresis			]	};
-    key <AE12> { [ apostrophe,		asterisk 	],
-		 [ dead_cedilla				]	};
-
-    key <AD01> { [ q,			Q	 	],
-		 [ backslash				]	};
-    key <AD02> { [ w,			W	 	],
-		 [ bar					]	};
-    key <AD03> { [ e,			E		] 	};       
-    key <AD04> { [ r,			R		]	};
-    key <AD05> { [ t,			T		]	};
-    key <AD06> { [ z,			Z		]	};
-    key <AD07> { [ u,			U		],
-                 [ EuroSign,		cent		]	};
-    key <AD08> { [ i,			I		]	};
-    key <AD09> { [ o,			O		]	};
-    key <AD10> { [ p,			P		]	};
-    key <AD11> { [ zabovedot,		nacute		],
-		 [ division				]	};
-    key <AD12> { [ sacute,		cacute		],
-		 [ multiply				]	};
-
-    key <AC01> { [ a,			A		]	};
-    key <AC02> { [ s,			S		],
-		 [ dstroke				]	};
-    key <AC03> { [ d,			D		],
-		 [ Dstroke				]	};
-    key <AC04> { [ f,			F		],
-		 [ bracketleft				]	};
-    key <AC05> { [ g,			G		],
-		 [ bracketright				]	};
-    key <AC06> { [ h,			H		]	};
-    key <AC07> { [ j,			J		]	};
-    key <AC08> { [ k,			K		]	};
-    key <AC09> { [ l,			L		]	};
-    key <AC10> { [ lstroke,		Lstroke		],
-		 [ dollar				]	};
-    key <AC11> { [ aogonek,		eogonek 	],
-		 [ ssharp				]	};
-
-    key <BKSL> { [ oacute,		zacute		]	};
-
-    key <AB01> { [ y,			Y	 	]	};
-    key <AB02> { [ x,			X	 	]	};
-    key <AB03> { [ c,			C	 	]	};
-    key <AB04> { [ v,			V	 	],
-		 [ at					]	};
-    key <AB05> { [ b,			B	 	],
-		 [ braceleft				]	};
-    key <AB06> { [ n,			N	 	],
-		 [ braceright				]	};
-    key <AB07> { [ m,			M	 	],
-		 [ section				]	};
-    key <AB08> { [ comma,		semicolon 	]	};
-    key <AB09> { [ period,		colon	 	]	};
-    key <AB10> { [ minus,		underscore	]	};
-
-    key <LSGT> { [ less,		greater		],
-		 [ bar,			brokenbar	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "pl(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "pl(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "pl(basic)" // for consistent naming
-};
-// end of file /usr/X11R6/bin/X11/xkb/symbols/pl
--- a/src/xorg/keytables/sun-src/symbols/pc/pl_dev	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-// $Xorg: pl,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/pl,v 3.5 2001/01/17 23:45:59 dawes Exp $
-
-//  Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple QWERTZ Polish keybaord
-    // Polish Developer version
-
-    name[Group1]= "Polish";
-
-    key <TLDE> { [ grave, 		asciitilde	]	};
-    key <AE01> { [ 1,			exclam		]	};
-    key <AE02> { [ 2,			at		]	};
-    key <AE03> { [ 3,			numbersign 	]	};
-    key <AE04> { [ 4,			dollar	 	]	};
-    key <AE05> { [ 5,			percent 	]	};
-    key <AE06> { [ 6,			asciicirum	]	};
-    key <AE07> { [ 7,			ampersand	]	};
-    key <AE08> { [ 8,			asterisk	]	};
-    key <AE09> { [ 9,			parenleft	]	};
-    key <AE10> { [ 0,			parenright	]	};
-    key <AE11> { [ minus,		underscore 	]	};
-    key <AE12> { [ equal,		plus	 	]	};
-
-    key <AD01> { [ q,			Q	 	]	};
-    key <AD02> { [ w,			W	 	]	};
-    key <AD03> { [ e,			E		], 	
-		 [ eogonek,		Eogonek		]	};       
-    key <AD04> { [ r,			R		]	};
-    key <AD05> { [ t,			T		]	};
-    key <AD06> { [ y,			Y		]	};
-    key <AD07> { [ u,			U		],
-                 [ EuroSign,		EuroSign	]	};
-    key <AD08> { [ i,			I		]	};
-    key <AD09> { [ o,			O		],	
-		 [ oacute,		Oacute		]	};
-    key <AD10> { [ p,			P		]	};
-    key <AD11> { [ braceleft, 		bracketleft	]	};
-    key <AD12> { [ braceright,          bracketright	]	};
-
-    key <RTRN> { [ Return				]	};
-
-    key <AC01> { [ a,			A		],
-		 [ aogonek,		Aogonek		]	};
-    key <AC02> { [ s,			S		],
-		 [ sacute,		Sacute		]	};
-    key <AC03> { [ d,			D		]	};
-    key <AC04> { [ f,			F		]	};
-    key <AC05> { [ g,			G		]	};
-    key <AC06> { [ h,			H		]	};
-    key <AC07> { [ j,			J		]	};
-    key <AC08> { [ k,			K		]	};
-    key <AC09> { [ l,			L		],
-		 [ lstroke,             Lstroke		]	};
-    key <AC10> { [ semicolon,		colon		]	};
-    key <AC11> { [ apostrophe,		quotedbl 	]	};
-
-    key <BKSL> { [ backslash,		bar		]	};
-
-    key <AB01> { [ z, 			Z	 	],
-		 [ zabovedot,		Zabovedot	]	};
-    key <AB02> { [ x,			X	 	],
-		 [ zacute,		Zacute		]	};
-    key <AB03> { [ c,			C	 	],
-		 [ cacute,		Cacute		]	};
-    key <AB04> { [ v,			V	 	]	};
-    key <AB05> { [ b,			B	 	]	};
-    key <AB06> { [ n,			N	 	],
-		 [ nacute,		Nacute		]	};
-    key <AB07> { [ m,			M	 	]	};
-    key <AB08> { [ comma,		less 		]	};
-    key <AB09> { [ period,		greater	 	]	};
-    key <AB10> { [ slash,		question	]	};
-
-    key <LSGT> { [ less,		greater		],
-		 [ bar,			brokenbar	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "pl_dev(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "pl_dev(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "pl_dev(basic)" // for consistent naming
-};
-// end of file /usr/X11R6/bin/X11/xkb/symbols/pl_dev
--- a/src/xorg/keytables/sun-src/symbols/pc/ro2	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-// symbols definition for Romanian Keyboard layout.
-//
-// Created by Derrick Jobidon, <[email protected]> (C) 2001
-// Inspired from modified US keyboard by Cristian Gafton
-//
-// $XFree86$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-    name[Group1]= "Romanian";
-
-	include "us(basic)"
-
-    key <TLDE> { [ bracketright, bracketleft	] };
-    key <AE01> { [ 1, exclam ], [ asciitilde, asciitilde ] };
-    key <AE02> { [ 2, quotedbl ], [dead_caron, dead_caron ] };
-    key <AE03> { [ 3, numbersign ], [dead_circumflex, dead_circumflex] };
-    key <AE04> { [ 4, currency], [dead_breve, dead_breve] };
-    key <AE05> { [ 5, percent], [ dead_abovering ] };
-    key <AE06> { [ 6, ampersand], [ dead_ogonek ] };
-    key <AE07> { [ 7, slash], [dead_grave, dead_grave] };
-    key <AE08> { [ 8, parenleft], [ dead_abovedot ] };
-    key <AE09> { [ 9, parenright], [dead_acute, dead_acute] };
-    key <AE10> { [ 0, equal], [ dead_doubleacute ] };
-    key <AE11> { [ plus, question], [dead_diaeresis, dead_diaeresis] };
-    key <AE12> { [ quoteright, asterisk], [dead_cedilla] };
-    key <BKSL> { [ acircumflex, Acircumflex] };
-    key <AD01> { [ q, Q], [backslash, backslash] };
-    key <AD02> { [ w, W], [bar, bar] };
-    key <AD03> { [ e, E], [EuroSign, EuroSign] };
-    key <AD04> { [ r, R], [registered, registered] };
-    key <AD05> { [ t, T], [trademark, trademark] };
-    key <AD06> { [ z, Z] };
-    key <AD11> { [ abreve, Abreve], [division, division] };
-    key <AD12> { [ icircumflex,	Icircumflex], [multiply, multiply] };
-    key <AC02> { [ s, S], [ dstroke, dstroke ] };
-    key <AC03> { [ d, D], [ Dstroke, Dstroke ] };
-    key <AC08> { [ k, K], [ lstroke, lstroke ] };
-    key <AC09> { [ l, L], [ Lstroke, Lstroke ] };
-    key <AC10> { [ scedilla, Scedilla], [dollar, dollar] };
-    key <AC11> { [ tcediila, Tcedilla], [ ssharp, ssharp ] };
-    key <AB01> { [ y, Y] };
-    key <AB03> { [ c, C], [copyright, copyright] };
-    key <AB04> { [ v, V], [at, at] };
-    key <AB05> { [ b, B], [braceleft, braceleft] };
-    key <AB06> { [ n, N], [braceright,braceright] };
-    key <AB07> { [ m, M], [section, section] };
-    key <AB08> { [ comma, semicolon], [less, less] };
-    key <AB09> { [ period, colon], [greater, greater] };
-    key <AB10> { [ minus, underscore] };
-
-};
-
-default
-xkb_symbols "pc101" {
-    key <RALT> { [ Mode_switch,  Multi_key ] };
-
-    include "ro(basic)"
-
-    modifier_map Mod3 { Mode_switch };
-};
-
-xkb_symbols "pc104" {
-    key <RALT> { [ Mode_switch ] };
-    key <RWIN> { [ Multi_key ] };
-
-    include "ro(basic)"
-
-    modifier_map Mod3 { Mode_switch };
-};
-
-xkb_symbols "pc105" {
-    key <RALT> { [ Mode_switch ] };
-    key <RWIN> { [ Multi_key ] };
-
-    include "ro(basic)"
-
-    modifier_map Mod3 { Mode_switch };
-};
-
-xkb_symbols "alt_is_meta" {
-    key <LALT> {  [  Meta_L ]  };
-    key <LWIN> {  [  Alt_L  ]  };
-
-    include "ro(pc104)"
-
-    // modifier mappings
-    modifier_map Mod1   { Meta_L, Meta_R };
-    modifier_map Mod4   { Alt_L,  Alt_R  };
-};
-
-xkb_symbols "comma" {
-    include "ro(basic)"
-
-    key <AC10> { [ 0x1000219, 0x1000218 ], [dollar, dollar] };
-    key <AC11> { [ 0x100021b, 0x100021a ], [ ssharp, ssharp ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "ro(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "ro(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/ru	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,316 +0,0 @@
-// $Xorg: ru,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-//
-// russian standard keyboard
-// AEN <[email protected]>
-// Last Changes 2001/12/23 by Leon Kanter <[email protected]>
-// $XFree86: xc/programs/xkbcomp/symbols/ru,v 3.9 2002/01/16 18:20:12 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Russian keyboard
-
-    name[Group1]= "Russian";
-    name[Group2]= "US/ASCII";
-
-    key	<AE01> {	[		1,	    exclam	],
-			[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,        quotedbl	],
-			[		2,		at	]	};
-    key	<AE03> {	[		3,      numerosign	],
-			[		3,	numbersign	]	};
-    key	<AE04> {	[		4,        asterisk	],
-			[		4,	    dollar	]	};
-    key	<AE05> {	[		5,	     colon	],
-			[		5,	   percent	]	};
-    key	<AE06> {	[		6,	     comma	],
-			[		6,     asciicircum	]	};
-    key	<AE07> {	[		7,	    period	],
-			[		7,	 ampersand	]	};
-    key	<AE08> {	[		8,	 semicolon	],
-			[		8,	  asterisk	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	],
-			[		0,	parenright	]	};
-    key	<AE11> {	[	    minus,	underscore	],
-			[	    minus,	underscore	]	};
-    key	<AE12> {	[	    equal,	      plus	],
-			[	    equal,	      plus	]	};
-    key	<BKSL> {	[	backslash,	       bar	],
-			[	backslash,             bar	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	    slash,	  question	]	};
-    key <LSGT> { 	[           slash,             bar      ]       };
-
-key.type[group2]="ALPHABETIC";
-
-    key	<TLDE> {	[	    grave,	asciitilde	]	};
-    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	],
-			[		q,		 Q	]	};
-    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	],
-			[		w,		 W	]	};
-    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	],
-			[		e,		 E	]	};
-    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	],
-			[		r,		 R	]	};
-    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	],
-			[		t,		 T	]	};
-    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	],
-			[		y,		 Y	]	};
-    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	],
-			[		u,		 U	]	};
-    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	],
-			[		i,		 I	]	};
-    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	],
-			[		o,		 O	]	};
-    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	],
-			[		p,		 P	]	};
-    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	],
-			[     bracketleft,	 braceleft	]	};
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	],
-			[    bracketright,	braceright	]	};
-    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	],
-			[		a,		 A	]	};
-    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	],
-			[		s,		 S	]	};
-    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	],
-			[		d,		 D	]	};
-    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	],
-			[		f,		 F	]	};
-    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	],
-			[		g,		 G	]	};
-    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	],
-			[		h,		 H	]	};
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	],
-			[		j,		 J	]	};
-    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	],
-			[		k,		 K	]	};
-    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	],
-			[		l,		 L	]	};
-    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	],
-			[	semicolon,	     colon	]	};
-    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	],
-			[      apostrophe,	  quotedbl	]	};
-    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	],
-			[		z,		 Z	]	};
-    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	],
-			[		x,		 X	]	};
-    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	],
-			[		c,		 C	]	};
-    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	],
-			[		v,		 V	]	};
-    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	],
-			[		n,		 N	]	};
-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	],
-			[		b,		 B	]	};
-    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	],
-			[		m,		 M	]	};
-    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	],
-			[	    comma,	      less	]	};
-    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	],
-			[	   period,	   greater	]	};
-
-key.type[group2]="TWO_LEVEL";
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "winkeys" {
-    include "ru(basic)"
-    key <AE03> {        [               3,      numerosign      ],
-                        [               3,      numbersign      ]       };
-    key <AE04> {        [               4,       semicolon      ],
-                        [               4,          dollar      ]       };
-    key <AE05> {        [               5,         percent      ],
-                        [               5,         percent      ]       };
-    key <AE06> {        [               6,           colon      ],
-                        [               6,     asciicircum      ]       };
-    key <AE07> {        [               7,        question      ],
-                        [               7,       ampersand      ]       };
-    key <AE08> {        [               8,        asterisk      ],
-                        [               8,        asterisk      ]       };
-    key <AB10> {        [          period,           comma      ],
-                        [           slash,        question      ]       };
-    key <BKSL> {        [       backslash,           slash      ],
-                        [       backslash,             bar      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "typewriter" {
-    include "ru(basic)"
-    key	<TLDE> {	[      apostrophe,	  quotedbl	],
-			[	    grave,	asciitilde	] 	};
-    key	<AE01> {	[	   exclam,		 1 	],
-			[		1,	    exclam	]	};
-    key	<AE02> {	[      numerosign,		 2	],
-			[		2,		at	]	};
-    key	<AE03> {	[	    slash,		 3	],
-			[		3,	numbersign	]	};
-    key	<AE04> {	[	semicolon,		 4	],
-			[		4,	    dollar	]	};
-    key	<AE05> {	[	    colon,		 5	],
-			[		5,	   percent	]	};
-    key	<AE06> {	[	    comma,		 6	],
-			[		6,     asciicircum	]	};
-    key	<AE07> {	[	   period,		 7	],
-			[		7,	 ampersand	]	};
-    key	<AE08> {	[      underscore,		 8	],
-			[		8,	  asterisk	]	};
-    key	<AE09> {	[	 question,		 9	],
-			[		9,	 parenleft	]	};
-    key	<AE10> {	[	  percent,		 0	],
-			[		0,	parenright	]	};
-    key	<BKSL> {	[	parenleft,	parenright	],
-			[	backslash,	       bar	]	};
-
-key.type[group2]="ALPHABETIC";
-
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	],
-			[    bracketright,	braceright	]	};
-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	],
-			[		b,		 B	]	};
-    key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	],
-			[	    slash,	  question	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "phonetic" {
-    include "ru(basic)"
-
-    key	<AE01> {	[		1,	    exclam	],
-			[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,		at	],
-			[		2,        	at	]	};
-    key	<AE03> {	[		3,     Cyrillic_io 	],
-			[		3,      numbersign	]	};
-    key	<AE04> {	[		4,     Cyrillic_IO	],
-			[		4,	    dollar	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[		5,	   percent	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[		6,     asciicircum	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[		7,	 ampersand	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[		8,        asterisk	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	],
-			[		0,	parenright	]	};
-
-    key	<AB09> {	[	   period,	   greater	],
-			[	   period,	   greater	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	    slash,	  question	]	};
-    key	<AB08> {	[	    comma,	      less	],
-			[	    comma,	      less	]	};
-    key	<AC10> {	[	semicolon,	     colon	],
-			[	semicolon,	     colon	]	};
-    key	<AC11> {	[      apostrophe,	  quotedbl	],
-			[      apostrophe,	  quotedbl	]	};
-    key	<LSGT> {	[	      bar,	 brokenbar	],
-			[	     less,	   greater	]	};
-
-key.type[group2]="ALPHABETIC";
-
-    key	<TLDE> {	[     Cyrillic_yu,     Cyrillic_YU	],
-			[	    grave,	asciitilde	]	};
-    key	<AD01> {	[     Cyrillic_ya,     Cyrillic_YA	],
-			[		q,		 Q	]	};
-    key	<AB01> {	[     Cyrillic_ze,     Cyrillic_ZE	],
-			[		z,		 Z	]	};
-    key	<AC02> {	[     Cyrillic_es,     Cyrillic_ES	],
-			[		s,		 S	]	};
-    key	<AC01> {	[      Cyrillic_a,	Cyrillic_A	],
-			[		a,		 A	]	};
-    key	<AD02> {	[     Cyrillic_ve,     Cyrillic_VE	],
-			[		w,		 W	]	};
-    key	<AB03> {	[    Cyrillic_tse,    Cyrillic_TSE	],
-			[		c,		 C	]	};
-    key	<AB02> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	],
-			[		x,		 X	]	};
-    key	<AC03> {	[     Cyrillic_de,     Cyrillic_DE	],
-			[		d,		 D	]	};
-    key	<AD03> {	[     Cyrillic_ie,     Cyrillic_IE	],
-			[		e,		 E	]	};
-    key	<AB04> {	[    Cyrillic_zhe,    Cyrillic_ZHE	],
-			[		v,		 V	]	};
-    key	<AC04> {	[     Cyrillic_ef,     Cyrillic_EF	],
-			[		f,		 F	]	};
-    key	<AD05> {	[     Cyrillic_te,     Cyrillic_TE	],
-			[		t,		 T	]	};
-    key	<AD04> {	[     Cyrillic_er,     Cyrillic_ER	],
-			[		r,		 R	]	};
-    key	<AB06> {	[     Cyrillic_en,     Cyrillic_EN	],
-			[		n,		 N	]	};
-    key	<AB05> {	[     Cyrillic_be,     Cyrillic_BE	],
-			[		b,		 B	]	};
-    key	<AC06> {	[     Cyrillic_ha,     Cyrillic_HA	],
-			[		h,		 H	]	};
-    key	<AC05> {	[    Cyrillic_ghe,    Cyrillic_GHE	],
-			[		g,		 G	]	};
-    key	<AD06> {	[   Cyrillic_yeru,   Cyrillic_YERU	],
-			[		y,		 Y	]	};
-    key	<AB07> {	[     Cyrillic_em,     Cyrillic_EM	],
-			[		m,		 M	]	};
-    key	<AC07> {	[ Cyrillic_shorti, Cyrillic_SHORTI	],
-			[		j,		 J	]	};
-    key	<AD07> {	[      Cyrillic_u,	Cyrillic_U	],
-			[		u,		 U	]	};
-    key	<AC08> {	[     Cyrillic_ka,     Cyrillic_KA	],
-			[		k,		 K	]	};
-    key	<AD08> {	[      Cyrillic_i,	Cyrillic_I	],
-			[		i,		 I	]	};
-    key	<AD09> {	[      Cyrillic_o,	Cyrillic_O	],
-			[		o,		 O	]	};
-    key	<AC09> {	[     Cyrillic_el,     Cyrillic_EL	],
-			[		l,		 L	]	};
-    key	<AD10> {	[     Cyrillic_pe,     Cyrillic_PE	],
-			[		p,		 P	]	};
-    key	<AE11> {	[	    minus, Cyrillic_hardsign	],
-			[	    minus,	underscore	]	};
-    key	<AD11> {	[    Cyrillic_sha,    Cyrillic_SHA	],
-			[     bracketleft,	 braceleft	]	};
-    key	<AE12> {	[    Cyrillic_che,    Cyrillic_CHE	],
-			[	    equal,	      plus	]	};
-    key	<AD12> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	],
-			[    bracketright,	braceright	]	};
-    key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	],
-			[	backslash,	       bar	]	};
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
--- a/src/xorg/keytables/sun-src/symbols/pc/sk_qwerty	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/sk_qwerty,v 1.1 2001/05/18 23:35:35 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys 
-xkb_symbols "basic" {
- 
-    // This layout should work exactly as a sk with the exception 
-    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
-    // 2001 by Kamil Toman <[email protected]>
-    
-include "sk(Sundeadkeys)" 
-
-    key <AB01> { [    z,              Z,
-    			degree,         NoSymbol ] };
-    key <AD06> { [    y,              Y,
-			NoSymbol,       NoSymbol ] };                           
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "sk_qwerty(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "sk_qwerty(Sundeadkeys)"
-}; 
--- a/src/xorg/keytables/sun-src/symbols/pc/sr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-// Serbian standard keyboard, version 1.1
-
-// Authors of this keyboard map are Milos Rancic <[email protected]>
-//                              and Anton Zinoviev <[email protected]>.
-
-// $XFree86: xc/programs/xkbcomp/symbols/sr,v 1.1 2000/11/14 17:33:03 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-default partial alphanumeric_keys 
-xkb_symbols "basic" {
-  
-  // Describes the differences between a very simple en_US keyboard
-  // and a very simple Serbian keyboard.
-
-  // Note that the letter Serbian_dje is on the key with latin letter
-  // `Z' and in Cyrillic mode on the key with right bracket and brace
-  // you will find left and right bracket.
-
-  name[Group1]= "Serbia";
- 
-  key <TLDE> {  [ backslash,  bar                     ],
-                [  backslash,  bar                    ]       };
-  key <AE01> {  [       1,    exclam                  ],
-                [ asciitilde                          ]       };
-  key <AE02> {  [       2,    quotedbl                ],
-                [       2,    quotedbl                ]       };
-  key <AE03> {  [       3,    numbersign              ],
-                [ asciicircum                         ]       };
-  key <AE04> {  [       4,    dollar                  ],
-                [       4,    dollar                  ]       };
-  key <AE05> {  [       5,    percent                 ],
-                [       5,    percent                 ]       };
-  key <AE06> {  [       6,    ampersand               ],
-                [       6,    ampersand               ]       };
-  key <AE07> {  [       7,    slash                   ],
-                [ quoteleft                           ]       };
-  key <AE08> {  [       8,    parenleft               ],
-                [       8,    parenleft               ]       };
-  key <AE09> {  [       9,    parenright              ],
-                [       9,    parenright              ]       };
-  key <AE10> {  [       0,    equal                   ],
-                [       0,    equal                   ]       };
-  key <AE11> {  [ apostrophe, question                ],
-                [ apostrophe, question                ]       };
-  key <AE12> {  [ plus,       asterisk                ],
-                [ plus,       asterisk                ]       };
- 
-  key <AD01> {   [ q,                 Q                   ],
-                 [ Cyrillic_lje,      Cyrillic_LJE        ]    };
-  key <AD02> {   [ w,                 W                   ],
-                 [ Cyrillic_nje,      Cyrillic_NJE        ]    };
-  key <AD03> {   [ e,                 E                   ],
-                 [ Cyrillic_ie,       Cyrillic_IE         ]    };
-  key <AD04> {   [ r,                 R                   ],
-                 [ Cyrillic_er,       Cyrillic_ER         ]    };
-  key <AD05> {   [ t,                 T                   ],
-                 [ Cyrillic_te,       Cyrillic_TE         ]    };
-  key <AB01> {   [ y,                 Y                   ],
-                 [ Macedonia_dse,     Macedonia_DSE       ]    };
-  key <AD07> {   [ u,                 U                   ],
-                 [ Cyrillic_u,        Cyrillic_U          ]    };
-  key <AD08> {   [ i,                 I                   ],
-                 [ Cyrillic_i,        Cyrillic_I          ]    };
-  key <AD09> {   [ o,                 O                   ],
-                 [ Cyrillic_o,        Cyrillic_O          ]    };
-  key <AD10> {   [ p,                 P                   ],
-                 [ Cyrillic_pe,       Cyrillic_PE         ]    };
-  key <AD11> {   [ bracketleft,       braceleft           ],
-                 [ Cyrillic_sha,      Cyrillic_SHA        ]    };
-  key <AD12> {   [ bracketright,      braceright          ],
-                 [ Serbian_dje,       Serbian_DJE        ]    };
-
-  key <AC01> {   [ a,                 A                   ],
-                 [ Cyrillic_a,        Cyrillic_A          ]    };
-  key <AC02> {   [ s,                 S                   ],
-                 [ Cyrillic_es,       Cyrillic_ES         ]    };
-  key <AC03> {   [ d,                 D                   ],
-                 [ Cyrillic_de,       Cyrillic_DE         ]    };
-  key <AC04> {   [ f,                 F                   ],
-                 [ Cyrillic_ef,       Cyrillic_EF         ]    };
-  key <AC05> {   [ g,                 G                   ],
-                 [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
-  key <AC06> {   [ h,                 H                   ],
-                 [ Cyrillic_ha,       Cyrillic_HA         ]    };
-  key <AC07> {   [ j,                 J                   ],
-                 [ Cyrillic_je,       Cyrillic_JE         ]    };
-  key <AC08> {   [ k,                 K                   ],
-                 [ Cyrillic_ka,       Cyrillic_KA         ]    };
-  key <AC09> {   [ l,                 L                   ],
-                 [ Cyrillic_el,       Cyrillic_EL         ]    };
-  key <AC10> {   [ asciicircum,       asciicircum         ],
-                 [ Cyrillic_che,      Cyrillic_CHE        ]    };
-  key <AC11> {   [ section,           section             ],
-                 [ Serbian_tshe,      Serbian_TSHE        ]    };
-  key <BKSL> {   [ at,		at 			  ], 
-                 [    Cyrillic_zhe,    Cyrillic_ZHE	  ]	};
-  key <LSGT> {   [ less,              greater             ]    };
-  key <AD06> {   [ z,                 Z                   ],
-                 [ Cyrillic_ze,       Cyrillic_ZE         ]    };
-  key <AB02> {   [ x,                 X                   ],
-                 [ Cyrillic_dzhe,     Cyrillic_DZHE       ]    };
-  key <AB03> {   [ c,                 C                   ],
-                 [ Cyrillic_tse,      Cyrillic_TSE        ]    };
-  key <AB04> {   [ v,                 V                   ],
-                 [ Cyrillic_ve,       Cyrillic_VE         ]    };
-  key <AB05> {   [ b,                 B                   ],
-                 [ Cyrillic_be,         Cyrillic_BE         ]    };
-  key <AB06> {   [ n,                 N                   ],
-                 [ Cyrillic_en,        Cyrillic_EN         ]    };
-  key <AB07> {   [ m,                 M                   ],
-                 [ Cyrillic_em,       Cyrillic_EM         ]    };
-    key <AB08> {  [ comma,       semicolon ]	};
-    key <AB09> {  [ period,          colon ]	};
-    key <AB10> {  [ minus,      underscore ]	};
-
-  // End alphanumeric section
-
-  // Begin modifier mappings 
-  
-  modifier_map Shift  { Shift_L };
-  modifier_map Lock   { Caps_Lock };
-  modifier_map Control{ Control_L };
-  modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "sr(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "sr(Sundeadkeys)" // for naming consistency
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/tr_f	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-// Converted keytable file to xkb/symbols/ file
-// with mk_xkb by [email protected] Tue Sep 30 01:29:39 MET DST 1997
-//
-
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-//  turkish "F" keyboard, copyed from LyX turkish keyboard description
-//  right Ctrl key switches to an almost US keyboard (number row is mangled
-//  us keyboard mode, this to allow simple access by AltGr while in turkish
-//  mode to all needed symbols)
-//  as the names of some chars in iso-8859-9 are not consistent whith
-//  the rest of latin iso-8859-* I declare them in hexa (ugly, but what else?)
-//
-//  Pablo Saratxaga <[email protected]>
-//  FIXME: I'm not sure about the ISO_* stuff, the original *.map uses
-//         AltGr_Lock as modifier.
-
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Turkish "F" (traditional) keyboard
-
-    // Alphanumeric section
-    name[Group1]= "Turkish \"F\" (traditional)";
-    #name[Group2]= "US/ASCII";
-
-    key <AE01> {	[	  1,	exclam 		],
-			[ onesuperior			]	};	
-    key <AE02> {	[         2,	quotedbl	],
-			[ twosuperior			]	};
-    key <AE03> {	[         3,	asciicircum	],
-			[ numbersign			]	};
-    key <AE04> {	[         4,	dollar     	],
-			[ onequarter			]	};
-    key <AE05> {	[         5,	percent  	],
-			[ onehalf			]	};
-    key <AE06> {	[         6,	ampersand	],
-			[ threequarters			]	};
-    key <AE07> {	[         7,	quoteright    	],
-			[ braceleft			]	};
-    key <AE08> {	[         8,	parenleft	],
-			[ bracketleft			]	};
-    key <AE09> {	[         9,	parenright	],
-			[ bracketright			]	};
-    key <AE10> {	[         0,	equal    	],
-			[ braceright			]	};
-    key <AE11> {	[  slash,	question 	],
-			[ backslash 		   	]	};
-    key <AE12> {	[     minus,	underscore	],
-			[     bar,    brokenbar		]	};
-    key <AD01> {	[         f,	F        	],
-			[         at,	at        	]	};
-    key <AD02> {	[         g,    G		],
-			[         w,	W        	]	};
-    key <AD03> {	[    gbreve,	Gbreve		],
-			[         e,	E        	]	};
-    key <AD04> {	[  idotless,	I		],      
-			[ paragraph		      	]	};
-    key <AD05> {	[         o,	O        	],
-			[         t,	T        	]	};
-    key <AD06> {	[         d,	D        	],
-			[         yen	        	]	};
-    key <AD07> {	[         r,	R        	],
-			[         u,	U        	]	};
-    key <AD08> {	[         n,	N        	],
-			[         i,	I        	]	};
-    key <AD09> {	[         h,	H        	],
-			[    degree 		       	]	};
-    key <AD10> {	[         p,    P	 	],
-			[  sterling			]	};
-    key <AD11> {	[         q,	Q        	],
-			[ diaeresis, dead_diaeresis	]	};
-    key <AD12> {	[         w,	W        	],
-			[ asciitilde, dead_tilde	]	};
-    key <AC01> {	[         u,	U        	],
-			[         ae,	AE        	]	};
-    key <AC02> {	[         i,	Iabovedot	],
-			[  ssharp 		       	]	};
-    key <AC03> {	[         e,	E        	],
-			[         d,	D        	]	};
-    key <AC04> {	[         a,	A        	],
-			[         f,	F        	]	};
-    key <AC05> {	[  udiaeresis,	Udiaeresis	],
-			[	  g,	G		]	};	
-    key <AC06> {	[         t,	T        	],
-			[         h,	H        	]	};
-    key <AC07> {	[         k,	K        	],
-			[         j,	J        	]	};
-    key <AC08> {	[         m,	M        	],
-			[         k,	K        	]	};
-    key <AC09> {	[         l,    L		]	};
-    key <AC10> {	[         y,	Y        	],
-			[ quoteright, dead_acute    	]	};
-    key <AC11> {	[  scedilla,	Scedilla	],
-			[ numbersign		 	]	};
-    key <TLDE> {	[ plus,		plusminus	],
-			[     notsign			]	};
-    key <BKSL> {	[         x,	X        	],
-			[ quoteleft,   dead_grave      	]	};
-    key <AB01> {	[         j,	J        	],
-			[ guillemotleft	        	]	};
-    key <AB02> {	[ odiaeresis,	Odiaeresis	],
-			[ guillemotright               	]	};
-    key <AB03> {	[         v,	V        	],
-			[         cent 		       	]	};
-    key <AB04> {	[         c,	C        	],
-			[         v,	V        	]	};
-    key <AB05> {	[  ccedilla,	Ccedilla 	],
-			[         b,	B        	]	};
-    key <AB06> {	[         z,	Z        	],
-			[         n,	N        	]	};
-    key <AB07> {	[         s,	S        	],
-			[         mu 		       	]	};
-    key <AB08> {	[         b,	B        	],
-			[     multiply		     	]	};
-    key <AB09> {	[    period,	colon    	],
-			[    division 		 	]	};
-    key <AB10> {	[     comma,	semicolon	]	};
-    key <LSGT> {	[      less,	greater  	],
-			[      bar, 	brokenbar	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "tr_f(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "tr_f(Sundeadkeys)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pc/us	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,298 +0,0 @@
-//
-// $XdotOrg: xc/programs/xkbcomp/symbols/us,v 1.1.4.3 2004/03/05 13:41:33 eich Exp $
-// $XFree86: xc/programs/xkbcomp/symbols/us,v 1.6 2003/10/31 14:32:05 pascal Exp $
-
-default
-partial alphanumeric_keys modifier_keys 
-xkb_symbols "basic" {
-
-    name[Group1]= "U.S. English";
-
-    include "pc/pc(common)"
-
-    // Alphanumeric section
-    key <TLDE> {        [     grave,    asciitilde      ]       };
-    key <AE01> {        [         1,    exclam          ]       };
-    key <AE02> {        [         2,    at              ]       };
-    key <AE03> {        [         3,    numbersign      ]       };
-    key <AE04> {        [         4,    dollar          ]       };
-    key <AE05> {        [         5,    percent         ]       };
-    key <AE06> {        [         6,    asciicircum     ]       };
-    key <AE07> {        [         7,    ampersand       ]       };
-    key <AE08> {        [         8,    asterisk        ]       };
-    key <AE09> {        [         9,    parenleft       ]       };
-    key <AE10> {        [         0,    parenright      ]       };
-    key <AE11> {        [     minus,    underscore      ]       };
-    key <AE12> {        [     equal,    plus            ]       };
-
-    key <AD01> {        [         q,    Q               ]       };
-    key <AD02> {        [         w,    W               ]       };
-    key <AD03> {        [         e,    E               ]       };
-    key <AD04> {        [         r,    R               ]       };
-    key <AD05> {        [         t,    T               ]       };
-    key <AD06> {        [         y,    Y               ]       };
-    key <AD07> {        [         u,    U               ]       };
-    key <AD08> {        [         i,    I               ]       };
-    key <AD09> {        [         o,    O               ]       };
-    key <AD10> {        [         p,    P               ]       };
-    key <AD11> {        [ bracketleft,  braceleft       ]       };
-    key <AD12> {        [ bracketright, braceright      ]       };
-
-    key <AC01> {        [         a,    A               ]       };
-    key <AC02> {        [         s,    S               ]       };
-    key <AC03> {        [         d,    D               ]       };
-    key <AC04> {        [         f,    F               ]       };
-    key <AC05> {        [         g,    G               ]       };
-    key <AC06> {        [         h,    H               ]       };
-    key <AC07> {        [         j,    J               ]       };
-    key <AC08> {        [         k,    K               ]       };
-    key <AC09> {        [         l,    L               ]       };
-    key <AC10> {        [ semicolon,    colon           ]       };
-    key <AC11> {        [ apostrophe,   quotedbl        ]       };
-
-    key <AB01> {        [         z,    Z               ]       };
-    key <AB02> {        [         x,    X               ]       };
-    key <AB03> {        [         c,    C               ]       };
-    key <AB04> {        [         v,    V               ]       };
-    key <AB05> {        [         b,    B               ]       };
-    key <AB06> {        [         n,    N               ]       };
-    key <AB07> {        [         m,    M               ]       };
-    key <AB08> {        [     comma,    less            ]       };
-    key <AB09> {        [    period,    greater         ]       };
-    key <AB10> {        [     slash,    question        ]       };
-
-    key <BKSL> {        [ backslash,         bar        ]       };
-    // End alphanumeric section
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "intl" {
-
-    name[Group1]= "U.S. English - International (with dead keys)";
-
-    include "pc/us(basic)"
-
-    // Alphanumeric section
-    key <TLDE> { [dead_grave, dead_tilde,         grave,       asciitilde ] };
-    key <AE01> { [         1,     exclam,    exclamdown,      onesuperior ] };
-    key <AE02> { [         2,         at,   twosuperior, dead_doubleacute ] };
-    key <AE03> { [         3, numbersign, threesuperior,      dead_macron ] };
-    key <AE04> { [         4,     dollar,      currency,         sterling ] };
-    key <AE05> { [         5,    percent,      EuroSign                   ] };
-    key <AE06> { [    6, dead_circumflex,    onequarter,      asciicircum ] };
-    key <AE07> { [         7,  ampersand,       onehalf,        dead_horn ] };
-    key <AE08> { [         8,   asterisk, threequarters,      dead_ogonek ] };
-    key <AE09> { [         9,  parenleft, leftsinglequotemark, dead_breve ] };
-    key <AE10> { [         0, parenright, rightsinglequotemark, dead_abovering ] };
-    key <AE11> { [     minus, underscore,           yen,    dead_belowdot ] };
-    key <AE12> { [     equal,       plus,      multiply,         division ] };
-
-    key <AD01> { [         q,          Q,    adiaeresis,       Adiaeresis ] };
-    key <AD02> { [         w,          W,         aring,            Aring ] };
-    key <AD03> { [         e,          E,        eacute,           Eacute ] };
-    key <AD04> { [         r,          R,    registered,       registered ] };
-    key <AD05> { [         t,          T,         thorn,            THORN ] };
-    key <AD06> { [         y,          Y,    udiaeresis,       Udiaeresis ] };
-    key <AD07> { [         u,          U,        uacute,           Uacute ] };
-    key <AD08> { [         i,          I,        iacute,           Iacute ] };
-    key <AD09> { [         o,          O,        oacute,           Oacute ] };
-    key <AD10> { [         p,          P,    odiaeresis,       Odiaeresis ] };
-    key <AD11> { [ bracketleft,  braceleft,  guillemotleft, guillemotleft ] };
-    key <AD12> { [bracketright, braceright, guillemotright,guillemotright ] };
-
-    key <AC01> { [         a,          A,        aacute,           Aacute ] };
-    key <AC02> { [         s,          S,        ssharp,          section ] };
-    key <AC03> { [         d,          D,           eth,              ETH ] };
-
-    key <AC09> { [         l,          L,        oslash,         Ooblique ] };
-    key <AC10> { [ semicolon,      colon,     paragraph,           degree ] };
-    key <AC11> { [dead_acute, dead_diaeresis, apostrophe,        quotedbl ] };
-
-    key <AB01> { [         z,          Z,            ae,               AE ] };
-    key <AB03> { [         c,          C,     copyright,             cent ] };
-    key <AB06> { [         n,          N,        ntilde,           Ntilde ] };
-    key <AB07> { [         m,          M,            mu,               mu ] };
-    key <AB08> { [     comma,       less,      ccedilla,         Ccedilla ] };
-    key <AB09> { [    period,    greater, dead_abovedot,       dead_caron ] };
-    key <AB10> { [     slash,   question,  questiondown,        dead_hook ] };
-    key <BKSL> { [ backslash,        bar,       notsign,        brokenbar ] };
-
-    include "level3(ralt_switch)"
-};
-
-// Based on symbols/us_intl keyboard map:
-// Dead-keys definition for a very simple US/ASCII layout.
-// by Conectiva (http://www.conectiva.com.br)
-// modified by Ricardo Y. Igarashi ([email protected])
-
-// Added the following deadkeys, to make it truly international:
-//
-// dead_macron: on AltGr-minus
-// dead_breve: on AltGr-parenleft
-// dead_abovedot: on AltGr-period
-// dead_abovering: on AltGr-0
-// dead_doubleacute: on AltGr-equal (as quotedbl is already used)
-// dead_caron: on AltGr-less (AltGr-shift-comma)
-// dead_cedilla: on AltGr-comma
-// dead_ogonek: on AltGr-semicolon
-// dead_belowdot: on AltGr-underscore (AltGr-shift-minus)
-// dead_hook: on AltGr-question
-// dead_horn: on AltGr-plus (AltGr-shift-equal)
-// dead_diaeresis: on AltGr-colon (Alt-shift-semicolon)
-//
-// those were already there:
-// dead_grave
-// dead_acute
-// dead_circumflex
-// dead_tilde
-// dead_diaeresis
-
-partial alphanumeric_keys
-xkb_symbols "alt-intl" {
-
-  name[Group1]= "U.S. English - Alternative international (former us_intl)";
-
-  include "pc/us"
-
-  key <TLDE> { [ dead_grave, dead_tilde,    grave,            asciitilde    ] };
-  key <AE05> { [          5, percent,       EuroSign                        ] };
-  key <AE06> { [          6, dead_circumflex, asciicircum,    asciicircum   ] };
-  key <AE09> { [          9, parenleft,     dead_breve,       dead_breve    ] };
-  key <AE10> { [          0, parenright,    dead_abovering,   dead_abovering] };
-  key <AE11> { [      minus, underscore,    dead_macron,      dead_belowdot ] };
-  key <AE12> { [      equal, plus,          dead_doubleacute, dead_horn     ] };
-
-  key <AD03> { [          e, E,              EuroSign,         cent         ] };
-
-  key <AC10> { [  semicolon, colon,          dead_ogonek,   dead_diaeresis  ] };
-  key <AC11> { [ dead_acute, dead_diaeresis, apostrophe,    quotedbl        ] };
-
-  key <AB08> { [      comma, less,           dead_cedilla,  dead_caron      ] };
-  key <AB09> { [     period, greater,        dead_abovedot, dead_circumflex ] };
-  key <AB10> { [      slash, question,       dead_hook,     dead_hook       ] };
-
-  include "level3(ralt_switch)"
-};
-
-// based on a keyboard map from an 'xkb/symbols/dk' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/dvorak,v 1.5 2004/01/03 16:35:07 herrb Exp $
-
-partial alphanumeric_keys
-xkb_symbols "dvorak" {
-
-    name[Group1]= "U.S. English - Dvorak";
-
-    // Alphanumeric section
-
-    key <TLDE> { [       grave, asciitilde, dead_grave, dead_tilde      ] };
-
-    key <AE01> { [          1,  exclam          ]       };
-    key <AE02> { [          2,  at              ]       };
-    key <AE03> { [          3,  numbersign      ]       };
-    key <AE04> { [          4,  dollar          ]       };
-    key <AE05> { [          5,  percent         ]       };
-    key <AE06> { [          6,  asciicircum, dead_circumflex, dead_circumflex ] };
-    key <AE07> { [          7,  ampersand       ]       };
-    key <AE08> { [          8,  asterisk        ]       };
-    key <AE09> { [          9,  parenleft,  dead_grave] };
-    key <AE10> { [          0,  parenright      ]       };
-    key <AE11> { [ bracketleft, braceleft       ]       };
-    key <AE12> { [ bracketright, braceright,  dead_tilde] };
-
-    key <AD01> { [  apostrophe, quotedbl, dead_acute, dead_diaeresis    ] };
-    key <AD02> { [      comma,  less,   dead_cedilla, dead_caron        ] };
-    key <AD03> { [      period, greater, dead_abovedot, periodcentered  ] };
-    key <AD04> { [          p,  P               ]       };
-    key <AD05> { [          y,  Y               ]       };
-    key <AD06> { [          f,  F               ]       };
-    key <AD07> { [          g,  G               ]       };
-    key <AD08> { [          c,  C               ]       };
-    key <AD09> { [          r,  R               ]       };
-    key <AD10> { [          l,  L               ]       };
-    key <AD11> { [      slash,  question        ]       };
-    key <AD12> { [      equal,  plus            ]       };
-
-    key <AC01> { [          a,  A               ]       };
-    key <AC02> { [          o,  O               ]       };
-    key <AC03> { [          e,  E               ]       };
-    key <AC04> { [          u,  U               ]       };
-    key <AC05> { [          i,  I               ]       };
-    key <AC06> { [          d,  D               ]       };
-    key <AC07> { [          h,  H               ]       };
-    key <AC08> { [          t,  T               ]       };
-    key <AC09> { [          n,  N               ]       };
-    key <AC10> { [          s,  S               ]       };
-    key <AC11> { [      minus,  underscore      ]       };
-
-    key <AB01> { [   semicolon, colon, dead_ogonek, dead_doubleacute ] };
-    key <AB02> { [          q,  Q               ]       };
-    key <AB03> { [          j,  J               ]       };
-    key <AB04> { [          k,  K               ]       };
-    key <AB05> { [          x,  X               ]       };
-    key <AB06> { [          b,  B               ]       };
-    key <AB07> { [          m,  M               ]       };
-    key <AB08> { [          w,  W               ]       };
-    key <AB09> { [          v,  V               ]       };
-    key <AB10> { [          z,  Z               ]       };
-    key <BKSL> { [  backslash,  bar             ]       };
-};
-
-// phonetic layout for Russian letters on an US keyboard
-// by Ivan Popov <[email protected]> 2005-07-17
-
-// level3 modifier is a shortcut to the "us" meaning of the keys where
-// we place cyrillic letters, handy for accessing the corresponding
-// punctuation marks.
-// It is important to have access to punctuation marks, and the rest of
-// alphabetical keys are added for being consequent so that the users
-// can expect the level3 modifier to give what the key label shows.
-
-partial alphanumeric_keys
-xkb_symbols "rus" {
-
-    name[Group1]= "U.S. English - Russian phonetic";
-
-    include "pc/us(basic)"
-
-key.type[group1]="FOUR_LEVEL_ALPHABETIC";
-
-    key <LatA> {        [ Cyrillic_a, Cyrillic_A ]      };
-    key <LatB> {        [ Cyrillic_be, Cyrillic_BE ]    };
-    key <LatW> {        [ Cyrillic_ve, Cyrillic_VE ]    };
-    key <LatG> {        [ Cyrillic_ghe, Cyrillic_GHE ]  };
-    key <LatD> {        [ Cyrillic_de, Cyrillic_DE ]    };
-    key <LatE> {        [ Cyrillic_ie, Cyrillic_IE ]    };
-    key <TLDE> {        [ Cyrillic_io, Cyrillic_IO, grave, asciitilde ] };
-    key <LatV> {        [ Cyrillic_zhe, Cyrillic_ZHE ]  };
-    key <LatZ> {        [ Cyrillic_ze, Cyrillic_ZE ]    };
-    key <LatI> {        [ Cyrillic_i, Cyrillic_I ]      };
-    key <LatJ> {        [ Cyrillic_shorti, Cyrillic_SHORTI ]    };
-    key <LatK> {        [ Cyrillic_ka, Cyrillic_KA ]    };
-    key <LatL> {        [ Cyrillic_el, Cyrillic_EL ]    };
-    key <LatM> {        [ Cyrillic_em, Cyrillic_EM ]    };
-    key <LatN> {        [ Cyrillic_en, Cyrillic_EN ]    };
-    key <LatO> {        [ Cyrillic_o, Cyrillic_O ]      };
-    key <LatP> {        [ Cyrillic_pe, Cyrillic_PE ]    };
-    key <LatR> {        [ Cyrillic_er, Cyrillic_ER ]    };
-    key <LatS> {        [ Cyrillic_es, Cyrillic_ES ]    };
-    key <LatT> {        [ Cyrillic_te, Cyrillic_TE ]    };
-    key <LatU> {        [ Cyrillic_u, Cyrillic_U ]      };
-    key <LatF> {        [ Cyrillic_ef, Cyrillic_EF ]    };
-    key <LatH> {        [ Cyrillic_ha, Cyrillic_HA ]    };
-    key <LatC> {        [ Cyrillic_tse, Cyrillic_TSE ]  };
-    key <AC10> {        [ Cyrillic_che, Cyrillic_CHE, semicolon, colon ] };
-    key <AD11> {        [ Cyrillic_sha, Cyrillic_SHA, bracketleft, braceleft] };
-    key <AD12> {        [ Cyrillic_shcha, Cyrillic_SHCHA, bracketright, braceright ]    };
-    key <AE12> {        [ Cyrillic_hardsign, Cyrillic_HARDSIGN, equal, plus ] };
-    key <LatY> {        [ Cyrillic_yeru, Cyrillic_YERU ]        };
-    key <LatX> {        [ Cyrillic_softsign, Cyrillic_SOFTSIGN ]        };
-    key <BKSL> {        [ Cyrillic_e, Cyrillic_E, backslash, bar ]      };
-    key <AC11> {        [ Cyrillic_yu, Cyrillic_YU, apostrophe, quotedbl ] };
-    key <LatQ> {        [ Cyrillic_ya, Cyrillic_YA ]    };
-
-    include "level3(ralt_switch)"
-};
-
-
--- a/src/xorg/keytables/sun-src/symbols/pl	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-// $Xorg: pl,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/pl,v 3.5 2001/01/17 23:45:59 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple QWERTZ Polish keybaord
-
-    name[Group1]= "Polish";
-
-    key <TLDE> { [ 	dead_ogonek, 	dead_abovedot 	]	};
-
-    key <AE01> { [ 1,			exclam		],
-		 [ asciitilde  	                	]	};
-    key <AE02> { [ 2,			quotedbl	],
-		 [ dead_caron 				]	};
-    key <AE03> { [ 3,			numbersign 	],
-		 [ dead_circumflex 			]	};
-    key <AE04> { [ 4,			currency 	],
-		 [ dead_breve				]	};
-    key <AE05> { [ 5,			percent 	],
-		 [ dead_abovering			]	};
-    key <AE06> { [ 6,			ampersand	],
-		 [ dead_ogonek	 			]	};
-    key <AE07> { [ 7,			slash		],
-		 [ grave				]	};
-    key <AE08> { [ 8,			parenleft	],
-		 [ dead_abovedot			]	};
-    key <AE09> { [ 9,			parenright	],
-		 [ dead_acute			 	]	};
-    key <AE10> { [ 0,			equal	 	],
-		 [ dead_doubleacute			]	};
-    key <AE11> { [ plus,		question 	],
-		 [ dead_diaeresis			]	};
-    key <AE12> { [ apostrophe,		asterisk 	],
-		 [ dead_cedilla				]	};
-
-    key <AD01> { [ q,			Q	 	],
-		 [ backslash				]	};
-    key <AD02> { [ w,			W	 	],
-		 [ bar					]	};
-    key <AD03> { [ e,			E		] 	};       
-    key <AD04> { [ r,			R		]	};
-    key <AD05> { [ t,			T		]	};
-    key <AD06> { [ z,			Z		]	};
-    key <AD07> { [ u,			U		],
-                 [ EuroSign,		cent		]	};
-    key <AD08> { [ i,			I		]	};
-    key <AD09> { [ o,			O		]	};
-    key <AD10> { [ p,			P		]	};
-    key <AD11> { [ zabovedot,		nacute		],
-		 [ division				]	};
-    key <AD12> { [ sacute,		cacute		],
-		 [ multiply				]	};
-
-    key <AC01> { [ a,			A		]	};
-    key <AC02> { [ s,			S		],
-		 [ dstroke				]	};
-    key <AC03> { [ d,			D		],
-		 [ Dstroke				]	};
-    key <AC04> { [ f,			F		],
-		 [ bracketleft				]	};
-    key <AC05> { [ g,			G		],
-		 [ bracketright				]	};
-    key <AC06> { [ h,			H		]	};
-    key <AC07> { [ j,			J		]	};
-    key <AC08> { [ k,			K		]	};
-    key <AC09> { [ l,			L		]	};
-    key <AC10> { [ lstroke,		Lstroke		],
-		 [ dollar				]	};
-    key <AC11> { [ aogonek,		eogonek 	],
-		 [ ssharp				]	};
-
-    key <BKSL> { [ oacute,		zacute		]	};
-
-    key <AB01> { [ y,			Y	 	]	};
-    key <AB02> { [ x,			X	 	]	};
-    key <AB03> { [ c,			C	 	]	};
-    key <AB04> { [ v,			V	 	],
-		 [ at					]	};
-    key <AB05> { [ b,			B	 	],
-		 [ braceleft				]	};
-    key <AB06> { [ n,			N	 	],
-		 [ braceright				]	};
-    key <AB07> { [ m,			M	 	],
-		 [ section				]	};
-    key <AB08> { [ comma,		semicolon 	]	};
-    key <AB09> { [ period,		colon	 	]	};
-    key <AB10> { [ minus,		underscore	]	};
-
-    key <LSGT> { [ less,		greater		],
-		 [ bar,			brokenbar	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "pl(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "pl(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "pl(basic)" // for consistent naming
-};
-// end of file /usr/X11R6/bin/X11/xkb/symbols/pl
--- a/src/xorg/keytables/sun-src/symbols/pl2	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-// $XConsortium: pl2 /main/3 1996/08/31 12:20:05 kaleb $
-// $XFree86: xc/programs/xkbcomp/symbols/pl2,v 3.4 1999/08/30 02:34:28 dawes Exp$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple QWERTZ Polish keybaord
-
-    name[Group1]= "Polish";
-	include "us(basic)"
-
-    key <TLDE> { [ abovedot,		dead_ogonek 	]	};
-
-    key <AE01> { [ 1,			exclam		],
-		 [ asciitilde  	                	]	};
-    key <AE02> { [ 2,			quotedbl	],
-		 [ dead_caron 				]	};
-    key <AE03> { [ 3,			numbersign 	],
-		 [ dead_circumflex 			]	};
-    key <AE04> { [ 4,			dollar	 	],
-		 [ dead_breve				]	};
-    key <AE05> { [ 5,			percent 	],
-		 [ degree				]	};
-    key <AE06> { [ 6,			ampersand	],
-		 [ dead_ogonek	 			]	};
-    key <AE07> { [ 7,			slash		],
-		 [ dead_grave				]	};
-    key <AE08> { [ 8,			parenleft	],
-		 [ dead_abovedot			]	};
-    key <AE09> { [ 9,			parenright	],
-		 [ dead_acute			 	]	};
-    key <AE10> { [ 0,			equal	 	],
-		 [ dead_doubleacute			]	};
-    key <AE11> { [ plus,		question 	],
-		 [ dead_diaeresis			]	};
-    key <AE12> { [ apostrophe,		asterisk 	],
-		 [ dead_cedilla				]	};
-
-    key <AD01> { [ q,			Q	 	],
-		 [ backslash				]	};
-    key <AD02> { [ w,			W	 	],
-		 [ bar					]	};
-    key <AD03> { [ e,			E		],
-                 [ EuroSign,		cent		]	};
-    key <AD04> { [ r,			R		]	};
-    key <AD05> { [ t,			T		]	};
-    key <AD06> { [ z,			Z		]	};
-    key <AD07> { [ u,			U		]	};
-    key <AD08> { [ i,			I		]	};
-    key <AD09> { [ o,			O		]	};
-    key <AD10> { [ p,			P		]	};
-    key <AD11> { [ zabovedot,		nacute		],
-		 [ division				]	};
-    key <AD12> { [ sacute,		cacute		],
-		 [ multiply				]	};
-
-    key <AC01> { [ a,			A		]	};
-    key <AC02> { [ s,			S		],
-		 [ dstroke				]	};
-    key <AC03> { [ d,			D		],
-		 [ Dstroke				]	};
-    key <AC04> { [ f,			F		],
-		 [ bracketleft				]	};
-    key <AC05> { [ g,			G		],
-		 [ bracketright				]	};
-    key <AC06> { [ h,			H		]	};
-    key <AC07> { [ j,			J		]	};
-    key <AC08> { [ k,			K		]	};
-    key <AC09> { [ l,			L		]	};
-    key <AC10> { [ lstroke,		Lstroke		],
-		 [ dollar				]	};
-    key <AC11> { [ aogonek,		eogonek 	],
-		 [ ssharp				]	};
-
-    key <BKSL> { [ oacute,		zacute		]	};
-
-    key <AB01> { [ y,			Y	 	]	};
-    key <AB02> { [ x,			X	 	]	};
-    key <AB03> { [ c,			C	 	]	};
-    key <AB04> { [ v,			V	 	],
-		 [ at					]	};
-    key <AB05> { [ b,			B	 	],
-		 [ braceleft				]	};
-    key <AB06> { [ n,			N	 	],
-		 [ braceright				]	};
-    key <AB07> { [ m,			M	 	],
-		 [ section				]	};
-    key <AB08> { [ comma,		semicolon 	]	};
-    key <AB09> { [ period,		colon	 	]	};
-    key <AB10> { [ minus,		underscore	]	};
-
-    key <LSGT> { [ less,		greater		],
-		 [ bar					]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "pl2(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "pl2(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "pl2(basic)" // for consistent naming
-};
-// end of file /usr/X11R6/bin/X11/xkb/symbols/pl2
-
--- a/src/xorg/keytables/sun-src/symbols/pl_dev	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-// $Xorg: pl,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/pl,v 3.5 2001/01/17 23:45:59 dawes Exp $
-
-//  Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple QWERTY Polish keybaord
-    // Polish Developer version
-
-    name[Group1]= "Polish";
-
-    key <TLDE> { [ grave, 		asciitilde	]	};
-    key <AE01> { [ 1,			exclam		]	};
-    key <AE02> { [ 2,			at		]	};
-    key <AE03> { [ 3,			numbersign 	]	};
-    key <AE04> { [ 4,			dollar	 	]	};
-    key <AE05> { [ 5,			percent 	]	};
-    key <AE06> { [ 6,			asciicirum	]	};
-    key <AE07> { [ 7,			ampersand	]	};
-    key <AE08> { [ 8,			asterisk	]	};
-    key <AE09> { [ 9,			parenleft	]	};
-    key <AE10> { [ 0,			parenright	]	};
-    key <AE11> { [ minus,		underscore 	]	};
-    key <AE12> { [ equal,		plus	 	]	};
-
-    key <AD01> { [ q,			Q	 	]	};
-    key <AD02> { [ w,			W	 	]	};
-    key <AD03> { [ e,			E		], 	
-		 [ eogonek,		Eogonek		]	};       
-    key <AD04> { [ r,			R		]	};
-    key <AD05> { [ t,			T		]	};
-    key <AD06> { [ y,			Y		]	};
-    key <AD07> { [ u,			U		],
-                 [ EuroSign,		EuroSign	]	};
-    key <AD08> { [ i,			I		]	};
-    key <AD09> { [ o,			O		],	
-		 [ oacute,		Oacute		]	};
-    key <AD10> { [ p,			P		]	};
-    key <AD11> { [ bracketleft, 	braceleft	]	};
-    key <AD12> { [ bracketright,	braceright	]	};
-
-    key <RTRN> { [ Return				]	};
-
-    key <AC01> { [ a,			A		],
-		 [ aogonek,		Aogonek		]	};
-    key <AC02> { [ s,			S		],
-		 [ sacute,		Sacute		]	};
-    key <AC03> { [ d,			D		]	};
-    key <AC04> { [ f,			F		]	};
-    key <AC05> { [ g,			G		]	};
-    key <AC06> { [ h,			H		]	};
-    key <AC07> { [ j,			J		]	};
-    key <AC08> { [ k,			K		]	};
-    key <AC09> { [ l,			L		],
-		 [ lstroke,             Lstroke		]	};
-    key <AC10> { [ semicolon,		colon		]	};
-    key <AC11> { [ apostrophe,		quotedbl 	]	};
-
-    key <BKSL> { [ backslash,		bar		]	};
-
-    key <AB01> { [ z, 			Z	 	],
-		 [ zabovedot,		Zabovedot	]	};
-    key <AB02> { [ x,			X	 	],
-		 [ zacute,		Zacute		]	};
-    key <AB03> { [ c,			C	 	],
-		 [ cacute,		Cacute		]	};
-    key <AB04> { [ v,			V	 	]	};
-    key <AB05> { [ b,			B	 	]	};
-    key <AB06> { [ n,			N	 	],
-		 [ nacute,		Nacute		]	};
-    key <AB07> { [ m,			M	 	]	};
-    key <AB08> { [ comma,		less 		]	};
-    key <AB09> { [ period,		greater	 	]	};
-    key <AB10> { [ slash,		question	]	};
-
-    key <LSGT> { [ less,		greater		],
-		 [ bar,			brokenbar	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "pl_dev(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "pl_dev(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "pl_dev(basic)" // for consistent naming
-};
-// end of file /usr/X11R6/bin/X11/xkb/symbols/pl_dev
--- a/src/xorg/keytables/sun-src/symbols/ro	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/ro,v 3.8 2003/09/08 13:12:37 pascal Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Romanian keybaord
-    // Created by Manfred Pohler, <[email protected]> (C) 2003
-
-    name[Group1]="Romanian";
-	include "us(basic)"
-
-    // Alphanumeric section
-    key <TLDE> {	[ bracketright,	bracketleft	]	};
-    key <AE01> {        [         1,    exclam          ],
-			[ asciitilde			]       };
-    key <AE02> {	[	  2,	quotedbl	],
-			[ at				]	};
-    key <AE03> {	[	  3,	numbersign	],
-			[ asciicircum			]	};
-    key <AE04> {	[	  4,	currency	]	};
-    key <AE05> {	[	  5,	percent		],
-			[   degree			]	};
-    key <AE06> {	[	  6,	ampersand	]	};
-    key <AE07> {	[	  7,	slash		],
-			[ grave				]	};
-    key <AE08> {	[	  8,	parenleft	]	};
-    key <AE09> {	[	  9,	parenright	]	};
-    key <AE10> {	[	  0,	equal		]	};
-    key <AE11> {	[    plus,	question	]	};
-    key <AE12> {	[ apostrophe,	asterisk	]	};
-    key <AD01> {	[	  q,	Q 		],
-			[ backslash			]	};
-    key <AD02> {        [         w,    W               ],
-			[ bar				]       };
-    key <AD03> {	[	  e,	E		],
-			[  EuroSign			]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  z,	Z		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD11> {	[ abreve,	Abreve		],
-			[ division	 		]	};
-    key <AD12> {	[ icircumflex,	Icircumflex	],
-			[ multiply			]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G		]	};
-    key <AC10> {	[ scedilla,	Scedilla	],
-			[ dollar			]	};
-    key <AC11> {	[ tcedilla,	Tcedilla	],
-			[ ssharp			]	};
-
-    key <LSGT> {	[      less,	greater		],
-			[       bar			]	};
-    key <AB01> {	[	  y,	Y 		]	};
-    key <AB05> {        [         b,    B               ],
-			[ braceleft			]       };
-    key <AB06> {        [         n,    N               ],
-			[ braceright			]       };
-    key <AB07> {	[	  m,	M		],
-			[ section			]	};
-    key <AB08> {	[     comma,	semicolon	],
-			[ less				]	};
-    key <AB09> {	[    period,	colon		],
-			[ greater			]	};
-    key <AB10> {	[     minus,	underscore	]	};
-    key <BKSL> {	[ acircumflex,	Acircumflex	]	};
-    key <RALT> {	[ Mode_switch,	Multi_key	]	};
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-// symbols definition for a very simple Romanian Keyboard layout.
-//
-// We basically override some modifier_keys so that using the Right Alt
-// and the corresponing letter we are able to generate the romanian characters
-//
-// Created by Cristian Gafton, <[email protected]> (C) 2000
-// Modified by Mișu Moldovan, <[email protected]> (C) 2001
-// Modified by Marius Andreiana, <[email protected]> (C) 2001
-// 
-// Diacriticele se scriu cu ALT-ul din dreapta si q,t,i,a,s (+shift eventual)
-
-partial alphanumeric_keys
-xkb_symbols "us_ro" {
-
-    name[Group1]="Romanian for us-keyboard";
-
-    // Alphanumeric section
-    key <AD01> { [], [ acircumflex,     Acircumflex	] };
-    key <AC01> { [], [ abreve,		Abreve		] };
-    key <AC02> { [], [ scedilla,	Scedilla	] };
-    key <AD05> { [], [ tcedilla,	Tcedilla	] };
-    key <AD08> { [], [ icircumflex,	Icircumflex	] };
-
-    key <RALT> {	[ Mode_switch,  Multi_key	] };
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-
-};
-
-xkb_symbols "comma" {
-    include "ro(us_ro)"
-
-    key <AC02> { [], [ 0x1000219,	0x1000218	] };
-    key <AD05> { [], [ 0x100021b,	0x100021a	] };
-};
-
-// Romanian keyboard with access to German umlauts";
-// Created by Manfred Pohler, <[email protected]> (C) 2003
-// German umlauts are accessible with <AltGr> and a, o , u, s (+shift for capital letters)
-//
-partial alphanumeric_keys
-xkb_symbols "ro_de" {
-
-    include "ro(basic)"
-
-    name[Group1]="German for Romanian keyboard";
-
-    key <AD07> {        [          u,   U               ],
-                        [ udiaeresis,   Udiaeresis      ]       };
-    key <AD09> {        [          o,   O               ],
-                        [ odiaeresis,   Odiaeresis      ]       };
-    key <AC01> {        [          a,   A               ],
-                        [ adiaeresis,   Adiaeresis      ]       };
-    key <AC02> {        [          s,   S               ],
-                        [     ssharp                    ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-         include "ro(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-         include "ro(Sundeadkeys)"
-}; 
--- a/src/xorg/keytables/sun-src/symbols/ro2	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-// symbols definition for Romanian Keyboard layout.
-//
-// Created by Derrick Jobidon, <[email protected]> (C) 2001
-// Inspired from modified US keyboard by Cristian Gafton
-//
-// $XFree86$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-    name[Group1]= "Romanian";
-
-	include "us(basic)"
-
-    key <TLDE> { [ bracketright, bracketleft	] };
-    key <AE01> { [ 1, exclam ], [ asciitilde, asciitilde ] };
-    key <AE02> { [ 2, quotedbl ], [dead_caron, dead_caron ] };
-    key <AE03> { [ 3, numbersign ], [dead_circumflex, dead_circumflex] };
-    key <AE04> { [ 4, currency], [dead_breve, dead_breve] };
-    key <AE05> { [ 5, percent], [ dead_abovering ] };
-    key <AE06> { [ 6, ampersand], [ dead_ogonek ] };
-    key <AE07> { [ 7, slash], [dead_grave, dead_grave] };
-    key <AE08> { [ 8, parenleft], [ dead_abovedot ] };
-    key <AE09> { [ 9, parenright], [dead_acute, dead_acute] };
-    key <AE10> { [ 0, equal], [ dead_doubleacute ] };
-    key <AE11> { [ plus, question], [dead_diaeresis, dead_diaeresis] };
-    key <AE12> { [ quoteright, asterisk], [dead_cedilla] };
-    key <BKSL> { [ acircumflex, Acircumflex] };
-    key <AD01> { [ q, Q], [backslash, backslash] };
-    key <AD02> { [ w, W], [bar, bar] };
-    key <AD03> { [ e, E], [EuroSign, EuroSign] };
-    key <AD04> { [ r, R], [registered, registered] };
-    key <AD05> { [ t, T], [trademark, trademark] };
-    key <AD06> { [ z, Z] };
-    key <AD11> { [ abreve, Abreve], [division, division] };
-    key <AD12> { [ icircumflex,	Icircumflex], [multiply, multiply] };
-    key <AC02> { [ s, S], [ dstroke, dstroke ] };
-    key <AC03> { [ d, D], [ Dstroke, Dstroke ] };
-    key <AC08> { [ k, K], [ lstroke, lstroke ] };
-    key <AC09> { [ l, L], [ Lstroke, Lstroke ] };
-    key <AC10> { [ scedilla, Scedilla], [dollar, dollar] };
-    key <AC11> { [ tcediila, Tcedilla], [ ssharp, ssharp ] };
-    key <AB01> { [ y, Y] };
-    key <AB03> { [ c, C], [copyright, copyright] };
-    key <AB04> { [ v, V], [at, at] };
-    key <AB05> { [ b, B], [braceleft, braceleft] };
-    key <AB06> { [ n, N], [braceright,braceright] };
-    key <AB07> { [ m, M], [section, section] };
-    key <AB08> { [ comma, semicolon], [less, less] };
-    key <AB09> { [ period, colon], [greater, greater] };
-    key <AB10> { [ minus, underscore] };
-
-};
-
-default
-xkb_symbols "pc101" {
-    key <RALT> { [ Mode_switch,  Multi_key ] };
-
-    include "ro(basic)"
-
-    modifier_map Mod3 { Mode_switch };
-};
-
-xkb_symbols "pc104" {
-    key <RALT> { [ Mode_switch ] };
-    key <RWIN> { [ Multi_key ] };
-
-    include "ro(basic)"
-
-    modifier_map Mod3 { Mode_switch };
-};
-
-xkb_symbols "pc105" {
-    key <RALT> { [ Mode_switch ] };
-    key <RWIN> { [ Multi_key ] };
-
-    include "ro(basic)"
-
-    modifier_map Mod3 { Mode_switch };
-};
-
-xkb_symbols "alt_is_meta" {
-    key <LALT> {  [  Meta_L ]  };
-    key <LWIN> {  [  Alt_L  ]  };
-
-    include "ro(pc104)"
-
-    // modifier mappings
-    modifier_map Mod1   { Meta_L, Meta_R };
-    modifier_map Mod4   { Alt_L,  Alt_R  };
-};
-
-xkb_symbols "comma" {
-    include "ro(basic)"
-
-    key <AC10> { [ 0x1000219, 0x1000218 ], [dollar, dollar] };
-    key <AC11> { [ 0x100021b, 0x100021a ], [ ssharp, ssharp ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "ro(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "ro(Sundeadkeys)"
-};
-
--- a/src/xorg/keytables/sun-src/symbols/ru	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,316 +0,0 @@
-// $Xorg: ru,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-//
-// russian standard keyboard
-// AEN <[email protected]>
-// Last Changes 2001/12/23 by Leon Kanter <[email protected]>
-// $XFree86: xc/programs/xkbcomp/symbols/ru,v 3.9 2002/01/16 18:20:12 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Russian keyboard
-
-    name[Group1]= "Russian";
-    name[Group2]= "US/ASCII";
-
-    key	<AE01> {	[		1,	    exclam	],
-			[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,        quotedbl	],
-			[		2,		at	]	};
-    key	<AE03> {	[		3,      numerosign	],
-			[		3,	numbersign	]	};
-    key	<AE04> {	[		4,        asterisk	],
-			[		4,	    dollar	]	};
-    key	<AE05> {	[		5,	     colon	],
-			[		5,	   percent	]	};
-    key	<AE06> {	[		6,	     comma	],
-			[		6,     asciicircum	]	};
-    key	<AE07> {	[		7,	    period	],
-			[		7,	 ampersand	]	};
-    key	<AE08> {	[		8,	 semicolon	],
-			[		8,	  asterisk	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	],
-			[		0,	parenright	]	};
-    key	<AE11> {	[	    minus,	underscore	],
-			[	    minus,	underscore	]	};
-    key	<AE12> {	[	    equal,	      plus	],
-			[	    equal,	      plus	]	};
-    key	<BKSL> {	[	backslash,	       bar	],
-			[	backslash,             bar	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	    slash,	  question	]	};
-    key <LSGT> { 	[           slash,             bar      ]       };
-
-key.type[group2]="ALPHABETIC";
-
-    key	<TLDE> {	[	    grave,	asciitilde	]	};
-    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	],
-			[		q,		 Q	]	};
-    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	],
-			[		w,		 W	]	};
-    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	],
-			[		e,		 E	]	};
-    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	],
-			[		r,		 R	]	};
-    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	],
-			[		t,		 T	]	};
-    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	],
-			[		y,		 Y	]	};
-    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	],
-			[		u,		 U	]	};
-    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	],
-			[		i,		 I	]	};
-    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	],
-			[		o,		 O	]	};
-    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	],
-			[		p,		 P	]	};
-    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	],
-			[     bracketleft,	 braceleft	]	};
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	],
-			[    bracketright,	braceright	]	};
-    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	],
-			[		a,		 A	]	};
-    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	],
-			[		s,		 S	]	};
-    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	],
-			[		d,		 D	]	};
-    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	],
-			[		f,		 F	]	};
-    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	],
-			[		g,		 G	]	};
-    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	],
-			[		h,		 H	]	};
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	],
-			[		j,		 J	]	};
-    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	],
-			[		k,		 K	]	};
-    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	],
-			[		l,		 L	]	};
-    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	],
-			[	semicolon,	     colon	]	};
-    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	],
-			[      apostrophe,	  quotedbl	]	};
-    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	],
-			[		z,		 Z	]	};
-    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	],
-			[		x,		 X	]	};
-    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	],
-			[		c,		 C	]	};
-    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	],
-			[		v,		 V	]	};
-    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	],
-			[		n,		 N	]	};
-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	],
-			[		b,		 B	]	};
-    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	],
-			[		m,		 M	]	};
-    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	],
-			[	    comma,	      less	]	};
-    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	],
-			[	   period,	   greater	]	};
-
-key.type[group2]="TWO_LEVEL";
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "winkeys" {
-    include "ru(basic)"
-    key <AE03> {        [               3,      numerosign      ],
-                        [               3,      numbersign      ]       };
-    key <AE04> {        [               4,       semicolon      ],
-                        [               4,          dollar      ]       };
-    key <AE05> {        [               5,         percent      ],
-                        [               5,         percent      ]       };
-    key <AE06> {        [               6,           colon      ],
-                        [               6,     asciicircum      ]       };
-    key <AE07> {        [               7,        question      ],
-                        [               7,       ampersand      ]       };
-    key <AE08> {        [               8,        asterisk      ],
-                        [               8,        asterisk      ]       };
-    key <AB10> {        [          period,           comma      ],
-                        [           slash,        question      ]       };
-    key <BKSL> {        [       backslash,           slash      ],
-                        [       backslash,             bar      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "typewriter" {
-    include "ru(basic)"
-    key	<TLDE> {	[      apostrophe,	  quotedbl	],
-			[	    grave,	asciitilde	] 	};
-    key	<AE01> {	[	   exclam,		 1 	],
-			[		1,	    exclam	]	};
-    key	<AE02> {	[      numerosign,		 2	],
-			[		2,		at	]	};
-    key	<AE03> {	[	    slash,		 3	],
-			[		3,	numbersign	]	};
-    key	<AE04> {	[	semicolon,		 4	],
-			[		4,	    dollar	]	};
-    key	<AE05> {	[	    colon,		 5	],
-			[		5,	   percent	]	};
-    key	<AE06> {	[	    comma,		 6	],
-			[		6,     asciicircum	]	};
-    key	<AE07> {	[	   period,		 7	],
-			[		7,	 ampersand	]	};
-    key	<AE08> {	[      underscore,		 8	],
-			[		8,	  asterisk	]	};
-    key	<AE09> {	[	 question,		 9	],
-			[		9,	 parenleft	]	};
-    key	<AE10> {	[	  percent,		 0	],
-			[		0,	parenright	]	};
-    key	<BKSL> {	[	parenleft,	parenright	],
-			[	backslash,	       bar	]	};
-
-key.type[group2]="ALPHABETIC";
-
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	],
-			[    bracketright,	braceright	]	};
-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	],
-			[		b,		 B	]	};
-    key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	],
-			[	    slash,	  question	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "phonetic" {
-    include "ru(basic)"
-
-    key	<AE01> {	[		1,	    exclam	],
-			[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,		at	],
-			[		2,        	at	]	};
-    key	<AE03> {	[		3,     Cyrillic_io 	],
-			[		3,      numbersign	]	};
-    key	<AE04> {	[		4,     Cyrillic_IO	],
-			[		4,	    dollar	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[		5,	   percent	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[		6,     asciicircum	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[		7,	 ampersand	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[		8,        asterisk	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	],
-			[		0,	parenright	]	};
-
-    key	<AB09> {	[	   period,	   greater	],
-			[	   period,	   greater	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	    slash,	  question	]	};
-    key	<AB08> {	[	    comma,	      less	],
-			[	    comma,	      less	]	};
-    key	<AC10> {	[	semicolon,	     colon	],
-			[	semicolon,	     colon	]	};
-    key	<AC11> {	[      apostrophe,	  quotedbl	],
-			[      apostrophe,	  quotedbl	]	};
-    key	<LSGT> {	[	      bar,	 brokenbar	],
-			[	     less,	   greater	]	};
-
-key.type[group2]="ALPHABETIC";
-
-    key	<TLDE> {	[     Cyrillic_yu,     Cyrillic_YU	],
-			[	    grave,	asciitilde	]	};
-    key	<AD01> {	[     Cyrillic_ya,     Cyrillic_YA	],
-			[		q,		 Q	]	};
-    key	<AB01> {	[     Cyrillic_ze,     Cyrillic_ZE	],
-			[		z,		 Z	]	};
-    key	<AC02> {	[     Cyrillic_es,     Cyrillic_ES	],
-			[		s,		 S	]	};
-    key	<AC01> {	[      Cyrillic_a,	Cyrillic_A	],
-			[		a,		 A	]	};
-    key	<AD02> {	[     Cyrillic_ve,     Cyrillic_VE	],
-			[		w,		 W	]	};
-    key	<AB03> {	[    Cyrillic_tse,    Cyrillic_TSE	],
-			[		c,		 C	]	};
-    key	<AB02> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	],
-			[		x,		 X	]	};
-    key	<AC03> {	[     Cyrillic_de,     Cyrillic_DE	],
-			[		d,		 D	]	};
-    key	<AD03> {	[     Cyrillic_ie,     Cyrillic_IE	],
-			[		e,		 E	]	};
-    key	<AB04> {	[    Cyrillic_zhe,    Cyrillic_ZHE	],
-			[		v,		 V	]	};
-    key	<AC04> {	[     Cyrillic_ef,     Cyrillic_EF	],
-			[		f,		 F	]	};
-    key	<AD05> {	[     Cyrillic_te,     Cyrillic_TE	],
-			[		t,		 T	]	};
-    key	<AD04> {	[     Cyrillic_er,     Cyrillic_ER	],
-			[		r,		 R	]	};
-    key	<AB06> {	[     Cyrillic_en,     Cyrillic_EN	],
-			[		n,		 N	]	};
-    key	<AB05> {	[     Cyrillic_be,     Cyrillic_BE	],
-			[		b,		 B	]	};
-    key	<AC06> {	[     Cyrillic_ha,     Cyrillic_HA	],
-			[		h,		 H	]	};
-    key	<AC05> {	[    Cyrillic_ghe,    Cyrillic_GHE	],
-			[		g,		 G	]	};
-    key	<AD06> {	[   Cyrillic_yeru,   Cyrillic_YERU	],
-			[		y,		 Y	]	};
-    key	<AB07> {	[     Cyrillic_em,     Cyrillic_EM	],
-			[		m,		 M	]	};
-    key	<AC07> {	[ Cyrillic_shorti, Cyrillic_SHORTI	],
-			[		j,		 J	]	};
-    key	<AD07> {	[      Cyrillic_u,	Cyrillic_U	],
-			[		u,		 U	]	};
-    key	<AC08> {	[     Cyrillic_ka,     Cyrillic_KA	],
-			[		k,		 K	]	};
-    key	<AD08> {	[      Cyrillic_i,	Cyrillic_I	],
-			[		i,		 I	]	};
-    key	<AD09> {	[      Cyrillic_o,	Cyrillic_O	],
-			[		o,		 O	]	};
-    key	<AC09> {	[     Cyrillic_el,     Cyrillic_EL	],
-			[		l,		 L	]	};
-    key	<AD10> {	[     Cyrillic_pe,     Cyrillic_PE	],
-			[		p,		 P	]	};
-    key	<AE11> {	[	    minus, Cyrillic_hardsign	],
-			[	    minus,	underscore	]	};
-    key	<AD11> {	[    Cyrillic_sha,    Cyrillic_SHA	],
-			[     bracketleft,	 braceleft	]	};
-    key	<AE12> {	[    Cyrillic_che,    Cyrillic_CHE	],
-			[	    equal,	      plus	]	};
-    key	<AD12> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	],
-			[    bracketright,	braceright	]	};
-    key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	],
-			[	backslash,	       bar	]	};
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
--- a/src/xorg/keytables/sun-src/symbols/se	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-// $Xorg: se,v 1.3 2000/08/17 19:54:44 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/se,v 3.10 2002/12/19 01:07:54 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys 
- xkb_symbols "basic" {
- 
-     // Describes the differences between a very simple en_US
-    // keyboard and a Swedish keyboard with dead key support
-    // and all of ISO-8859-1 characters available.
- 
-     name[Group1]= "Swedish";
- 
-    key <TLDE> {	[         section,         onehalf    	]	};
-    key <LSGT> {	[	     less,	   greater      ],
-                 	[             bar,       brokenbar    	]	};
-    key <SPCE> {	[	    space,	     space	],
-			[	    space,    nobreakspace	]	};
-    key <AE01> {	[               1,          exclam  	]	};
-    key <AE02> {	[               2,        quotedbl  	],
-			[	       at			]	};
-    key <AE03> {	[              	3,	numbersign	],
-			[	 sterling			]	};
-    key <AE04> {	[               4,        currency     	],
-			[	   dollar			]	};
-    key <AE05> {	[               5,         percent     	],
-			[	 	5,         percent	]	};
-    key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash     	],
-			[       braceleft			]	};
-    key <AE08> {	[               8,       parenleft     	],
-			[     bracketleft			]	};
-    key <AE09> {	[               9,      parenright     	],
-			[    bracketright			]	};
-    key <AE10> {	[               0,           equal     	],
-                  	[      braceright 		    	]	};
-    key <AB08> {	[           comma,       semicolon 	]	};
-    key <AB09> {	[          period,           colon     	]	};
-    key <AB03> {  	[               c,               C      ],
-                  	[       copyright,        NoSymbol     	]	};
-    key <AB10> {	[           minus,      underscore     	],
-			[	    minus,      underscore	]	};
-    key <AC01> {	[               a,               A     	]	};
-    key <AC03> {	[               d,               D     	]	};
-    key <AD03> {  	[               e,               E     	],
-                  	[        EuroSign,            cent     	]	};
-    key <AD04> {  	[               r,               R     	]	};
-    key <AD05> {  	[               t,               T     	]	};
-    key <AD08> {  	[               i,               I     	]	};
-    key <AD09> {  	[               o,               O 	]	};
-    key <AC10> {	[      odiaeresis,      Odiaeresis	]	};
-    key <AE11> {	[            plus,        question     	],
-					[       backslash	]	};
-    key	<AC11> {	[      adiaeresis,      Adiaeresis	]	};
-    key <BKSL> {	[      apostrophe,        asterisk	],
-                 	[           grave 			]	};
-    key <AD11> {	[	    aring,           Aring 	]	};
-    key <AE12> {  	[      dead_acute,      dead_grave     	]	};
-    key <AD12> {  	[  dead_diaeresis, dead_circumflex     	],
-                 	[      dead_tilde 		    	]	};
-
- 
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
-    // End "Keypad" section
-
-    // begin modifier mappings
-    
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "se(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "fixdollar" {
-//    key <AE04> {	[               4,        currency     	],	
-//						[	   dollar,	    dollar					]	};
-  override key <AE04> {	[		4,	    dollar					],
-							[	   dollar,	  currency				] 	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "se(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic Swedish layout to eliminate all dead keys
-
-    include "se(basic)"
-    key <AE12> {	[           acute,           grave	]	};
-    key <AD12> {	[       diaeresis,     asciicircum     	],
-					[      asciitilde,           caron	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/si	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-// Slovenian keyboards
-// by Marko Samastur ([email protected]) and
-// Primoz Peterlin ([email protected])
-// Last change: 6.2.2000
-//
-// Log: sl,v
-// Revision 1.4  2000/02/02 10:30:10  peterlin
-// Glede na pripombe Metoda Kozelja napravil asciitilde, asciicircum,
-// degree in quoteleft dosegljive neposredno prek AltGr, dead_tilde,
-// dead_circumflex, dead_abovering in dead_grave pa prek Shift+AltGr.
-//
-// Revision 1.3  2000/01/31 10:29:06  peterlin
-// Dodal prej po nemarnem pozabljeni caron.
-//
-// Revision 1.2  2000/01/30 21:33:14  peterlin
-// Popravil neme znake na stevilcnih tipkah. Obesil "multiply" na Dstroke.
-//
-// $XFree86: xc/programs/xkbcomp/symbols/si,v 1.1 2000/02/08 15:46:35 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a Slovenian keybaord
-    // by Marko Samastur ([email protected])
-
-    // Alphanumeric section
-    name[Group1]= "Slovene";
-    key <TLDE> {	[ dead_cedilla,	dead_diaeresis	]	};
-    key <AE01> {	[         1,	exclam		],
-			[ asciitilde			]	};
-    key <AE02> {	[	  2,	quotedbl	],
-			[ dead_caron			]	};
-    key <AE03> {	[	  3,	numbersign	],
-			[ dead_circumflex		]	};
-    key <AE04> {	[	  4,	dollar		],
-			[ dead_breve			]	};
-    key <AE05> {	[	  5,	percent		],
-			[ dead_abovering 		]	};
-    key <AE06> {	[	  6,	ampersand	],
-			[ dead_ogonek			]	};
-    key <AE07> {	[	  7,	slash		],
-			[ quoteleft			]	};
-    key <AE08> {	[	  8,	parenleft	],
-			[ dead_abovedot			]	};
-    key <AE09> {	[	  9,	parenright	],
-			[ dead_acute			]	};
-    key <AE10> {	[	  0,	equal		],
-			[ dead_doubleacute		]	};
-    key <AE11> {	[ apostrophe, 	question	],
-			[ dead_diaeresis		]	};
-    key <AE12> {	[ plus,		 asterisk	],
-			[ dead_cedilla			]	};
-
-    key <AD01> {	[	  q,	Q 		],
-			[ backslash			]	};
-    key <AD02> {	[	  w,	W 		],
-			[ bar				]	};
-    key <AD03> {	[	  e,	E		],
-			[  EuroSign			]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  z,	Z		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD11> {	[ scaron,	Scaron		],
-			[ division	 		]	};
-    key <AD12> {	[      dstroke,	Dstroke		],
-			[ multiply			]	};
-    key <AC04> {	[	  f,	F		],
-			[ bracketleft			]	};
-    key <AC05> {	[	  g,	G		],
-			[ bracketright			]	};
-    key <AC08> {	[	  k,	K		],
-			[ lstroke			]	};
-    key <AC09> {	[	  l,	L		],
-			[ Lstroke			]	};
-    key <AC10> {	[ ccaron,	Ccaron		]	};
-    key <AC11> {	[ cacute,	Cacute		],
-			[ ssharp			]	};
-
-    key <LSGT> {	[      less,	greater		]	};
-    key <AB01> {	[	  y,	Y 		]	};
-    key <AB04> {	[	  v,	V 		],
-			[ at				]	};
-    key <AB05> {	[	  b,	B 		],
-			[ braceleft			]	};
-    key <AB06> {	[	  n,	N 		],
-			[ braceright			]	};
-    key <AB07> {	[	  m,	M		],
-			[ section			]	};
-    key <AB08> {	[     comma,	semicolon	]	};
-    key <AB09> {	[    period,	colon		]	};
-    key <AB10> {	[     minus,	underscore	]	};
-    key <BKSL> {	[ zcaron,	Zcaron		],
-			[ currency			]	};
-    key <KPDL> {	[ KP_Delete,	KP_Separator	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "si(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "si(Sundeadkeys)" // for naming consistency
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sk	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/sk,v 1.2 2001/10/01 14:04:16 eich Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    key <TLDE>  {       [       semicolon,      dead_abovering  ],
-                        [       quoteleft,          asciitilde  ]       };
-    key <AE01>  {       [            plus,         1            ],
-                        [          exclam,          asciitilde  ]       };
-    key <AE02>  {       [          lcaron,         2            ],
-                        [              at,          dead_caron  ]       };
-    key <AE03>  {       [          scaron,         3            ],
-                        [      numbersign,        SunFA_Circum  ]       };
-    key <AE04>  {       [          ccaron,         4            ],
-                        [          dollar,          dead_breve  ]       };
-    key <AE05>  {       [          tcaron,         5            ],
-                        [         percent,      dead_abovering  ]       };
-    key <AE06>  {       [          zcaron,         6            ],
-                        [     asciicircum,         dead_ogonek  ]       };
-    key <AE07>  {       [          yacute,         7            ],
-                        [       ampersand,               grave  ]       };
-    key <AE08>  {       [          aacute,         8            ],
-                        [        asterisk,       dead_abovedot  ]       };
-    key <AE09>  {       [          iacute,         9            ],
-                        [       parenleft,          apostrophe  ]       };
-    key <AE10>  {       [          eacute,         0            ],
-                        [      parenright,    dead_doubleacute  ]       };
-    key <AE11>  {       [           equal,             percent  ],
-                        [  dead_diaeresis,           backslash  ]       };
-    key <AE12>  {       [     SunFA_Acute,          dead_caron  ],
-                        [    dead_cedilla,               minus  ]       };
-    key <AD01>  {       [               q,         Q            ],
-                        [       backslash                       ]       };
-    key <AD02>  {       [               w,         W            ],
-                        [             bar                       ]       };
-    key <AD03>  {       [               e,         E            ],
-                        [        EuroSign                       ]       };
-    key <AD06>  {	[	        z,	   Z		]	};
-    key <AD11>  {       [          uacute,               slash  ],
-                        [        division                       ]       };
-    key <AD12>  {       [      adiaeresis,           parenleft  ],
-                        [        multiply                       ]       };
-    key <AC02>  {       [               s,         S            ],
-                        [         dstroke                       ]       };
-    key <AC03>  {       [               d,         D            ],
-                        [         Dstroke                       ]       };
-    key <AC04>  {       [               f,         F            ],
-                        [     bracketleft                       ]       };
-    key <AC05>  {       [               g,         G            ],
-                        [    bracketright                       ]       };
-    key <AC08>  {       [               k,         K            ],
-                        [         lstroke                       ]       };
-    key <AC09>  {       [               l,         L            ],
-                        [         Lstroke                       ]       };
-    key <AC10>  {       [     ocircumflex,            quotedbl  ],
-                        [          dollar                       ]       };
-    key <AC11>  {       [         section,              exclam  ],
-                        [          ssharp                       ]       };
-    key <AC12>  {       [          ncaron,          parenright  ],
-                        [        currency,            currency  ]       };
-    key <BKSL>  {       [          ncaron,          parenright  ],
-                        [       backslash,                 bar  ]       };
-    key <LSGT>  {       [       backslash,                 bar  ], 
-                        [           slash,           brokenbar  ]       };
-    key <AB01>  {       [               y,        Y             ],
-                        [            less                       ]       };
-    key <AB02>  {       [               x,        X             ],
-                        [         greater,          numbersign  ]       };
-    key <AB03>  {       [               c,        C             ],
-                        [       ampersand                       ]       };
-    key <AB04>  {       [               v,        V             ],
-                        [              at                       ]       };
-    key <AB05>  {       [               b,        B             ],
-                        [       braceleft                       ]       };
-    key <AB06>  {       [               n,        N             ],
-                        [      braceright                       ]       };
-    key <AB08>  {       [           comma,            question  ],
-                        [            less                       ]       };
-    key <AB09>  {       [          period,               colon  ],
-                        [         greater                       ]       };
-    key <AB10>  {       [           minus,          underscore  ],
-                        [        asterisk                       ]       };
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "sk(basic)" // for consistent naming
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "sk(Sundeadkeys)" // for consistent naming
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sk_qwerty	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/sk_qwerty,v 1.1 2001/05/18 23:35:35 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys 
-xkb_symbols "basic" {
- 
-    // This layout should work exactly as a sk with the exception 
-    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
-    // 2001 by Kamil Toman <[email protected]>
-    
-include "sk(basic)" 
-
-    key <AB01> { [    z,              Z        	],
-    	         [    degree		        ]   };
-    key <AD06> { [    y,              Y         ],
-	         [    NoSymbol	                ]   };                           
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "sk_qwerty(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "sk_qwerty(Sundeadkeys)"
-}; 
-
--- a/src/xorg/keytables/sun-src/symbols/sr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-// Serbian standard keyboard, version 1.1
-
-// Authors of this keyboard map are Milos Rancic <[email protected]>
-//                              and Anton Zinoviev <[email protected]>.
-
-// $XFree86: xc/programs/xkbcomp/symbols/sr,v 1.1 2000/11/14 17:33:03 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys 
-xkb_symbols "basic" {
-  
-  // Describes the differences between a very simple en_US keyboard
-  // and a very simple Serbian keyboard.
-
-  // Note that the letter Serbian_dje is on the key with latin letter
-  // `Z' and in Cyrillic mode on the key with right bracket and brace
-  // you will find left and right bracket.
-
-  name[Group1]= "Serbia";
- 
-  key <TLDE> {  [ backslash,  bar                     ],
-                [  backslash,  bar                    ]       };
-  key <AE01> {  [       1,    exclam                  ],
-                [ asciitilde                          ]       };
-  key <AE02> {  [       2,    quotedbl                ],
-                [       2,    quotedbl                ]       };
-  key <AE03> {  [       3,    numbersign              ],
-                [ asciicircum                         ]       };
-  key <AE04> {  [       4,    dollar                  ],
-                [       4,    dollar                  ]       };
-  key <AE05> {  [       5,    percent                 ],
-                [       5,    percent                 ]       };
-  key <AE06> {  [       6,    ampersand               ],
-                [       6,    ampersand               ]       };
-  key <AE07> {  [       7,    slash                   ],
-                [ quoteleft                           ]       };
-  key <AE08> {  [       8,    parenleft               ],
-                [       8,    parenleft               ]       };
-  key <AE09> {  [       9,    parenright              ],
-                [       9,    parenright              ]       };
-  key <AE10> {  [       0,    equal                   ],
-                [       0,    equal                   ]       };
-  key <AE11> {  [ apostrophe, question                ],
-                [ apostrophe, question                ]       };
-  key <AE12> {  [ plus,       asterisk                ],
-                [ plus,       asterisk                ]       };
- 
-  key <AD01> {   [ q,                 Q                   ],
-                 [ Cyrillic_lje,      Cyrillic_LJE        ]    };
-  key <AD02> {   [ w,                 W                   ],
-                 [ Cyrillic_nje,      Cyrillic_NJE        ]    };
-  key <AD03> {   [ e,                 E                   ],
-                 [ Cyrillic_ie,       Cyrillic_IE         ]    };
-  key <AD04> {   [ r,                 R                   ],
-                 [ Cyrillic_er,       Cyrillic_ER         ]    };
-  key <AD05> {   [ t,                 T                   ],
-                 [ Cyrillic_te,       Cyrillic_TE         ]    };
-  key <AB01> {   [ y,                 Y                   ],
-                 [ Macedonia_dse,     Macedonia_DSE       ]    };
-  key <AD07> {   [ u,                 U                   ],
-                 [ Cyrillic_u,        Cyrillic_U          ]    };
-  key <AD08> {   [ i,                 I                   ],
-                 [ Cyrillic_i,        Cyrillic_I          ]    };
-  key <AD09> {   [ o,                 O                   ],
-                 [ Cyrillic_o,        Cyrillic_O          ]    };
-  key <AD10> {   [ p,                 P                   ],
-                 [ Cyrillic_pe,       Cyrillic_PE         ]    };
-  key <AD11> {   [ bracketleft,       braceleft           ],
-                 [ Cyrillic_sha,      Cyrillic_SHA        ]    };
-  key <AD12> {   [ bracketright,      braceright          ],
-                 [ Serbian_dje,       Serbian_DJE        ]    };
-
-  key <AC01> {   [ a,                 A                   ],
-                 [ Cyrillic_a,        Cyrillic_A          ]    };
-  key <AC02> {   [ s,                 S                   ],
-                 [ Cyrillic_es,       Cyrillic_ES         ]    };
-  key <AC03> {   [ d,                 D                   ],
-                 [ Cyrillic_de,       Cyrillic_DE         ]    };
-  key <AC04> {   [ f,                 F                   ],
-                 [ Cyrillic_ef,       Cyrillic_EF         ]    };
-  key <AC05> {   [ g,                 G                   ],
-                 [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
-  key <AC06> {   [ h,                 H                   ],
-                 [ Cyrillic_ha,       Cyrillic_HA         ]    };
-  key <AC07> {   [ j,                 J                   ],
-                 [ Cyrillic_je,       Cyrillic_JE         ]    };
-  key <AC08> {   [ k,                 K                   ],
-                 [ Cyrillic_ka,       Cyrillic_KA         ]    };
-  key <AC09> {   [ l,                 L                   ],
-                 [ Cyrillic_el,       Cyrillic_EL         ]    };
-  key <AC10> {   [ asciicircum,       asciicircum         ],
-                 [ Cyrillic_che,      Cyrillic_CHE        ]    };
-  key <AC11> {   [ section,           section             ],
-                 [ Serbian_tshe,      Serbian_TSHE        ]    };
-  key <BKSL> {   [ at,		at 			  ], 
-                 [    Cyrillic_zhe,    Cyrillic_ZHE	  ]	};
-  key <LSGT> {   [ less,              greater             ]    };
-  key <AD06> {   [ z,                 Z                   ],
-                 [ Cyrillic_ze,       Cyrillic_ZE         ]    };
-  key <AB02> {   [ x,                 X                   ],
-                 [ Cyrillic_dzhe,     Cyrillic_DZHE       ]    };
-  key <AB03> {   [ c,                 C                   ],
-                 [ Cyrillic_tse,      Cyrillic_TSE        ]    };
-  key <AB04> {   [ v,                 V                   ],
-                 [ Cyrillic_ve,       Cyrillic_VE         ]    };
-  key <AB05> {   [ b,                 B                   ],
-                 [ Cyrillic_be,         Cyrillic_BE         ]    };
-  key <AB06> {   [ n,                 N                   ],
-                 [ Cyrillic_en,        Cyrillic_EN         ]    };
-  key <AB07> {   [ m,                 M                   ],
-                 [ Cyrillic_em,       Cyrillic_EM         ]    };
-    key <AB08> {  [ comma,       semicolon ]	};
-    key <AB09> {  [ period,          colon ]	};
-    key <AB10> {  [ minus,      underscore ]	};
-
-  // End alphanumeric section
-
-  // Begin modifier mappings 
-  
-  modifier_map Shift  { Shift_L };
-  modifier_map Lock   { Caps_Lock };
-  modifier_map Control{ Control_L };
-  modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "sr(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "sr(Sundeadkeys)" // for naming consistency
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/am	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-    name[Group1]= "Armenia";
-    name[Group2]= "US/ASCII";
-
-    // Alphanumeric section
-    key <TLDE> {	[ 0x100055d, 0x100055c	], [ quoteleft, asciitilde ]	};
-    key	<LSGT> {	[  question,  0x100058a	], [ less, greater ]	};
-    key <BKSL> {        [ guillemotright, guillemotleft ], [ backslash, bar ] };
-
-    key <AE01> {	[ 0x1000586,  0x1000556	], [ 1, exclam ]	};
-    key <AE02> {	[ 0x1000571,  0x1000541	], [ 2, at ]	};
-    key <AE03> {	[ 0x1002013,  0x1002014 ], [ 3, numbersign ]	};
-    key <AE04> {	[     comma,  dollar	], [ 4, dollar ]	};
-    key <AE05> {	[ 0x1000589,  0x1002026	], [ 5, percent ] 	};
-    key <AE06> {	[ 0x100055e,  percent	], [ 6, asciicircum ]	};
-    key <AE07> {	[ 0x1002024,  0x1000587	], [ 7, ampersand ]	};
-    key <AE08> {	[ 0x100055b,  0x10002bc	], [ 8, asterisk ] 	};
-    key <AE09> {	[ parenright, parenleft ], [ 9, parentleft ] 	};
-    key <AE10> {	[ 0x1000585,  0x1000555	], [ 0, parentright ]	};
-    key <AE11> {	[ 0x1000567,  0x1000537	], [ minus, underscore ] };
-    key <AE12> {	[ 0x1000572,  0x1000542	], [ equal, plus ] };
-
-    key <AD01> {	[ 0x1000573, 0x1000543	], [ q, Q ]   };
-    key <AD02> {	[ 0x1000583, 0x1000553	], [ w, W ]   };
-    key <AD03> {	[ 0x1000562, 0x1000532	], [ e, E ]   };
-    key <AD04> {	[ 0x100057d, 0x100054d	], [ r, R ]   };
-    key <AD05> {	[ 0x1000574, 0x1000544	], [ t, T ]   };
-    key <AD06> {	[ 0x1000578, 0x1000548	], [ y, Y ]   };
-    key <AD07> {	[ 0x1000582, 0x1000552	], [ u, U ]   };
-    key <AD08> {	[ 0x100056f, 0x100053f	], [ i, I ]   };
-    key <AD09> {	[ 0x1000568, 0x1000538	], [ o, O ]   };
-    key <AD10> {	[ 0x1000569, 0x1000539	], [ p, P ]   };
-    key <AD11> {	[ 0x100056e, 0x100053e	], [ bracketleft, braceleft ]   };
-    key <AD12> {	[ 0x1000581, 0x1000551	], [ bracketright, braceright ]   };
-
-    key <AC01> {	[ 0x100057b, 0x100054b	], [ a, A ]   };
-    key <AC02> {	[ 0x100057e, 0x100054e	], [ s, S ]   };
-    key <AC03> {	[ 0x1000563, 0x1000533	], [ d, D ]   };
-    key <AC04> {	[ 0x1000565, 0x1000535	], [ f, F ]   };
-    key <AC05> {	[ 0x1000561, 0x1000531	], [ g, G ]   };
-    key <AC06> {	[ 0x1000576, 0x1000546	], [ h, H ]   };
-    key <AC07> {	[ 0x100056b, 0x100053b	], [ j, J ]   };
-    key <AC08> {	[ 0x100057f, 0x100054f	], [ k, K ]   };
-    key <AC09> {	[ 0x1000570, 0x1000540	], [ l, L ]   };
-    key <AC10> {	[ 0x100057a, 0x100054a	], [ semicolon, colon ]   };
-    key <AC11> {	[ 0x1000580, 0x1000550	], [ quoteright, quotedbl ]   };
-
-    key <AB01> {	[ 0x100056a, 0x100053a	], [ z, Z ]   };
-    key <AB02> {	[ 0x1000564, 0x1000534	], [ x, X ]   };
-    key <AB03> {	[ 0x1000579, 0x1000549	], [ c, C ]   };
-    key <AB04> {	[ 0x1000575, 0x1000545	], [ v, V ]   };
-    key <AB05> {	[ 0x1000566, 0x1000536	], [ b, B ]   };
-    key <AB06> {	[ 0x100056c, 0x100053c	], [ n, N ]   };
-    key <AB07> {	[ 0x1000584, 0x1000554	], [ m, M ]   };
-    key <AB08> {	[ 0x100056d, 0x100053d	], [ comma, less ]   };
-    key <AB09> {	[ 0x1000577, 0x1000547	], [ period, greater ]   };
-    key <AB10> {	[ 0x100057c, 0x100054c	], [ slash, question ]   };
-
-    key <LCTL> {	[ Control_L ] };
-
-key.type[group2]="TWO_LEVEL";
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/ar	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-    name[Group2]= "Arabic";
-
-    key <TLDE> { [  ], [     Arabic_thal,      Arabic_shadda   ]	};
-    key <AE01> { [  ], [               1,          exclam      ]       };
-    key <AE02> { [  ], [               2,              at      ]       };
-    key <AE03> { [  ], [               3,      numbersign      ]       };
-    key <AE04> { [  ], [               4,          dollar      ]       };
-    key <AE05> { [  ], [               5,         percent      ]       };
-    key <AE06> { [  ], [               6,     asciicircum      ]       };
-    key <AE07> { [  ], [               7,       ampersand      ]       };
-    key <AE08> { [  ], [               8,        asterisk      ]       };
-    key <AE09> { [  ], [               9,       parenleft      ]       };
-    key <AE10> { [  ], [               0,      parenright      ]       };
-    key <AE11> { [  ], [           minus,      underscore      ]       };
-    key <AE12> { [  ], [           equal,            plus      ]       };
-						
-    key <AD01> { [  ], [      Arabic_dad,     Arabic_fatha     ]       };
-    key <AD02> { [  ], [      Arabic_sad,     Arabic_fathatan  ]       };
-    key <AD03> { [  ], [     Arabic_theh,     Arabic_damma     ]       };
-    key <AD04> { [  ], [      Arabic_qaf,     Arabic_dammatan  ]       };
-    key <AD05> { [  ], [      Arabic_feh,       0x100fef9      ]       };
-    key <AD06> { [  ], [   Arabic_ghain, Arabic_hamzaunderalef ]       };
-    key <AD07> { [  ], [      Arabic_ain,         grave        ]       };
-    key <AD08> { [  ], [       Arabic_ha,        division      ]       };
-    key <AD09> { [  ], [     Arabic_khah,       multiply       ]       };
-    key <AD10> { [  ], [      Arabic_hah,    Arabic_semicolon  ]       };
-    key <AD11> { [  ], [     Arabic_jeem,          greater     ]       };
-    key <AD12> { [  ], [      Arabic_dal,          less        ]       };	    
-
-    key <AC01> { [  ], [    Arabic_sheen,	Arabic_kasra   ]       };
-    key <AC02> { [  ], [     Arabic_seen,       Arabic_kasratan    ]       };
-    key <AC03> { [  ], [      Arabic_yeh,       bracketleft    ]       };
-    key <AC04> { [  ], [      Arabic_beh,       bracketright   ]       };
-    key <AC05> { [  ], [      Arabic_lam,       0x100fef7      ]       };
-    key <AC06> { [  ], [     Arabic_alef,   Arabic_hamzaonalef ]       };
-    key <AC07> { [  ], [      Arabic_teh,      Arabic_tatweel  ]       };
-    key <AC08> { [  ], [     Arabic_noon,      Arabic_comma    ]       };
-    key <AC09> { [  ], [     Arabic_meem,         slash        ]       };
-    key <AC10> { [  ], [      Arabic_kaf,           colon      ]       };
-    key <AC11> { [  ], [      Arabic_tah,        quotedbl      ]       };
-    key <BKSL> { [  ], [            less,         greater      ]       };
-
-    key <LSGT> { [  ], [             bar,      brokenbar	   ]       };
-    key <AB01> { [  ], [Arabic_hamzaonyeh,    asciitilde       ]       };
-    key <AB02> { [  ], [    Arabic_hamza,      Arabic_sukun    ]       };
-    key <AB03> { [  ], [Arabic_hamzaonwaw,     braceleft       ]       };
-    key <AB04> { [  ], [       Arabic_ra,      braceright      ]       };
-    key <AB05> { [  ], [       0x100fefb,      0x100fef5       ]       };
-    key <AB06> { [  ], [Arabic_alefmaksura, Arabic_maddaonalef ]       };
-    key <AB07> { [  ], [Arabic_tehmarbuta,    apostrophe       ]       };
-    key <AB08> { [  ], [      Arabic_waw,         comma        ]       };
-    key <AB09> { [  ], [     Arabic_zain,         period       ]       };
-    key <AB10> { [  ], [      Arabic_zah, Arabic_question_mark ]       };
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-  include "sun/ar(basic)"
-
-    key <TLDE> { [	  quoteleft,	asciitilde	 ],
-		 [     Arabic_thal,      Arabic_shadda   ]	 };
-    key <AE01> { [               1,          exclam      ],
-		 [       0x1000661,          exclam      ]       };
-    key <AE02> { [               2,              at      ],
-		 [       0x1000662,              at      ]       };
-    key <AE03> { [               3,      numbersign      ],
-		 [       0x1000663,      numbersign      ]       };
-    key <AE04> { [               4,          dollar      ],
-		 [       0x1000664,          dollar      ]       };
-    key <AE05> { [               5,         percent      ],
-		 [       0x1000665,         percent      ]       };
-    key <AE06> { [               6,     asciicircum      ],
-		 [       0x1000666,     asciicircum      ]       };
-    key <AE07> { [               7,       ampersand      ],
-		 [       0x1000667,       ampersand      ]       };
-    key <AE08> { [               8,        asterisk      ],
-		 [       0x1000668,        asterisk      ]       };
-    key <AE09> { [               9,       parenleft      ],
-		 [       0x1000669,       parenleft      ]       };
-    key <AE10> { [               0,      parenright      ],
-		 [       0x1000660,      parenright      ]       };
-		
-								
-    key <AD01> { [		 q,	      Q          ],
-		 [      Arabic_dad,     Arabic_fatha     ]       };
-    key <AD02> { [		 w,	      W		 ],
-		 [      Arabic_sad,     Arabic_fathatan  ]       };
-    key <AD03> { [		 e,		E	 ],
-		 [     Arabic_theh,     Arabic_damma     ]       };
-    key <AD04> { [		 r,		R	 ],
-		 [      Arabic_qaf,     Arabic_dammatan  ]       };
-    key <AD05> { [		 t,		T	 ],
-		 [      Arabic_feh,       0x100fef9      ]       };
-    key <AD06> { [		 y,		Y	 ],
-		 [   Arabic_ghain, Arabic_hamzaunderalef ]       };
-    key <AD07> { [		 u,		U	 ],
-		 [      Arabic_ain,         grave        ]       };
-    key <AD08> { [		i,		I	 ],
-		 [       Arabic_ha	                 ]       };
-    key <AD09> { [		o,		O	 ],
-		 [     Arabic_khah	                 ]       };
-    key <AD10> { [		p,		P	 ],
-		 [      Arabic_hah,    Arabic_semicolon  ]       };
-    key <AD11> { [     bracketleft,	braceleft	 ],
-		 [     Arabic_jeem,          greater     ]       };
-    key <AD12> { [    bracketright,	braceright	 ],
-		 [      Arabic_dal,          less        ]       };
-    key <BKSL> { [	backslash,		bar	 ]	 };
-    key <LSGT> { [	less,		greater		 ],
-		 [             bar,     brokenbar        ]       };
-
-    key <AC01> { [	  	a,		A	 ],
-		 [    Arabic_sheen,	Arabic_kasra     ]       };
-    key <AC02> { [  	 	s,	S		 ],
-		 [     Arabic_seen,      Arabic_kasratan ]       };
-    key <AC03> { [  	  	d,	D		 ],
-		 [      Arabic_yeh,       bracketleft    ]       };
-    key <AC04> { [  		  f,	F		 ],
-		 [      Arabic_beh,       bracketright   ]       };
-    key <AC05> { [  		  g,	G		 ],
-		 [      Arabic_lam,       0x100fef7      ]       };
-    key <AC06> { [  		  h,	H		 ],
-		 [     Arabic_alef,   Arabic_hamzaonalef ]       };
-    key <AC07> { [  		  j,	J		 ],
-		 [      Arabic_teh,      Arabic_tatweel  ]       };
-    key <AC08> { [  		  k,	K		 ],
-		 [     Arabic_noon,      Arabic_comma    ]       };
-    key <AC09> { [ 		  l,	L		 ],
-		 [     Arabic_meem,         slash        ]       };
-    key <AC10> { [   	 semicolon,	colon		 ],
-		 [      Arabic_kaf,           colon      ]       };
-    key <AC11> { [ 	 quoteright,	quotedbl	 ],
-		 [      Arabic_tah,        quotedbl      ]       };
-
-    key <AB01> { [		  z,	Z		 ],
-		 [ Arabic_hamzaonyeh		         ]       };
-    key <AB02> { [ 	  	  x,	X		 ],
-		 [    Arabic_hamza,      Arabic_sukun    ]       };
-    key <AB03> { [ 		  c,	C		 ],
-		 [Arabic_hamzaonwaw,     braceleft       ]       };
-    key <AB04> { [ 		  v,	V		 ],
-		 [       Arabic_ra,      braceright      ]       };
-    key <AB05> { [ 		  b,	B		 ],
-		 [       0x100fefb,      0x100fef5       ]       };
-    key <AB06> { [ 		  n,	N		 ],
-		 [Arabic_alefmaksura, Arabic_maddaonalef ]       };
-    key <AB07> { [ 		  m,	M		 ],
-		 [    Arabic_tehmarbuta			 ]       };
-    key <AB08> { [ 	     comma,	less		 ],
-		 [      Arabic_waw,         comma        ]       };
-    key <AB09> { [ 	    period,	greater		 ],
-		 [     Arabic_zain,         period       ]       };
-    key <AB10> { [  	     slash,	question	 ],
-		 [      Arabic_zah, Arabic_question_mark ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/az	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-    name[Group1]= "Azerbaijan";
-    
-
-  key <TLDE> {   [      grave,   asciitilde ], [   dead_grave,      dead_tilde ]   };
-
-  key <AE03> {   [          3,   numbersign ], [    0x1002166,      numerosign ]   };
-  key <AE06> {   [          6,        colon ], [     EuroSign,  periodcentered ]   };
-  key <AE07> {   [          7,     question ]                                      };
-  key <AE08> {   [          8,     asterisk ], [  asciicircum, dead_circumflex ]   };
-  key <AE11> {   [      minus,   underscore ], [       hyphen,          emdash ]   };
-
-  key <AD02> {   [ udiaeresis,   Udiaeresis ]                                      };
-  key <AD04> {   [          r,            R ], [    registered                 ]   };
-  key <AD08> {   [          i,    Iabovedot ]                                      };
-  key <AD11> {   [ odiaeresis,   Odiaeresis ], [   bracketleft,      braceleft ]   };
-  key <AD12> {   [     gbreve,       Gbreve ], [  bracketright,     braceright ]   };
-
-  key <AC10> {   [   idotless,            I ]                                      };
-  key <AC11> {   [      schwa,        SCHWA ]                                      };
-
-  key <AB03> {   [          c,            C ], [     copyright,       division ]   };
-  key <AB07> {   [          m,            M ], [periodcentered,       currency ]   };
-  key <AB08> {   [   ccedilla,     Ccedilla ]                                      };
-  key <AB09> {   [   scedilla,     Scedilla ]                                      };
-  key <AB10> {   [     period,        comma ]                                      };
-  // End alphanumeric section
-
-key.type[group2]="TWO_LEVEL";
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "cyrillic" {
-    include "sun/ru"
-    name[Group1]= "Azerbaijan - Cyrillic";
-
-  key <AE02> {[ 2,                 quotedbl           ] };
-  key <AE03> {[ 3,                 numbersign         ] };
-  key <AE04> {[ 4,                 semicolon          ] };
-  key <AE06> {[ 6,                 colon              ] };
-  key <AE07> {[ 7,                 question           ] };
-  key <AE08> {[ 8,                 asterisk ],[   braceleft    ] };
-  key <AE09> {[ 9,                 parenleft ],[  bracketleft  ] };
-  key <AE10> {[ 0,                 parenright ],[ bracketright ] };
-  key <AE11> {[ minus,             underscore ],[ braceright   ] };
-
-  key <AD01> {[ Cyrillic_je,          Cyrillic_JE        ], [ q, Q ] };
-  key <AD02> {[ Cyrillic_u_straight, Cyrillic_U_straight ], [ w, W ] };
-  key <AD03> {[ Cyrillic_u,           Cyrillic_U         ], [ e, E ] };
-  key <AD04> {[ Cyrillic_ka,          Cyrillic_KA        ], [ r, R ] };
-  key <AD05> {[ Cyrillic_ie,          Cyrillic_IE        ], [ t, T ] };
-  key <AD06> {[ Cyrillic_en,          Cyrillic_EN        ], [ y, Y ] };
-  key <AD07> {[ Cyrillic_ghe,         Cyrillic_GHE       ], [ u, U ] };
-  key <AD08> {[ Cyrillic_sha,         Cyrillic_SHA       ], [ i, I ] };
-  key <AD09> {[ Cyrillic_shha,        Cyrillic_SHHA      ], [ o, O ] };
-  key <AD10> {[ Cyrillic_ze,          Cyrillic_ZE        ], [ p, P ] };
-  key <AD11> {[ Cyrillic_ha,          Cyrillic_HA        ], [ bracketleft, braceleft ] };
-  key <AD12> {[ Cyrillic_che_vertstroke, Cyrillic_CHE_vertstroke ], [ bracketright, braceright ] };
-
-  key <AC01> {[ Cyrillic_ef,       Cyrillic_EF        ], [ a, A ] };
-  key <AC02> {[ Cyrillic_yeru,     Cyrillic_YERU      ], [ s, S ] };
-  key <AC03> {[ Cyrillic_ve,       Cyrillic_VE        ], [ d, D ] };
-  key <AC04> {[ Cyrillic_a,        Cyrillic_A         ], [ f, F ] };
-  key <AC05> {[ Cyrillic_pe,       Cyrillic_PE        ], [ g, G ] };
-  key <AC06> {[ Cyrillic_er,       Cyrillic_ER        ], [ h, H ] };
-  key <AC07> {[ Cyrillic_o,        Cyrillic_O         ], [ j, J ] };
-  key <AC08> {[ Cyrillic_el,       Cyrillic_EL        ], [ k, K ] };
-  key <AC09> {[ Cyrillic_de,       Cyrillic_DE        ], [ l, L ] };
-  key <AC10> {[ Cyrillic_zhe,      Cyrillic_ZHE       ], [ semicolon, colon ] };
-  key <AC11> {[ Cyrillic_ka_vertstroke,Cyrillic_KA_vertstroke ], [ apostrophe, quotedbl ] };
-
-  key <AB01> {[ Cyrillic_schwa,    Cyrillic_SCHWA     ], [ z, Z ] };
-  key <AB02> {[ Cyrillic_che,      Cyrillic_CHE       ], [ x, X ] };
-  key <AB03> {[ Cyrillic_es,       Cyrillic_ES        ], [ c, C ] };
-  key <AB04> {[ Cyrillic_em,       Cyrillic_EM        ], [ v, V ] };
-  key <AB05> {[ Cyrillic_i,        Cyrillic_I         ], [ b, B ] };
-  key <AB06> {[ Cyrillic_te,       Cyrillic_TE        ], [ n, N ] };
-  key <AB07> {[ Cyrillic_ghe_bar,  Cyrillic_GHE_bar   ], [ m, M ] };
-  key <AB08> {[ Cyrillic_be,       Cyrillic_BE        ], [ comma, less ] };
-  key <AB09> {[ Cyrillic_o_bar,    Cyrillic_O_bar     ], [ period, greater ] };
-  key <AB10> {[ period,            comma              ], [ slash, question ] };
-
-  // End alphanumeric section
-
-key.type[group2]="TWO_LEVEL";
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-
-};
--- a/src/xorg/keytables/sun-src/symbols/sun/be	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Belgian keyboard
-
-    name[Group1]= "Belgian";
-
-    key <TLDE> {	[     twosuperior,   threesuperior 	]	};
-    key <AE01> {	[       ampersand,               1 	],
-			[             bar                  	]	};
-    key <AE02> {	[          eacute,               2	],
-			[              at 			]	};
-    key <AE03> {	[        quotedbl,               3 	],
-			[      numbersign 			]	};
-    key <AE04> {	[      apostrophe,               4 	]	};
-    key <AE05> {	[       parenleft,               5 	]	};
-    key <AE06> {	[         section,               6 	],
-			[     asciicircum 			]	};
-    key <AE07> {	[          egrave,               7	]	};
-    key <AE08> {	[          exclam,               8	]	};
-    key <AE09> {	[        ccedilla,               9	],
-			[       braceleft,       plusminus 	]	};
-    key <AE10> {	[          agrave,               0 	],
-			[      braceright,          degree	]	};
-    key <AE11> {	[      parenright,          degree 	]	};
-    key <AE12> {	[           minus,      underscore 	]	};
-    key <AD01> {	[               a,               A 	]	};
-    key <AD02> {	[               z,               Z 	]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign,            cent      ]	};
-    key <AD11> {	[ SunFA_Circum,  dead_diaeresis 	],
-			[     bracketleft			]	};
-    key <AD12> {	[          dollar,        asterisk	],
-			[    bracketright			]	};
-    key <AC01> {	[               q,               Q 	]	};
-    key <AC10> {	[               m,               M	]	};
-    key <AC11> {	[          ugrave,         percent 	],
-			[      SunFA_Acute 			]	};
-    key <BKSL> {	[              mu,        sterling 	],
-			[      SunFA_Grave			]	};
-    key <LSGT> {	[            less,         greater	],
-			[       backslash			]	};
-    key <AB01> {	[               w,               W 	]	};
-    key <AB07> {	[           comma,        question 	],
-			[    dead_cedilla			]	};
-    key <AB08> {	[       semicolon,          period 	]	};
-    key <AB09> {	[           colon,           slash 	]	};
-    key <AB10> {	[           equal,            plus	],
-			[      dead_tilde			]	};
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-  include "sun/be(basic)"
-	//a few keys are different than in the basic layout
-    key <AE09> {	[        ccedilla,               9	],
-			[       braceleft		 	]	};
-    key <AE10> {	[          agrave,               0 	],
-			[      braceright         		]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign  	                ]	};
-    key <AB07> {	[           comma,        question 	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/br	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-include "us(basic)"
-
-    key <TLDE> {        [      apostrophe,        quotedbl      ], 
-			[	  notsign			]	};
-    key <AE01> {        [               1,          exclam      ],
-                        [     onesuperior,      exclamdown      ]       };
-    key <AE02> {        [               2,              at      ],
-                        [     twosuperior,         onehalf      ]       };
-    key <AE03> {        [               3,      numbersign      ],
-                        [   threesuperior,   threequarters      ]       };
-    key <AE04> {        [               4,          dollar      ],
-                        [        sterling,      onequarter      ]       };
-    key <AE05> {        [               5,         percent      ],
-                        [            cent                       ]       };
-    key <AE06> {        [               6,  dead_diaeresis      ],
-                        [         notsign,       diaeresis      ]       };
-    key <AE07> {        [               7,       ampersand      ],
-                        [       braceleft                       ]       };
-    key <AE08> {        [               8,        asterisk      ],
-                        [     bracketleft                       ]       };
-    key <AE09> {        [               9,       parenleft      ],
-                        [    bracketright                       ]       };
-    key <AE10> {        [               0,      parenright      ],
-                        [      braceright                       ]       };
-    key <AE11> {        [           minus,      underscore      ],
-                        [       backslash                       ]       };
-    key <AE12> {        [           equal,            plus      ],
-                        [         section                       ]       };
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign                       ]       };
-    key <AD04> {        [               r,               R      ],
-                        [      registered                       ]       };
-    key <AD11> {        [      SunFA_Acute,    SunFA_Grave      ],
-                        [           acute,           grave      ]       };
-    key <AD12> {        [     bracketleft,       braceleft      ],
-                        [     ordfeminine                       ]       };
-    key <AC10> {        [        ccedilla,        Ccedilla      ], 
-			[      exclamdown			]	};
-    key <AC11> {        [      dead_tilde,    SunFA_Circum      ],
-                        [      asciitilde,     asciicircum      ]       };
-    key <AC12> {        [    bracketright,      braceright      ],
-                        [       masculine                       ]       };
-    key <AB01> {        [               z,               Z      ],
-                        [   guillemotleft 		        ]       };
-    key <AB02> {        [               x,               X      ],
-                        [  guillemotright                       ]       };
-    key <AB03> {        [               c,               C      ],
-                        [       copyright                       ]       };
-    key <AB07> {        [               m,               M      ],
-                        [              mu                       ]       };
-    key <BKSL> {        [     bracketleft,       braceleft      ], 
-			[       masculine			]	};
-    key <AB08> {        [           comma,            less      ],
-                        [        question                       ]       };
-    key <AB09> {        [          period,         greater      ],
-                        [    questiondown                       ]       };
-    key <AB10> {        [       semicolon,           colon      ]       };
-    key <AB11> {        [           slash,        question      ],
-                        [          degree,    questiondown      ]       };
-
-    key <KPPT> {        [  KP_Decimal                           ]       };
-    key <KPDL> {        [  KP_Delete,   comma                   ]       };
-
-};
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-  include "sun/br(basic)"
-    key <BKSL> {        [    bracketright,      braceright      ],
-                        [       masculine                       ]       };
-    key <LSGT> {        [   	    slash,      bar	        ],
-			[          degree                       ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/ca	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-    // A few keys are different
-
-    key <FK01> { [ Escape               ]                       };
-    key <FK02> { [ F1                   ]                       };
-    key <FK03> { [ F2                   ]                       };
-    key <FK04> { [ F3                   ]                       };
-    key <FK05> { [ F4                   ]                       };
-    key <FK06> { [ F5                   ]                       };
-    key <FK07> { [ F6                   ]                       };
-    key <FK08> { [ F7                   ]                       };
-    key <FK09> { [ F8                   ]                       };
-    key <FK10> { [ F9                   ]                       };
-    key <FK11> { [ F10                  ]                       };
-    key <FK12> { [ SunF36               ]                       };
-    key <BKSL> { [ SunF37, NoSymbol	] 			};
-    key <ESC>  { [ degree		], [ notsign	]	};
-    key <AE02> { [ 2, quotedbl		], [ at		]	};
-    key <AE06> { [ 6, question		] 			};
-    key <AE07> { [ 7, ampersand		], [ braceleft	]	};
-    key <AE08> { [ 8, asterisk		], [ bracketleft ]	};
-    key <AE09> { [ 9, parenleft		], [ bracketright ]	};
-    key <AE10> { [ 0, parenright	], [ braceright	]	};
-//    key <AD11> { [ SunFA_Circum, SunFA_Diaresis ], [ asciicircum ] };
-    key <AD12> { [ Ccedilla, NoSymbol	], [ asciitilde	]	};
-    key <LCTL> { [ Caps_Lock		]			};
-    key <AC11> { [ Egrave		]			};
-    key <TLDE> { [ Agrave, NoSymbol	], [ quoteleft 	]	};
-    key <LSGT> { [ Ugrave, NoSymbol	], [ backslash	]	};
-    key <AB08> { [ comma, quoteright	], [ less	]	};
-    key <AB09> { [ period, NoSymbol	], [ greater	]	};
-    key <AB10> { [ Eacute, NoSymbol	], [ slash	]	};
-    key <CAPS> { [ SunAltGraph		]			};
-    key <COMP> { [ SunCompose		]			};
-    key <ALGR> { [ Control_R		]			};
- 
-};
-
-xkb_symbols "type5" {
-
-    key <TLDE> { [ slash, backslash	], [ bar			]};
-    key <AE01> { [ 1, exclam		], [ plusminus			]};
-    key <AE02> { [ 2, at		]				};
-    key <AE03> { [ 3, numbersign	], [ sterling			]};
-    key <AE04> { [ 4, dollar		], [ cent			]};
-    key <AE05> { [ 5, percent		], [ currency			]};
-    key <AE06> { [ 6, question		]				};
-    key <AE07> { [ 7, ampersand		], [ braceleft ]		};
-    key <AE08> { [ 8, asterisk		], [ braceright ]		};
-    key <AE09> { [ 9, parenleft		], [ bracketleft		]};
-    key <AE10> { [ 0, parenright	], [ bracketright		]};
-    key <AE11> { [ minus, underscore	]				};
-    key <AE12> { [ equal, plus		], [ notsign			]};
-    
-    key <AD10> { [ p, P			], [ paragraph			]};
-    key <AD11> { [ SunFA_Circum, SunFA_Diaeresis], [ SunFA_Grave	]};
-    key <AD12> { [ ccedilla, Ccedilla	], [ asciitilde			]};
-
-    key <AC10> { [ semicolon, colon	], [ degree			]};
-    key <AC11> { [ Egrave		]				};
-    key <BKSL> { [ Agrave		]				};
-
-    key <LSGT> { [ Uacute		]				};
-    key <AB01> { [ z, Z			], [ guillemotleft		]};
-    key <AB02> { [ x, X			], [ guillemotright		]};
-    key <AB07> { [ m, M			], [ mu				]};
-    key <AB08> { [ comma, quoteright	], [ less			]};
-    key <AB09> { [ period, quotedbl	], [ greater			]};
-    key <AB10> { [ eacute, Eacute	], [ quoteleft			]};
-    
-};
-
-xkb_symbols "type5tbits5"
-{
-    include "sun/ca(type5)"
-    
-    key <LSGT> { [ Ugrave		]				};
-    key <SPCE> { [ space, space		], [ nobreakspace		]};
-};
-
-xkb_symbols "x86"
-{
-    include "ca"
-    
-    key <ALGR> { [ Mode_switch		]				};
-    key <RALT> { [ Alt_R		]				};
-    key <RCTL> { [ Control_R		]				};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/ca_bi	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-    // A few keys are different
-
-    key <FK01> { [ Escape               ]                       };
-    key <FK02> { [ F1                   ]                       };
-    key <FK03> { [ F2                   ]                       };
-    key <FK04> { [ F3                   ]                       };
-    key <FK05> { [ F4                   ]                       };
-    key <FK06> { [ F5                   ]                       };
-    key <FK07> { [ F6                   ]                       };
-    key <FK08> { [ F7                   ]                       };
-    key <FK09> { [ F8                   ]                       };
-    key <FK10> { [ F9                   ]                       };
-    key <FK11> { [ F10                  ]                       };
-    key <FK12> { [ SunF36               ]                       };
-    key <BKSL> { [ SunF37, NoSymbol	] 			};
-    key <ESC>  { [ degree		], [ notsign	]	};
-    key <AE02> { [ 2, quotedbl		], [ at		]	};
-    key <AE06> { [ 6, question		] 			};
-    key <AE07> { [ 7, ampersand		], [ braceleft	]	};
-    key <AE08> { [ 8, asterisk		], [ bracketleft ]	};
-    key <AE09> { [ 9, parenleft		], [ bracketright ]	};
-    key <AE10> { [ 0, parenright	], [ braceright	]	};
-//    key <AD11> { [ SunFA_Circum, SunFA_Diaresis ], [ asciicircum ] };
-    key <AD12> { [ Ccedilla, NoSymbol	], [ asciitilde	]	};
-    key <LCTL> { [ Caps_Lock		]			};
-    key <AC11> { [ Egrave		]			};
-    key <TLDE> { [ Agrave, NoSymbol	], [ quoteleft 	]	};
-    key <LSGT> { [ Ugrave, NoSymbol	], [ backslash	]	};
-    key <AB08> { [ comma, quoteright	], [ less	]	};
-    key <AB09> { [ period, NoSymbol	], [ greater	]	};
-    key <AB10> { [ Eacute, NoSymbol	], [ slash	]	};
-    key <CAPS> { [ SunAltGraph		]			};
-    key <COMP> { [ SunCompose		]			};
-    key <ALGR> { [ Control_R		]			};
- 
-};
-
-xkb_symbols "type5" {
-
-    key <TLDE> { [ slash, backslash	], [ bar			]};
-    key <AE01> { [ 1, exclam		], [ plusminus			]};
-    key <AE02> { [ 2, at		]				};
-    key <AE03> { [ 3, numbersign	], [ sterling			]};
-    key <AE04> { [ 4, dollar		], [ cent			]};
-    key <AE05> { [ 5, percent		], [ currency			]};
-    key <AE06> { [ 6, question		]				};
-    key <AE07> { [ 7, ampersand		], [ braceleft ]		};
-    key <AE08> { [ 8, asterisk		], [ braceright ]		};
-    key <AE09> { [ 9, parenleft		], [ bracketleft		]};
-    key <AE10> { [ 0, parenright	], [ bracketright		]};
-    key <AE11> { [ minus, underscore	]				};
-    key <AE12> { [ equal, plus		], [ notsign			]};
-    
-    key <AD10> { [ p, P			], [ paragraph			]};
-    key <AD11> { [ SunFA_Circum, SunFA_Diaeresis], [ SunFA_Grave	]};
-    key <AD12> { [ ccedilla, Ccedilla	], [ asciitilde			]};
-
-    key <AC10> { [ semicolon, colon	], [ degree			]};
-    key <AC11> { [ Egrave		]				};
-    key <BKSL> { [ Agrave		]				};
-
-    key <LSGT> { [ Uacute		]				};
-    key <AB01> { [ z, Z			], [ guillemotleft		]};
-    key <AB02> { [ x, X			], [ guillemotright		]};
-    key <AB07> { [ m, M			], [ mu				]};
-    key <AB08> { [ comma, quoteright	], [ less			]};
-    key <AB09> { [ period, quotedbl	], [ greater			]};
-    key <AB10> { [ eacute, Eacute	], [ quoteleft			]};
-    
-};
-
-
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-
-   key <TLDE> { [ slash, bar           ], [ backslash                  ]};
-   key <AE01> { [ 1, exclam            ], [ plusminus                  ]};
-   key <AE02> { [ 2, at                ]                                };
-   key <AE03> { [ 3, numbersign        ], [ sterling                   ]};
-   key <AE04> { [ 4, dollar            ], [ cent                       ]};
-   key <AE05> { [ 5, percent           ], [ currency                   ]};
-   key <AE06> { [ 6, question 	       ], [ notsign	               ]};
-   key <AE07> { [ 7, ampersand         ], [ braceleft                  ]};
-   key <AE08> { [ 8, asterisk          ], [ braceright                 ]};
-   key <AE09> { [ 9, parenleft         ], [ bracketleft                ]};
-   key <AE10> { [ 0, parenright        ], [ bracketright               ]};
-   key <AE11> { [ minus, underscore    ], [ onehalf	               ]};
-   key <AE12> { [ equal, plus          ], [ notsign                    ]};
-  
-   key <AD03> { [ e, E                 ], [ EuroSign		       ]};
-   key <AD09> { [ o, O		       ], [ section		       ]};
-   key <AD10> { [ p, P                 ], [ paragraph                  ]};
-   key <AD11> { [ SunFA_Circum, SunFA_Diaeresis], [ SunFA_Grave        ]};
-   key <AD12> { [ ccedilla, Ccedilla   ], [ asciitilde                 ]};
-
-   key <AC10> { [ semicolon, colon     ], [ degree                     ]};
-   key <AC11> { [ egrave, Egrave       ], [ braceleft                  ]};
-   key <AC12> { [ agrave, Agrave       ], [ braceright                 ]};
-   key <BKSL> { [ agrave, Agrave       ], [ braceright                 ]};
-
-   key <LSGT> { [ uacute, Uacute       ]                                };
-   key <AB01> { [ z, Z                 ], [ guillemotleft              ]};
-   key <AB02> { [ x, X                 ], [ guillemotright             ]};
-   key <AB07> { [ m, M                 ], [ mu                         ]};
-   key <AB08> { [ comma, quoteright    ], [ less                       ]};
-   key <AB09> { [ period, quotedbl     ], [ greater                    ]};
-   key <AB10> { [ eacute, Eacute       ], [ quoteleft                  ]};
-   
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/cs	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
- 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type5" {
-    include "sun/us(type5)"
-    include "cz"
- 
-    // A few keys are different
-     
- 
-    key <TLDE> { [ quoteleft, asciitilde        ]                       };
-//     key <AE02> { [ ecaron, 2         ], [ at                 ]       };
-//     key <AE03> { [ scaron, 3         ], [ numbersign         ]       };
-//     key <AE04> { [ ccaron, 4         ], [ dollar             ]       };
-//     key <AE05> { [ rcaron, 5         ], [ percent            ]       };
-//     key <AE06> { [ zcaron, 6         ], [ asciicircum        ]       };
-//     key <AE07> { [ yacute, 7         ], [ ampersand          ]       };
-//     key <AE08> { [ aacute, 8         ], [ asterisk           ]       };
-    key <AE09> { [ iacute, 9            ], [ braceleft          ]       };
-    key <AE10> { [ eacute, 0            ], [ braceright         ]       };
- 
-    key <AD03> { [ e, E                 ]                               };
-    key <AD11> { [ uacute, slash        ], [ bracketleft                ] };
-    key <AD12> { [ parenright, parenleft], [ bracketright               ] };
-     
-    key <AC02> { [ s, S                 ], [ ssharp, ssharp             ] };
-    key <BKSL> { [ SunFA_Diaeresis, backslash   ]                         };
- 
-    key <LSGT> { [ backslash, bar               ]                       };
-     
-};
--- a/src/xorg/keytables/sun-src/symbols/sun/cz	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type5" {
-    include "sun/us(type5)"
-    include "cz"
- 
-    // A few keys are different
-     
- 
-    key <TLDE> { [ quoteleft, asciitilde        ]                       };
-//     key <AE02> { [ ecaron, 2         ], [ at                 ]       };
-//     key <AE03> { [ scaron, 3         ], [ numbersign         ]       };
-//     key <AE04> { [ ccaron, 4         ], [ dollar             ]       };
-//     key <AE05> { [ rcaron, 5         ], [ percent            ]       };
-//     key <AE06> { [ zcaron, 6         ], [ asciicircum        ]       };
-//     key <AE07> { [ yacute, 7         ], [ ampersand          ]       };
-//     key <AE08> { [ aacute, 8         ], [ asterisk           ]       };
-    key <AE09> { [ iacute, 9            ], [ braceleft          ]       };
-    key <AE10> { [ eacute, 0            ], [ braceright         ]       };
- 
-    key <AD03> { [ e, E                 ]                               };
-    key <AD06> { [ dcaron, d         ,D            ]                   };
-    key <AD11> { [ uacute, slash        ], [ bracketleft                ] };
-    key <AD12> { [ parenright, parenleft], [ bracketright               ] };
-     
-    key <AC02> { [ s, S                 ], [ ssharp, ssharp             ] };
-    key <BKSL> { [ SunFA_Diaeresis, backslash   ]                         };
- 
-    key <LSGT> { [ backslash, bar               ]                       };
-     
-};
-
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-
-    key <TLDE>	{ [ semicolon, dead_abovering 	],
-		  [ quoteleft,     asciitilde   ]	};
-    key <AE01>	{ [      plus,          1 	],  
-		  [    exclam,     asciitilde 	]	};
-    key <AE02>	{ [    ecaron,          2 	],  
-		  [        at,     dead_caron 	]	};
-    key <AE03>	{ [    scaron,          3 	],  
-		  [ numbersign,  SunFA_Circum 	] 	};
-    key <AE04>	{ [    ccaron,          4 	],  
-		  [    dollar,     dead_breve 	]	};
-    key <AE05>	{ [    rcaron,          5 	],  
-		  [   percent, dead_abovering 	] 	};
-    key <AE06>	{ [    zcaron,          6 	],  
-		  [ asciicircum,  dead_ogonek 	]	};
-    key <AE07>	{ [    yacute,          7 	],  
-		  [ ampersand,          grave 	]	};
-    key <AE08>	{ [    aacute,          8 	],  
-		  [  asterisk,  dead_abovedot	]	};
-    key <AE09>	{ [    iacute,          9 	],  
-		  [ parenleft,    SunFA_Acute 	]	};
-    key <AE10>	{ [    eacute,          0 	],  
-		  [ parenright, dead_doubleacute] 	};
-    key <AE11>	{ [     equal,    percent 	],  
-		  [ dead_diaeresis, backslash 	]	};
-    key <AE12>	{ [ SunFA_Acute, dead_caron 	], 
-		  [ dead_cedilla, minus 	]	};
-    key <AD01>	{ [         q,          Q 	], 
-		  [  backslash 			]	};
-    key <AD02>	{ [         w,          W 	], 
-		  [       bar 			]	};
-    key <AD03>	{ [         e,          E 	], 
-		  [    EuroSign 		]	};
-    key <AD06>	{ [         z,          Z 	]	};
-    key <AD11>	{ [    uacute,      slash 	], 
-		  [    division 		]	};
-    key <AD12>	{ [parenright,  parenleft 	], 
-		  [    multiply 		]	};
-    key <AC02>	{ [         s,          S 	], 
-		  [   dstroke			]	};
-    key <AC03>	{ [         d,          D 	], 
-		  [     Dstroke 		]	};
-    key <AC04>	{ [         f,          F 	], 
-		  [ bracketleft 		]	};
-    key <AC05>	{ [         g,          G 	], 
-		  [ bracketright 		]	};
-    key <AC08>	{ [         k,          K 	], 
-		  [      lstroke 		]	};
-    key <AC09>	{ [         l,          L 	], 
-		  [      Lstroke 		]	};              
-    key <AC10>	{ [      uring,       quotedbl 	], 
-		  [     dollar 			]	};
-    key <AC11>	{ [    section,         exclam 	], 
-		  [     ssharp,       currency	]	};
-    key <BKSL>	{ [ dead_diaeresis, apostrophe 	], 
-		  [  backslash,            bar	]	};
-    key <LSGT>	{ [  backslash,       asterisk 	], 
-		  [      slash,	     brokenbar	]	};
-    key <AB01>	{ [          y,          Y 	], 
-		  [       less	 		]	};
-    key <AB02>	{ [          x,          X 	], 
-		  [    greater,     numbersign 	]	};
-    key <AB04>	{ [          v,          V 	], 
-		  [         at 			]	};
-    key <AB05>	{ [          b,          B 	],
-		  [  braceleft 			]	};
-    key <AB06>	{ [          n,          N 	],
-		  [ braceright	 		]	};
-    key <AB08>	{ [      comma,       question 	],
-		  [ 	  less			]	};
-    key <AB09>	{ [     period,          colon 	],
-		  [    greater			]	};
-    key <AB10>	{ [      minus,     underscore 	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/de	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-    // A few keys are different
-    key <BKSL> { [ less, braceleft      ]                       };
-
-    key <BRCR> { [ greater, braceright  ]                       };
-    key <DELE> { [ Delete               ]                       };
-
-    key <AE01> { [ 1, plus              ], [exclam      ]       };
-    key <AE02> { [ 2, quotedbl          ], [at          ]       };
-    key <AE03> { [ 3, asterisk          ], [numbersign  ]       };
-    key <AE04> { [ 4, ccedilla          ], [cent        ]       };
-    key <AE05> { [ 5, percent           ], [asciitilde  ]       };
-    key <AE06> { [ 6, ampersand         ], [section     ]       };
-    key <AE07> { [ 7, slash             ], [bar         ]       };
-    key <AE08> { [ 8, parenleft         ], [degree      ]       };
-    key <AE09> { [ 9, parenright        ], [backslash   ]       };
-    key <AE10> { [ 0, equal             ], [asciicircum ]       };
-    Key <AE11> { [ quoteright, question ], [quoteleft   ]       };
-    key <AE12> { [ SunFA_Circum, SunFA_Grave    ]               };
-    key <AD03> { [ e, E                 ], [EuroSign    ]       };
-    key <AD06> { [ Z                    ]                       };
-    key <AD11> { [ udiaeresis, egrave   ]                       };
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ]               };
-    key <AC10> { [ odiaeresis, eacute   ]                       };
-    key <AC11> { [ adiaeresis, agrave   ]                       };
-    key <TLDE> { [ dollar, SunFA_Tilde  ], [sterling    ]       };
-    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
-    key <AB01> { [ Y                    ]                       };
-    key <AB07> { [ M, NoSymbol          ], [mu  ]               };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    key <COMP> { [ SunAltGraph          ]                       };
-    key <ALGR> { [ SunCompose           ]                       };
-};
-
-
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-
-    key <TLDE> {	[ asciicircum,	degree		]	};
-
-
-    key <AE02> {        [               2,        quotedbl      ],
-			[	twosuperior			]	};
-    key <AE03> {	[		3,	section		],
-			[	threesuperior			]	};
-    key <AE04> {	[		4,	dollar		]	};
-    key <AE06> { 	[               6,    ampersand         ], 
-			[         section     			]       };
-    key <AE07> {	[	  	7,	slash		],
-			[ 	braceleft			]	};
-    key <AE08> {	[	  	8,	parenleft	],
-			[ 	bracketleft			]	};
-    key <AE09> {	[	  	9,	parenright	],
-			[ 	bracketright			]	};
-    key <AE10> {	[	  	0,	equal		],
-			[ 	braceright			]	};
-    key <AE11> {	[	   ssharp,	question	],
-			[ 	backslash			]	};
-    key <AE12> {	[     SunFA_Acute,	SunFA_Grave	]	};
-    key <AD01> {	[		q,	Q		],
-			[	at				]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign			]       };
-    key <AD06> {        [               z,               Z      ]	};
-    key <AD11> {	[      udiaeresis,	Udiaeresis	]	};
-    key <AD12> {	[      	     plus,	asterisk	],
-			[       asciitilde			]	};
-    key <AC10> {	[ 	odiaeresis,	Odiaeresis	]	};
-    key <AC11> {	[ 	adiaeresis,	Adiaeresis	]	};
-
-    key <AB01> {        [               y,               Y      ]       };
-    key <AB07> {	[		m,	M		],
-			[		mu			]	};
-    key <AB08> {        [           comma,       semicolon      ]       };
-    key <AB09> {        [          period,           colon      ]       };
-    key <AB10> {        [           minus,      underscore      ]       };
-    key <BKSL> {	[      numbersign,      apostrophe	],
-			[	grave				]	};
-    key <LSGT> {	[            less,       greater  	],
-			[	bar				]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/de_CH	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-
-    key <TLDE> { [ section, degree	]	};
-    key <AE01> { [ 1, plus		],
-		 [ bar			]	};
-    key <AE02> { [ 2, quotedbl		],
-		 [ at			]	};
-    key <AE03> { [ 3, asterisk		],
-		 [ numbersign		]	};
-    key <AE04> { [ 4, ccedilla		],
-		 [ asciicircum		]	};
-    key <AE05> { [ 5, percent		],
-		 [ asciitilde		]	};
-    key <AE06> { [ 6, ampersand		]	};
-    key <AE07> { [ 7, slash		]	};
-    key <AE08> { [ 8, parenleft		]	};
-    key <AE09> { [ 9, parenright	]	};
-    key <AE10> { [ 0, equal		],
-		 [ quoteleft		]	};
-    Key <AE11> { [ quoteright, question ],
-		 [ SunFA_Acute		]	};
-    key <AE12> { [ SunFA_Circum, SunFA_Grave ],
-		 [ SunFA_Tilde		]	};
-    key <AD03> { [ e, E			], 
-		 [ EuroSign		]	};
-    key <AD06> { [ z, Z			]	};
-    key <AD11> { [ udiaeresis, egrave	],
-		 [ bracketleft		]	};
-    key <AD12> { [ SunFA_Diaeresis, exclam ],
-		 [ bracketright		]	};
-    key <AC10> { [ odiaeresis, eacute	]	};
-    key <AC11> { [ adiaeresis, agrave	],
-		 [ braceleft		]	};
-    key <BKSL> { [ dollar, sterling	],
-		 [ braceright		]	};
-    key <LSGT> { [ less, greater	],
-		 [ backslash		]	};
-    key <AB01> { [ y, Y			]	};
-    key <AB08> { [ comma, semicolon	]	};
-    key <AB09> { [ period, colon	]	};
-    key <AB10> { [ minus, underscore	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/dk	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-    // A few keys are different
-   key <BKSL> { [ onehalf, section	]                       };
-   key <BRCR> { [ asciitilde, asciicircum	 ] 		};
-   key <AE02> { [ 2, quotedbl		], [ at		]	};
-   key <AE03> { [ 3, numbersign		], [ sterling	]	};
-   key <AE04> { [ 4, currency		], [ dollar	]	};
-   key <AE06> { [ 6, ampersand		] 			};
-   key <AE07> { [ 7, slash		], [ braceleft	]	};
-   key <AE08> { [ 8, parenleft		], [ bracketleft]	};
-   key <AE09> { [ 9, parenright		], [ bracketright] 	};
-   key <AE10> { [ 0, equal		], [ braceright	]	};
-   key <AE11> { [ plus, question	]			};
-   key <AE12> { [ SunFA_Acute, SunFA_Grave], [ bar	]	};
-   key <AD03> { [ e, E			], [ EuroSign	]	};
-   key <AD11> { [ Aring			]			};
-   key <AD12> { [ SunFA_Diaeresis, SunFA_Circum], [SunFA_Tilde] };
-   key <LCTL> { [ Caps_Lock		]			};
-   key <AC10> { [ AE			]			};
-   key <AC11> { [ Ooblique		]			};
-   key <TLDE> { [ quoteright, asterisk	], [ quoteleft	]	};
-   key <LSGT> { [ less, greater		], [ backslash  ]	};
-   key <AB08> { [ comma, semicolon	]			};
-   key <AB09> { [ period, colon		]			};
-   key <AB10> { [ minus, underscore	]			};
-   key <CAPS> { [ Control_L		]			};
-   key <COMP> { [ SunAltGraph		]			};
-   key <ALGR> { [ SunCompose		]			};
-
-
-};
-
-xkb_symbols "type5" {
-   include "sun/dk(type4)"
-
-    key <AE05> { [ 5, percent		], [asciitilde			]};
-    key <AE06> { [ 6, ampersand		], [asciicircum			]};
-    key <AE07> { [ 7, slash		], [ braceleft			]};
-    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
-    key <AE09> { [ 9, parenright	], [ bracketright		]};
-    key <AE10> { [ 0, equal		], [ braceright			]};
-    key <BKSL> { [ quoteright, asterisk	], [ quoteleft			]};
-  
-};
-
-
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-
-    key <TLDE> {	[         onehalf,         section      ]	};
-    key <AE02> {	[               2,        quotedbl  	],
-			[	       at			]	};
-    key <AE03> {	[              	3,	numbersign	],
-			[	 sterling			]	};
-    key <AE04> {	[               4,        currency     	],
-			[	   dollar			]	};
-    key <AE05> {	[               5,         percent     	],
-			[        asciitilde			]	};
-    key <AE06> {	[               6,       ampersand     	],
-			[      asciicircum			]	};
-    key <AE07> {	[               7,           slash     	],
-			[       braceleft			]	};
-    key <AE08> {	[               8,       parenleft     	],
-			[     bracketleft			]	};
-    key <AE09> {	[               9,      parenright     	],
-			[    bracketright			]	};
-    key <AE10> {	[               0,           equal     	],
-                        [      braceright			]	};
-    key <AE11> {	[            plus,        question      ]	};
-    key <AE12> {   	[     SunFA_Acute,      SunFA_Grave     ],
-                 	[             bar		        ]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign		        ]	};
-    key <AD11> {	[	    aring,           Aring 	]	};
-    key <AD12> {   	[ SunFA_Diaeresis,    SunFA_Circum      ],
-                 	[      SunFA_Tilde			]	};
-    key <BKSL> {	[      apostrophe,      asterisk	],
-			[	grave				]	};
-    key	<AC10> {	[	       ae,	        AE	]	};
-    key <AC11> {	[	   oslash,        Ooblique 	]	};
-    key <AB08> {        [	    comma,	semicolon	]       };
-    key <AB09> {        [	    period,	colon		]       };
-    key <AB10> {        [	     minus,	underscore      ]       };
-    key <LSGT> {	[	      less,	greater  	],
-			[	 backslash			]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/es	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
- 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-xkb_symbols "type4" {
-    key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft    ] };
-    key <BRCR> { [ bracketright, braceright ], [ guillemotright ] };
-    key <AE02> { [ 2, quotedbl          ], [ at                 ] };
-    key <AE03> { [ 3, periodcentered    ], [ numbersign       ] };
-    key <AE05> { [ 5, percent           ], [ degree           ] };
-    key <AE06> { [ 6, ampersand         ], [ notsign          ] };
-    key <AE07> { [ 7, slash             ]                       };
-    key <AE08> { [ 8, parenleft         ]                       };
-    key <AE09> { [ 9, parenright        ], [ backslash        ] };
-    key <AE10> { [ 0, equal             ], [ bar              ] };
-    key <AE11> { [ quoteright, question ], [ quoteleft        ] };
-    key <AE12> { [ exclamdown, questiondown ] };
-    key <AD03> { [ e, E                 ], [ EuroSign         ] };
-    key <AD09> { [ o, O                 ], [ masculine        ] };
-    key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ asciicircum ] };
-    key <AD12> { [ plus, asterisk       ], [ asciitilde       ] };
-    key <AC01> { [ a, A                 ], [ ordfeminine      ] };
-    key <AC10> { [ Ntilde               ]                       };
-    key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ]                       };
-    key <TLDE> { [ Ccedilla             ]                       };
-    key <RALT> { [ Alt_R                ]                       };
-    key <LCTL> { [ Caps_Lock ] };
-    key <CAPS> { [ Control_L ] };
-    key <LSGT> { [ less, greater        ]                       };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-};
- 
-
-xkb_symbols "type5" {
-    include "sun/es(type4)"
- 
-    key <AE03> { [ 3, periodcentered    ], [ numbersign                 ] };
-    key <AE04> { [ 4, dollar            ], [ asciicircum                ] };
-    key <AE05> { [ 5, percent           ], [ asciitilde                 ] };
-    key <AE07> { [ 7, slash             ], [ braceleft                  ]};
-    key <AE08> { [ 8, parenleft         ], [ bracketleft                ]};
-    key <AE09> { [ 9, parenright        ], [ bracketright               ]};
-    key <AE10> { [ 0, equal             ], [ braceright                 ]};
-    key <AE11> { [ quoteright, question ], [ quoteleft                  ] };
- 
-    key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ bracketleft           ] };
- 
-    key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ], [ braceleft          ] };
-};
- 
-
-xkb_symbols "type6" {
-     include "sun/us(type6)"
-
-
-    key <TLDE> {        [       masculine,     ordfeminine      ],
-                        [       backslash			]       };
-    key <LSGT> {        [            less,         greater      ],
-                        [             bar,       brokenbar      ]       };
-    key <AE01> {        [               1,      exclam          ],
-                        [             bar			]       };
-    key <AE02> {        [               2,        quotedbl      ],
-                        [              at			]       };
-    key <AE03> {        [               3,  periodcentered      ],
-                        [      numbersign			]       };
-    key <AE04> {        [               4,          dollar      ],
-                        [     asciicircum			]       };
-    key <AE05> { 	[ 		5,	   percent	], 
-			[      asciitilde			]	};
-    key <AE06> {        [               6,       ampersand      ],
-                        [         notsign			]       };
-    key <AE07> {        [               7,           slash      ]       };
-    key <AE08> {        [               8,       parenleft      ]       };
-    key <AE09> {        [               9,      parenright      ]       }; 
-    key <AE10> {        [               0,           equal      ]       };
-    key <AE11> {        [      apostrophe,        question      ],
-			[	    grave			]       };
-    key <AE12> {        [      exclamdown,    questiondown      ]       };
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign			]       };
-    key <AD11> {        [     SunFA_Grave,    SunFA_Circum      ],
-                        [     bracketleft			]       };
-    key <AD12> {        [            plus,        asterisk      ],
-                        [    bracketright			]       };
-    key <AC10> {        [          ntilde,          Ntilde      ]       };
-    key <AC11> {        [     SunFA_Acute, SunFA_Diaeresis      ],
-                        [       braceleft			]       };
-    key <BKSL> {        [        ccedilla,        Ccedilla      ],
-                        [      braceright			]       };
-    key <AB08> {        [           comma,       semicolon      ]       };
-    key <AB09> {        [          period,           colon      ]       };
-    key <AB10> {        [           minus,      underscore      ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/fi	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
- 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "basic" {
-    include "fi"
-    // A few keys are different
-    key <AE11> {        [            plus,        question      ],
-                        [       backslash                       ]       };
-    key <AD12> {        [       diaeresis,     asciicircum      ],
-                        [      asciitilde                       ]       };
-    key <BKSL> {        [      apostrophe,        asterisk      ],
-                        [       quoteleft                       ]       };
-};
-
-
-xkb_symbols "type6" {
-     include "sun/us(type6)"
-
-    key <TLDE> {        [         section,         onehalf      ]	};
-    key <AE02> {        [               2,        quotedbl      ],
-                        [              at		        ]	};
-    key <AE03> {        [               3,      numbersign      ],
-                        [        sterling		        ]	};
-    key <AE04> {        [               4,        currency      ],
-                        [          dollar		        ]	};
-    key <AE06> {        [               6,       ampersand      ]	};
-    key <AE07> {        [               7,           slash      ],
-                        [       braceleft			]	};
-    key <AE08> {        [               8,       parenleft      ],
-                        [     bracketleft			]	};
-    key <AE09> {        [               9,      parenright      ],
-                        [    bracketright			]	};
-    key <AE10> {        [               0,           equal      ],
-                        [      braceright			]	};
-    key <AE11> {        [            plus,        question      ],
-                        [       backslash			]	};
-    key <AE12> {        [      SunFA_Acute,      SunFA_Grave    ]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign			]       };
-    key <AD11> {	[	    aring,	Aring		]	};
-    key <AD12> {        [  SunFA_Diaeresis,     asciicircum     ],
-                        [      asciitilde    			]	};
-    key <AC10> {	[ 	odiaeresis,	Odiaeresis	]	};
-    key <AC11> {	[ 	adiaeresis,	Adiaeresis	]	};
-    key <BKSL> {	[      apostrophe,      asterisk	],
-			[	quoteleft			]	};
-    key <AB08> {        [	     comma,	semicolon	]       };
-    key <AB09> {        [	    period,	colon		]       };
-    key <AB10> {        [	     minus,	underscore      ]       };
-    key <LSGT> {	[	      less,	greater  	],
-			[	       bar			]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/fi_bk	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,145 +0,0 @@
-// $Xorg: fi,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/fi,v 3.9 2002/12/19 01:07:54 dawes Exp$
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-
-partial alphanumeric_keys
- xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a Finnish keyboard with dead key support
-    // and all of ISO-8859-1 and ISO-8859-15 characters available.
-
-    name[Group1]= "Finnish";
-
-    key <TLDE> {        [         section,         onehalf      ],
-                        [      onequarter,   threequarters      ]};
-    key <LSGT> {        [            less,         greater      ],
-                        [             bar,       brokenbar      ]};
-    // AltGr+<SPCE> is pressed accidentally too often after AltGr+<LSGT>,
-    // hence AltGr+<SPCE> produces now space, not nobreakspace.
-    key <SPCE> {        [           space,           space      ],
-                        [           space,    nobreakspace      ]};
-    key <AE01> {        [               1,          exclam      ],
-                        [      exclamdown,     onesuperior      ]};
-    key <AE02> {        [               2,        quotedbl      ],
-                        [              at,     twosuperior      ]};
-    key <AE03> {        [               3,      numbersign      ],
-                        [        sterling,   threesuperior      ]};
-    key <AE04> {        [               4,        currency      ],
-                        [          dollar,            cent      ]};
-    key <AE05> {        [               5,         percent      ],
-                        [        EuroSign,       masculine      ]};
-    key <AE06> {        [               6,       ampersand      ],
-                        [             yen,     ordfeminine      ]};
-    key <AE07> {        [               7,           slash      ],
-                        [       braceleft,       plusminus      ]};
-    key <AE08> {        [               8,       parenleft      ],
-                        [     bracketleft,   guillemotleft      ]};
-    key <AE09> {        [               9,      parenright      ],
-                        [    bracketright,  guillemotright      ]};
-    key <AE10> {        [               0,           equal      ],
-                        [      braceright,          degree      ]};
-    key <AB08> {        [           comma,       semicolon      ],
-                        [    dead_cedilla,     dead_ogonek      ]};
-    key <AB09> {        [          period,           colon      ],
-                        [  periodcentered,         notsign      ]};
-    key <AB01> {        [               z,               Z      ],
-                        [          zcaron,          Zcaron      ]};
-    key <AB02> {        [               x,               X      ],
-                        [        multiply,        division      ]};
-    key <AB03> {        [               c,               C      ],
-                        [       copyright,            cent      ]};
-    key <AB05> {        [               b,               B      ],
-                        [          ssharp,        NoSymbol      ]};
-    key <AB06> {        [               n,               N      ],
-                        [          ntilde,          Ntilde      ]};
-    key <AB07> {        [               m,               M      ],
-                        [              mu,        NoSymbol      ]};
-    key <AB10> {        [           minus,      underscore      ],
-                        [          hyphen,          macron      ]};
-    key <AC02> {        [               s,               S      ],
-                        [          scaron,          Scaron      ]};
-    key <AC03> {        [               d,               D      ],
-                        [             eth,             ETH      ]};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign,            cent      ]};
-    key <AD04> {        [               r,               R      ],
-                        [      registered,        NoSymbol      ]};
-    key <AD05> {        [               t,               T      ],
-                        [           thorn,           THORN      ]};
-    key <AD10> {        [               p,               P      ],
-                        [       paragraph,        NoSymbol      ]};
-    key <AC10> {        [      odiaeresis,      Odiaeresis      ],
-                        [          oslash,        Ooblique      ]};
-    key <AE11> {        [            plus,        question      ],
-                        [       backslash,    questiondown      ]};
-    key <AC11> {        [      adiaeresis,      Adiaeresis      ],
-                        [              ae,              AE      ]};
-    key <BKSL> {        [      apostrophe,        asterisk      ],
-                        [        NoSymbol,        NoSymbol      ]};
-    key <AD11> {        [           aring,           Aring      ],
-                        [              oe,              OE      ]};
-    key <AE12> {        [      dead_acute,      dead_grave      ],
-                        [        NoSymbol,        NoSymbol      ]};
-    key <AD12> {        [  dead_diaeresis, dead_circumflex      ],
-                        [      dead_tilde,      dead_caron      ]};
-
-    // End alphanumeric section, begin "Keypad"
-    key <KPDL> {        [  KP_Delete,   KP_Separator    ]       };
-    // End "Keypad" section
-
-    // Begin modifier mappings
-
-    modifier_map Shift          { Shift_L };
-    modifier_map Lock           { Caps_Lock };
-    modifier_map Control        { Control_L };
-    modifier_map Mod3           { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    include "fi(basic)"         // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "fi(Sundeadkeys)"   // for consistent naming
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    // Modifies the basic Finnish layout to eliminate all dead keys
-
-    include "fi(basic)"         // for consistent naming
-
-    key <AB08> {        [           comma,       semicolon      ],
-                        [         cedilla,          ogonek      ]};
-    key <AE12> {        [           acute,           grave      ],
-                        [        NoSymbol,        NoSymbol      ]};
-    key <AD12> {        [       diaeresis,     asciicircum      ],
-                        [      asciitilde,           caron      ]};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/fr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple French keybaord
-
-    name[Group1]= "French";
-    key <TLDE> {        [     twosuperior                       ]       };
-    key <AE01> {        [       ampersand,               1      ]	};
-    key <AE02> {        [          eacute,               2      ],
-                        [      asciitilde			]       };
-    key <AE03> {        [        quotedbl,               3      ],
-                        [      numbersign		        ]       };
-    key <AE04> {        [      apostrophe,               4      ],
-                        [       braceleft			]       };
-    key <AE05> {        [       parenleft,               5      ],
-                        [     bracketleft			]       };
-    key <AE06> {        [           minus,               6      ],
-                        [             bar			]       };
-    key <AE07> {        [          egrave,               7      ],
-                        [           grave			]       };
-    key <AE08> {        [      underscore,               8      ],
-                        [       backslash			]       };
-    key <AE09> {        [        ccedilla,               9      ],
-                        [     asciicircum			]       };
-    key <AE10> {        [          agrave,               0      ],
-                        [              at			]       };
-    key <AE11> {        [      parenright,          degree      ],
-                        [    bracketright			]       };
-    key <AE12> {        [           equal,            plus      ],
-                        [      braceright			]       };
-    key <AD01> {        [               a,               A      ]	};
-    key <AD02> {        [               z,               Z      ]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign			]       };
-    key <AD11> {        [    SunFA_Circum, SunFA_Diaeresis      ]       };
-    key <AD12> {        [          dollar,        sterling      ],
-                        [        currency			]       };
-    key <AC01> {        [               q,               Q      ]	};
-    key <AC10> {        [               m,               M      ]	};
-    key <AC11> {        [          ugrave,         percent      ]       };
-    key <LSGT> {        [            less,         greater      ]	};
-    key <AB01> {        [               w,               W      ]	};
-    key <AB07> {        [           comma,        question      ]	};
-    key <AB08> {        [       semicolon,          period      ]       };
-    key <AB09> {        [           colon,           slash      ]       };
-    key <AB10> {        [          exclam,         section      ]       };
-    key <BKSL> {        [        asterisk,              mu      ]       };
-    // End alphanumeric section
-
-};
-
-
-xkb_symbols "type6" {
-     include "sun/us(type6)"
-     include "sun/fr(basic)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/fr_CH	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-
-    key <TLDE> { [ section, degree	]	};
-    key <AE01> { [ 1, plus		],
-		 [ bar			]	};
-    key <AE02> { [ 2, quotedbl		],
-		 [ at			]	};
-    key <AE03> { [ 3, asterisk		],
-		 [ numbersign		]	};
-    key <AE04> { [ 4, ccedilla		],
-		 [ asciicircum		]	};
-    key <AE05> { [ 5, percent		],
-		 [ asciitilde		]	};
-    key <AE06> { [ 6, ampersand		]	};
-    key <AE07> { [ 7, slash		]	};
-    key <AE08> { [ 8, parenleft		]	};
-    key <AE09> { [ 9, parenright	]	};
-    key <AE10> { [ 0, equal		],
-		 [ quoteleft		]	};
-    Key <AE11> { [ quoteright, question ],
-		 [ SunFA_Acute		]	};
-    key <AE12> { [ SunFA_Circum, SunFA_Grave ],
-		 [ SunFA_Tilde		]	};
-    key <AD03> { [ e, E			], 
-		 [ EuroSign		]	};
-    key <AD06> { [ z, Z			]	};
-    key <AD11> { [ egrave, udiaeresis	],
-		 [ bracketleft		]	};
-    key <AD12> { [ SunFA_Diaeresis, exclam ],
-		 [ bracketright		]	};
-    key <AC10> { [ eacute, odiaeresis	]	};
-    key <AC11> { [ agrave, adiaeresis	],
-		 [ braceleft		]	};
-    key <BKSL> { [ dollar, sterling	],
-		 [ braceright		]	};
-    key <LSGT> { [ less, greater	],
-		 [ backslash		]	};
-    key <AB01> { [ y, Y			]	};
-    key <AB08> { [ comma, semicolon	]	};
-    key <AB09> { [ period, colon	]	};
-    key <AB10> { [ minus, underscore	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/gb	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-    // A few keys are different
-    key <AE01> { [ 1, exclam		], [brokenbar	]	};
-    key <AE03> { [ 3, sterling		], [numbersign	]	};
-    key <AE04> { [ 4, dollar		], [EuroSign	]	};
-    key <AE11> { [ minus, underscore	], [notsign	]	};
-    key <AD03> { [ e, E			], [EuroSign	]	};
-
-
-};
-
-
-xkb_symbols "type5" {
-    include "gb(Sundeadkeys)"
-
-    key <TLDE> { 	[	quoteleft,	notsign		],
-			[	brokenbar			]	};
-    key <AD03> {	[		e,	E		],
-			[	EuroSign			]	};
-};
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple British keyboard
-
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-
-    key <TLDE> { 	[	quoteleft,	notsign		],
-			[	brokenbar			]	};
-
-    key <AE02> {        [               2,        quotedbl      ]	};
-    key <AE03> {	[		3,	sterling	]	};
-    key <AE04> {	[		4,	dollar		],
-			[	EuroSign			]	};
-    key <BKSL> {	[      numbersign,      asciitilde	]	};
-    key <AC11> {	[      apostrophe,              at 	]	};
-    key <LSGT> {	[       backslash,	       bar  	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/ge	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-    name[Group1]= "Georgia";
-
-    key <TLDE> { [ 0x0100201e, 0x0100201c ], [ 0x0100201e, asciitilde ] };
-    key <AE01> { [ 1, exclam ], [ apostrophe ] };
-    key <AE02> { [ 2, at ], [ 0x0100201e ] };
-    key <AE03> { [ 3, numbersign ], [ 0x0100201c ] };
-    key <AE04> { [ 4, dollar ], [ 0x01002116 ] };
-    key <AE05> { [ 5, percent ], [ EuroSign ] };
-    key <AE06> { [ 6, asciicircum ] };
-    key <AE07> { [ 7, ampersand ], [ section ] };
-    key <AE08> { [ 8, asterisk ], [	degree ] };
-    key <AE09> { [ 9, parenleft ], [ 9, parentleft ] };
-    key <AE10> { [ 0, parenright ], [ 0, parentright ] };
-    key <AE11> { [ minus, underscore ], [ 0x01002014 ] };
-    key <AE12> { [ equal, plus ], [ 0x01002013 ] };
-
-    key <AD01> { [ 0x010010e5,  Q               ], [ q, Q ]    };
-    key <AD02> { [ 0x010010ec,  0x010010ed      ], [ w, W ]    };
-    key <AD03> { [ 0x010010d4,  E ], [ 0x010010f1 ]      };
-    key <AD04> { [ 0x010010e0,  0x010010e6 ], [ 0x010000ae ] };
-    key <AD05> { [ 0x010010e2,  0x010010d7 ], [ t, T ]         };
-    key <AD06> { [ 0x010010e7,  Y ], [ 0x010010f8   ]    };
-    key <AD07> { [ 0x010010e3,  U               ], [ u, U ]    };
-    key <AD08> { [ 0x010010d8,  I ], [ 0x010010f2   ]    };
-    key <AD09> { [ 0x010010dd,  O               ], [ o, O ]    };
-    key <AD10> { [ 0x010010de,  P               ], [ p, P ]    };
-    key <AD11> { [ bracketleft, braceleft       ], [ bracketleft, braceleft ]    };
-    key <AD12> { [ bracketright,braceright      ], [ bracketright, braceright ]    };
-
-    key <AC01> { [ 0x010010d0,  A ], [ 0x010010fa   ]       };
-    key <AC02> { [ 0x010010e1,  0x010010e8      ], [ s, S ]       };
-    key <AC03> { [ 0x010010d3,  D               ], [ d, D ]       };
-    key <AC04> { [ 0x010010e4,  F ], [ 0x010010f6   ]       };
-    key <AC05> { [ 0x010010d2,  G ], [ 0x010010f9   ]       };
-    key <AC06> { [ 0x010010f0,  H ], [ 0x010010f5   ]       };
-    key <AC07> { [ 0x010010ef, 0x010010df ], [ 0x010010f7 ] };
-    key <AC08> { [ 0x010010d9,  K               ], [ k, K ]       };
-    key <AC09> { [ 0x010010da,  L               ], [ l, L ]       };
-    key <AC10> { [ semicolon, colon             ], [ semicolon, colon ]       };
-    key <AC11> { [ apostrophe, quotedbl         ], [ quoteright, quotedbl ]       };
-    key <BKSL> { [ backslash, bar ], [ asciitilde, asciitilde ]  };
-
-    key <LSGT> { [ guillemotleft,guillemotright ], [ less, greater ]       };
-    key <AB01> { [ 0x010010d6,  0x010010eb      ], [ z, Z ]       };
-    key <AB02> { [ 0x010010ee,  X, 0x010010f4   ], [ x, X ]       };
-    key <AB03> { [ 0x010010ea, 0x010010e9 ], [ 0x010000a9 ] };
-    key <AB04> { [ 0x010010d5,  V ], [ 0x010010f3   ]       };
-    key <AB05> { [ 0x010010d1,  B               ], [ b, B ]       };
-    key <AB06> { [ 0x010010dc,  N ], [ 0x010010fc   ]       };
-    key <AB07> { [ 0x010010db,  M               ], [ m, M ]       };
-    key <AB08> { [ comma, less ], [ guillemotleft   ]       };
-    key <AB09> { [ period, greater ], [ guillemotright    ] };
-    key <AB10> { [ slash, question ], [ 0x010010fb  ]       };
-
-key.type[group2]="TWO_LEVEL";
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/gr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "basic" {
-     include "us(basic)"
-     include "gr(Sundeadkeys)"
-}; 
-
-xkb_symbols "type5" {
-    include "sun/us(type5basic)"
-    // A few keys are different
-    key <AE04> { [ 4, dollar ], [ EuroSign ] };
-    key <AD03> { [ e, E], [ EuroSign ] };
-    key <AC10> { [ dead_acute, dead_diaeresis ]                 };
-    key <LSGT> { [ backslash, bar       ]                       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-        include "us(basic)"
-        include "gr(basic)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-        include "gr(Sundeadkeys)"
-}; 
--- a/src/xorg/keytables/sun-src/symbols/sun/hu	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,357 +0,0 @@
-// Hungarian keyboard symbols for XKB and PC keyboard
-//
-// (C) 2002 Peter Soos <[email protected]>
-//
-// Permission is granted to anyone to use, distribute and modify
-// this file in any way, provided that the above copyright notice
-// is left intact and the author of the modification summarizes
-// the changes in this header.
-//
-// This file is distributed without any expressed or implied warranty.
-//
-// It describes the differences between a very simple US/ASCII keyboard
-// layout and some widely used Hungarian keyboard layouts.
-// Tested on Linux with XFree86 3.3.6
-//
-// $XFree86: xc/programs/xkbcomp/symbols/hu,v 1.7 2002/12/13 04:18:03 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-// Default layout
-default partial
-xkb_symbols "default" {
-    include "hu(102_qwertz_comma)"
-};
-
-// Standard layout
-partial
-xkb_symbols "standard" {
-    include "hu(102_qwertz_comma)"
-};
-
-// Main layouts
-
-// 101_qwertz_comma:
-// Unicode based 101 key qwertz layout with decimal comma on keypad
-// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
-partial
-xkb_symbols "101_qwertz_comma" {
-    name[Group1] = "Hungarian";
-    include "hu(def_uni)"
-    include "hu(def_101)"
-    include "hu(def_qwertz)"
-    include "hu(def_comma)"
-    include "hu(def_common)"
-};
-
-// 101_qwertz_dot:
-// Unicode based 101 key qwertz layout with decimal dot on keypad
-// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
-partial
-xkb_symbols "101_qwertz_dot" {
-    name[Group1] = "Hungarian";
-    include "hu(def_uni)"
-    include "hu(def_101)"
-    include "hu(def_qwertz)"
-    include "hu(def_dot)"
-    include "hu(def_common)"
-};
-
-// 101_qwerty_comma:
-// Unicode based 101 key qwerty layout with decimal comma on keypad
-// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
-partial
-xkb_symbols "101_qwerty_comma" {
-    name[Group1] = "Hungarian";
-    include "hu(def_uni)"
-    include "hu(def_101)"
-    include "hu(def_qwerty)"
-    include "hu(def_comma)"
-    include "hu(def_common)"
-};
-
-// 101_qwerty_dot:
-// Unicode based 101 key qwerty layout with decimal dot on keypad
-// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
-partial
-xkb_symbols "101_qwerty_dot" {
-    name[Group1] = "Hungarian";
-    include "hu(def_uni)"
-    include "hu(def_101)"
-    include "hu(def_qwerty)"
-    include "hu(def_dot)"
-    include "hu(def_common)"
-};
-
-// 102_qwertz_comma:
-// Unicode based 102 key qwertz layout with decimal comma on keypad
-// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
-partial
-xkb_symbols "102_qwertz_comma" {
-    name[Group1] = "Hungarian";
-    include "hu(def_uni)"
-    include "hu(def_102)"
-    include "hu(def_qwertz)"
-    include "hu(def_comma)"
-    include "hu(def_common)"
-};
-
-// 102_qwertz_dot:
-// Unicode based 102 key qwertz layout with decimal dot on keypad
-// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
-partial
-xkb_symbols "102_qwertz_dot" {
-    name[Group1] = "Hungarian";
-    include "hu(def_uni)"
-    include "hu(def_102)"
-    include "hu(def_qwertz)"
-    include "hu(def_dot)"
-    include "hu(def_common)"
-};
-
-// 102_qwerty_comma:
-// Unicode based 102 key qwerty layout with decimal comma on keypad
-// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
-partial
-xkb_symbols "102_qwerty_comma" {
-    name[Group1] = "Hungarian";
-    include "hu(def_uni)"
-    include "hu(def_102)"
-    include "hu(def_qwerty)"
-    include "hu(def_comma)"
-    include "hu(def_common)"
-};
-
-// 102_qwerty_dot:
-// Unicode based 102 key qwerty layout with decimal dot on keypad
-// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
-partial
-xkb_symbols "102_qwerty_dot" {
-    name[Group1] = "Hungarian";
-    include "hu(def_uni)"
-    include "hu(def_102)"
-    include "hu(def_qwerty)"
-    include "hu(def_dot)"
-    include "hu(def_common)"
-};
-
-// Partial layouts
-
-// def_uni:
-// Unicode based Hungarian keybaord.
-
-hidden partial alphanumeric_keys
-xkb_symbols "def_uni" {
-
-    key <AD07> {        [                u, U                ],
-                        [         EuroSign                   ]       };
-    key <AC02> {        [                s, S                ],
-                        [          dstroke                   ]       };
-    key <AC03> {        [                d, D                ],
-                        [          Dstroke                   ]       };
-    key <AC08> {        [                k, K                ],
-                        [          lstroke                   ]       };
-    key <AC09> {        [                l, L                ],
-                        [          Lstroke                   ]       };
-    key <AD11> {        [     odoubleacute, Odoubleacute     ],
-                        [         division                   ]       };
-    key <BKSL> {        [     udoubleacute, Udoubleacute     ],
-                        [         currency                   ]       };
-};
-
-// def_102:
-// The standard Hungarian 102 key layout
-
-hidden partial alphanumeric_keys
-xkb_symbols "def_102" {
-    key <TLDE> {        [                0, section          ],
-                        [          notsign                   ]       };
-};
-
-// def_101:
-// An alternative layout for 101 key keyboards
-
-hidden partial alphanumeric_keys
-xkb_symbols "def_101" {
-    key <TLDE> {        [           iacute, Iacute           ],
-                        [                0, section          ]       };
-};
-
-// def_qwertz:
-// The standard Hungaryan qwertz layout
-
-hidden partial alphanumeric_keys
-xkb_symbols "def_qwertz" {
-    key <AB01> {        [                y, Y                ],
-                        [          greater                   ]       };
-    key <AD06> {        [                z, Z                ]       };
-};
-
-// def_qwerty:
-// The qwerty layout for people who familiar with the standard US layout
-
-hidden partial alphanumeric_keys
-xkb_symbols "def_qwerty" {
-    key <AB01> {        [                z, Z                ],
-                        [          greater                   ]       };
-    key <AD06> {        [                y, Y                ]       };
-};
-
-// def_comma:
-// The Hungarian standard is the comma on the keypad not decimal dot
-hidden partial keypad_keys
-xkb_symbols "def_comma" {
-   key  <KPDL> {        [        KP_Delete, KP_Separator     ]       };
-};
-
-// def_dot:
-// The Hungarian standard is the comma on the keypad not decimal dot,
-// but programmers hate it
-hidden partial keypad_keys
-xkb_symbols "def_dot" {
-   key  <KPDL> {        [        KP_Delete, KP_Decimal       ]       };
-};
-
-// def_common:
-// The common part of all Hungarian layout above
-hidden partial alphanumeric_keys modifier_keys
-xkb_symbols "def_common" {
-
-    // Alphanumeric section
-    key <AE01> {        [                1, apostrophe       ],
-                        [       asciitilde, dead_tilde       ]       };
-    key <AE02> {        [                2, quotedbl         ],
-                        [       dead_caron, caron            ]       };
-    key <AE03> {        [                3, plus             ],
-                        [      asciicircum, dead_circumflex  ]       };
-    key <AE04> {        [                4, exclam           ],
-                        [       dead_breve, breve            ]       };
-    key <AE05> {        [                5, percent          ],
-                        [   dead_abovering, degree           ]       };
-    key <AE06> {        [                6, slash            ],
-                        [      dead_ogonek, ogonek           ]       };
-    key <AE07> {        [                7, equal            ],
-                        [            grave, dead_grave       ]       };
-    key <AE08> {        [                8, parenleft        ],
-                        [    dead_abovedot, degree           ]       };
-    key <AE09> {        [                9, parenright       ],
-                        [       dead_acute, acute            ]       };
-    key <AE10> {        [       odiaeresis, Odiaeresis       ],
-                        [ dead_doubleacute, doubleacute      ]       };
-    key <AE11> {        [       udiaeresis, Udiaeresis       ],
-                        [   dead_diaeresis, diaeresis        ]       };
-    key <AE12> {        [           oacute, Oacute           ],
-                        [     dead_cedilla, cedilla          ]       };
-
-    key <AD01> {        [                q, Q                ],
-                        [        backslash                   ]       };
-    key <AD02> {        [                w, W                ],
-                        [              bar                   ]       };
-    key <AD08> {        [                i, I                ],
-                        [           Iacute                   ]       };
-    key <AD12> {        [           uacute, Uacute           ],
-                        [         multiply                   ]       };
-
-    key <AC04> {        [                f, F                ],
-                        [      bracketleft                   ]       };
-    key <AC05> {        [                g, G                ],
-                        [     bracketright                   ]       };
-    key <AC07> {        [                j, J                ],
-                        [           iacute                   ]       };
-    key <AC10> {        [           eacute, Eacute           ],
-                        [           dollar                   ]       };
-    key <AC11> {        [           aacute, Aacute           ],
-                        [           ssharp                   ]       };
-
-    key <LSGT> {        [           iacute, Iacute           ],
-                        [             less                   ]       };
-    key <AB02> {        [                x, X                ],
-                        [       numbersign                   ]       };
-    key <AB03> {        [                c, C                ],
-                        [        ampersand                   ]       };
-    key <AB04> {        [                v, V                ],
-                        [               at                   ]       };
-    key <AB05> {        [                b, B                ],
-                        [        braceleft                   ]       };
-    key <AB06> {        [                n, N                ],
-                        [       braceright                   ]       };
-    key <AB07> {        [                m, M                ],
-                        [             less                   ]       };
-    key <AB08> {        [            comma, question         ],
-                        [        semicolon                   ]       };
-    key <AB09> {        [           period, colon            ],
-                        [          greater                   ]       };
-    key <AB10> {        [            minus, underscore       ],
-                        [         asterisk                   ]       };
-    key <RALT> {        [      Mode_switch, Multi_key        ]       };
-    key <LALT> {        [            Alt_L, Meta_L           ]       };
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial
-xkb_symbols "Sundeadkeys" {
-    include "hu(default)" // for consistent naming
-};
-
-partial
-xkb_symbols "sundeadkeys" {
-    include "hu(Sundeadkeys)" // for consistent naming
-};
-
-partial
-xkb_symbols "nodeadkeys" {
-    // modify the default Hungarian layout to not have any dead keys
-    include "hu(default)"
-    key <AE01> {        [                1, apostrophe       ],
-                        [       asciitilde                   ]       };
-    key <AE02> {        [                2, quotedbl         ],
-                        [            caron                   ]       };
-    key <AE03> {        [                3, plus             ],
-                        [      asciicircum                   ]       };
-    key <AE04> {        [                4, exclam           ],
-                        [            breve                   ]       };
-    key <AE05> {        [                5, percent          ],
-                        [           degree                   ]       };
-    key <AE06> {        [                6, slash            ],
-                        [           ogonek                   ]       };
-    key <AE07> {        [                7, equal            ],
-                        [            grave                   ]       };
-    key <AE08> {        [                8, parenleft        ],
-                        [         abovedot                   ]       };
-    key <AE09> {        [                9, parenright       ],
-                        [            acute                   ]       };
-    key <AE10> {        [       odiaeresis, Odiaeresis       ],
-                        [      doubleacute                   ]       };
-    key <AE11> {        [       udiaeresis, Udiaeresis       ],
-                        [        diaeresis                   ]       };
-    key <AE12> {        [           oacute, Oacute           ],
-                        [          cedilla                   ]       };
-
-};
--- a/src/xorg/keytables/sun-src/symbols/sun/is	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-// $Xorg: is,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-// XKB keyboard by Hrafnkell Eiriksson - [email protected]
-//     fixes by Olafur Osvaldsson - [email protected]
-// $XFree86: xc/programs/xkbcomp/symbols/is,v 3.7 2002/11/26 01:57:24 dawes Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and an Icelandic one - hopefully
-
-    // Alphanumeric section
-    name[Group1]= "Icelandic";
-    key <TLDE> {        [ dead_abovering, dead_diaeresis       ],
-                        [   notsign                     ]       };
-    key <AE02> {        [         2,    quotedbl        ],
-                        [ twosuperior                   ]       };
-    key <AE03> {        [         3,    numbersign      ],
-                        [ threesuperior,sterling        ]       };
-    key <AE04> {        [         4,    dollar          ],
-                        [ onequarter,   currency        ]       };
-    key <AE05> {        [         5,    percent         ],
-                        [   onehalf                     ]       };
-    key <AE06> {        [         6,    ampersand       ],
-                        [ threequarters                 ]       };
-    key <AE07> {        [         7,    slash           ],
-                        [ braceleft                     ]       };
-    key <AE08> {        [         8,    parenleft       ],
-                        [ bracketleft                   ]       };
-    key <AE09> {        [         9,    parenright      ],
-                        [ bracketright, plusminus       ]       };
-    key <AE10> {        [         0,    equal           ],
-                        [ braceright,   degree          ]       };
-    key <AE11> {        [    odiaeresis, Odiaeresis     ],
-                        [ backslash,    questiondown    ]       };
-    key <AE12> {        [ minus,        underscore      ],
-                        [ ccedilla                      ]       };
-    key <AD01> {        [         q,    Q               ],
-                        [        at                     ]       };
-    key <AD03> {        [         e,    E               ],
-                        [  EuroSign,    cent            ]       };
-//    key <AD05> {      [         t,    T               ]       };
-//    key <AD06> {      [         z,    Z               ]       };
-//    key <AD07> {      [         u,    U               ]       };
-//    key <AD08> {      [         i,    I               ]       };
-    key <AD11> {        [ eth,                  Eth     ],
-                        [ dead_diaeresis                ]       };
-    key <AD12> {        [ apostrophe ,  question        ],
-                        [  dead_tilde,   dead_macron     ]       };
-//    key <AC04> {      [         f,    F               ]       };
-//    key <AC05> {      [         g,    G               ]       };
-    key <AC10> {        [ ae,                   AE      ],
-                        [ asciicircum                   ]       };
-    key <AC11> {        [ dead_acute,   dead_acute	],
-                        [ dead_circumflex               ]       };
-
-    key <LSGT> {        [      less,    greater         ],
-                        [       bar                     ]       };
-//    key <AB01> {      [         y,    Y               ],
-//                      [ guillemotleft, less           ]       };
-//    key <AB07> {      [         m,    M               ],
-//                      [        mu                     ]       };
-    key <AB08> {        [     comma,    semicolon       ]       };
-    key <AB09> {        [    period,    colon           ],
-                        [ periodcentered, division      ]       };
-    key <AB10> {        [     thorn,    Thorn   ]       };
-    key <BKSL> {        [ plus,         asterisk        ],
-                        [ grave                 ]       };
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    include "ralt(mode_switch)"
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-    // modify the default Icelandic layout to use Sun dead keys
-    include "is(basic)"
-//    key <TLDE> {        [ SunFA_Circum, degree          ],
-//                        [   notsign                     ]       };
-//    key <AE12> {        [ SunFA_Acute,  SunFA_Grave     ],
-//                        [ SunFA_Cedilla                 ]       };
-//    key <AD11> {        [ udiaeresis,   Udiaeresis      ],
-//                        [ SunFA_Diaeresis               ]       };
-//    key <AD12> {        [      plus,    asterisk        ],
-//                        [ SunFA_Tilde,  dead_macron     ]       };
-//    key <AC10> {        [ odiaeresis,   Odiaeresis      ],
-//                        [ SunFA_Acute                   ]       };
-//    key <AC11> {        [ adiaeresis,   Adiaeresis      ],
-//                        [ SunFA_Circum                  ]       };
-//    key <BKSL> {        [ numbersign,   acute           ],
-//                        [ SunFA_Grave                   ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "is(Sundeadkeys)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    // modify the default Icelandic layout to not have any dead keys
-    include "is(basic)"
-    key <TLDE> {        [ degree, 	diaeresis       ],
-                        [ notsign                     ]       };
-    key <AE12> {        [ minus,        underscore      ],
-                        [ ccedilla                      ]       };
-    key <AD11> {        [ eth,                  Eth     ],
-                        [ diaeresis  			]       };
-    key <AD12> {        [ apostrophe ,  question        ],
-                        [ asciitilde,   macron     ]       };
-    key <AC10> {        [ ae,                   AE      ],
-                        [ asciicircum                   ]       };
-    key <AC11> {        [ acute,   	acute		],
-                        [ asciicircum			]       };
-    key <BKSL> {        [ plus,         asterisk        ],
-                        [ grave                 ]       };
-
-//    key <TLDE> {        [ asciicircum,  degree          ],
-//                        [   notsign                     ]       };
-//    key <AE12> {        [ apostrophe,   grave           ],
-//                        [ cedilla                       ]       };
-//    key <AD11> {        [ udiaeresis,   Udiaeresis      ],
-//                        [ diaeresis                     ]       };
-//    key <AD12> {        [      plus,    asterisk        ],
-//                        [ asciitilde,   macron          ]       };
-//    key <AC10> {        [ odiaeresis,   Odiaeresis      ],
-//                        [ acute                         ]       };
-//    key <AC11> {        [ adiaeresis,   Adiaeresis      ],
-//                        [ asciicircum                   ]       };
-//    key <BKSL> {        [ numbersign,   acute           ],
-//                        [ grave                         ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/it	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type4" {
- 
-    key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft    ]        };
-    key <BRCR> { [ bracketright, braceright ], [ guillemotright ]       };
-    key <AE02> { [ 2, quotedbl          ], [ twosuperior        ]       };
-    key <AE03> { [ 3, sterling          ], [ threesuperior      ]       };
-    key <AE06> { [ 6, ampersand         ], [ notsign            ]       };
-    key <AE06> { [ 7, slash             ]                               };
-    key <AE06> { [ 8, parenleft         ]                               };
-    key <AE09> { [ 9, parenright        ], [ backslash          ]       };
-    key <AE10> { [ 0, equal             ], [ bar                ]       };
-    key <AE11> { [ quoteright, question ], [ quoteleft          ]       };
-    key <AE12> { [ igrave, asciicircum  ] };
- 
-    key <AD11> { [ egrave, eacute       ]                               };
-    key <AD12> { [ plus, asterisk       ], [ asciitilde         ]       };
- 
-    key <AC10> { [ ograve, ccedilla     ], [ at                 ]       };
-    key <AC11> { [ agrave, degree       ], [ numbersign         ]       };
-    key <TLDE> { [ ugrave, section      ]                               };
- 
-    key <LSGT> { [ less, greater        ]                               };
-    key <AB08> { [ comma, semicolon     ]                               };
-    key <AB09> { [ period, colon        ]                               };
-    key <AB10> { [ minus, underscore    ]                               };
-     
- 
-    key <LALT> { [ Alt_L                ]                               };
-    key <COMP> { [ SunCompose           ]                               };
-    key <RALT> { [ SunAltGraph          ]                               };
-    key <LCTL> { [ Caps_Lock            ]                               };
-    key <CAPS> { [ Control_L            ]                               };
- 
-};
- 
-xkb_symbols "type5" {
-    include "it"
-                                                                                
-    key <AE08> { [ 8, parenleft         ], [ braceleft                  ] };
-    key <AE09> { [ 9, parenright        ], [ braceright                 ] };
- 
-    key <BKSL> { [ ugrave, section      ], [ asciitilde                 ] };
-};
- 
-
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-
-    key <LSGT> {	[	     less,	   greater	]	};
-    key <TLDE> { 	[       backslash,             bar      ]       };
-    key <AE02> {	[               2,        quotedbl     	]	};
-    key <AE03> {	[               3,        sterling     	]	};
-    key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash     	]	};
-    key <AE08> {	[               8,       parenleft     	],	
-                        [       braceleft			]       };
-    key <AE09> {	[               9,      parenright     	],	
-                        [      braceright			]       };
-    key <AE10> {	[               0,           equal     	]	};
-    key <AE11> {	[      apostrophe,        question      ],	
-			[	    grave			]	};
-    key <AE12> {	[          igrave,     asciicircum	]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign			]       };
-    key <AD11> {	[	   egrave,          eacute     	],	
-			[     bracketleft,  dead_abovering	]	};
-    key <AD12> {	[            plus,        asterisk     	],	
-			[    bracketright			]      	};
-    key <BKSL> {	[          ugrave,         section	],
-			[	asciitilde			]	};
-    key	<AC10> {	[	   ograve,        ccedilla  	],	
-			[              at			]	};
-    key <AC11> {	[ 	   agrave, 	degree		],
-			[	numbersign			]	};
-    key <AB08> {        [           comma,       semicolon      ]       };
-    key <AB09> {        [          period,           colon      ]       };
-    key <AB10> {        [           minus,      underscore      ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/jp	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,819 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// US/ASCII layout for a Type 4 Sun keyboard
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "basic" {
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-//    key <BRCR> { [ Linefeed		]			};
-    key <EXEC> { [ Execute		]			};
-};
-xkb_symbols "type4" {
-
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    key <COMP> { [ Multi_key		]			};
-    key <EXEC> { [ Execute		]			};
-//    key <TLFD> { [ Linefeed		]			};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-    key <BRCR> { [ Linefeed		]			};
-
-    key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-    key <DELE> { [ Delete		]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]			};
-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
-    key <KPSU> { [ KP_Subtract		]			};
-
-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-    key  <KP8> { [ Up,	R8		], [ KP_8		] };
-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-    key <KPAD> { [ KP_Add		]			};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		] };
-    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-    key  <KP6> { [ Right, R12		], [ KP_6		] };
-
-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-    key  <KP2> { [ Down, R14		], [ KP_2		] };
-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-    key <KPEN> { [ KP_Enter		]			}; 
-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R, Shift_L };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2   	{ Mode_switch };
-    modifier_map Mod3   	{ Num_Lock };
-    modifier_map Mod4		{ Alt_L };
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // Alphanumeric section
-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-//    key <RCTL> { [ Control_R		]			};
-    key <EXEC> { [ Execute		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-    key  <KP8> { [ Up, R8		], [ KP_8		]	};
-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		]	};
-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-    key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-    key  <KP2> { [ Down, R14		], [ KP_2		]	};
-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_R };
-    modifier_map Mod3	{ Num_Lock };
-    modifier_map Mod4	{ Alt_L };
-};
-
-xkb_symbols "type5hobo" {
-
-    // Alphanumeric section
-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};
-    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};
-    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};
-    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};
-    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};
-    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};
-    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-    key <EXEC> { [ Execute		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-     key <NMLK> { [ Num_Lock 		]				};
-//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-//     key  <KP8> { [ Up, R8		], [ KP_8		]	};
-//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-//     key <KPAD> { [ KP_Add		]				};
-
-//     key  <KP4> { [ Left, R10		], [ KP_4		]	};
-//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-//     key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-//     key  <KP2> { [ Down, R14		], [ KP_2		]	};
-//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-//     key <KPEN> { [ KP_Enter		]				};
-
-//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_R };
-    modifier_map Mod3	{ Num_Lock };
-    modifier_map Mod4	{ Alt_L };
-};
-
-// layout for a Japanese Type 6 Sun keyboard
-// Just shows differences from Type 6 US layout 
-partial
-xkb_symbols "type6" {
-
-    // Alphanumeric section
-    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.
-    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <AB11> { [ backslash, underscore], [ kana_RO		]	};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <EXEC> { [ Execute		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <ALGR> { [ Kana_Lock, Mode_switch ]	};
-    // End alphanumeric section
-};
-
-xkb_symbols "x86" {
-    include "sun/us(pc101)"
-    include "sun/jp(basic)"
-    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
-
-    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};
-    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};
-
-    
-    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};
-
-    key <ALGR> { [ Mode_switch ]	       };
-    key <RALT> { [ Alt_R ]	       };
-
-};
-
-xkb_symbols "J3100" {
-    include "sun/us(pc101)"
-
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <SPCE> { [ space		]			};
-//    key <KANJ> { [ Kanji		]			};
-//    key <HENK> { [ Henkan_Mode		]			};
-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-//    key <BRCR> { [ Linefeed		]			};
-//    key <EXEC> { [ Execute		]			};
-
-    key <ESC>  { [ Escape, 3 ] };
-
-    key <AE02> { [ 2, at		], [ kana_FU			]};
-    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};
-    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};
-    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};
-    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};
-    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};
-    key <AE11> { [ minus, underscore	], [ kana_HO			]};
-    key <AE12> { [ equal, plus		], [ kana_HE			]};
-
-    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};
-    key <AE12> { [ equal, plus		], [ kana_HE			]};
-
-    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    
-    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    
-
-    key <AC10> { [ semicolon, colon	     ], [ kana_RE		]};    
-    key <AC11> { [ quoteright, quotedbl	     ], [ kana_KE		]};    
-
-    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};
-    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};
-//    key <ALGR> { [ Mode_switch ]	       };
-    key <RALT> { [ Henkan_Mode ]	       };
-    key <RCTL> { [ Mode_switch ]	       };
-
-};
-
-xkb_symbols "Muhenkan_x86" {
-    include "sun/jp(x86)"
-
-    key <EXEC> { [ Muhenkan ] };
-};
-
-
-
-partial
-xkb_symbols "type7" {
-    include "sun/jp(type6)"
-    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };
-    key <HZTG> { [ Henkan_Mode ] };
-    key <HENK> { [ Kana_Lock, Mode_switch ] };
-    key <ALGR> { [ Alt_R, Alt_R ] };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/kg	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-partial default alphanumeric_keys 
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-    name[Group1]= "Kyrgyzstan";
-    name[Group2]= "US/ASCII";
-
-
-    key <AE01> {        [               1,          exclam      ],
-                        [               1,          exclam      ]       };
-    key <AE02> {        [               2,        quotedbl      ],
-                        [               2,              at      ]       };
-    key <AE03> {        [               3,      numerosign      ],
-                        [               3,      numbersign      ]       };
-    key <AE04> {        [               4,       semicolon      ],
-                        [               4,          dollar      ]       };
-    key <AE05> {        [               5,         percent      ],
-                        [               5,         percent      ]       };
-    key <AE06> {        [               6,           colon      ],
-                        [               6,     asciicircum      ]       };
-    key <AE07> {        [               7,        question      ],
-                        [               7,       ampersand      ]       };
-    key <AE08> {        [               8,        asterisk      ],
-                        [               8,        asterisk      ]       };
-    key <AE09> {        [               9,       parenleft      ],
-                        [               9,       parenleft      ]       };
-    key <AB10> {        [          period,           comma      ],
-                        [           slash,        question      ]       };
-    key <AE11> {        [           minus,      underscore      ],
-                        [           minus,      underscore      ]       };
-    key <AE12> {        [           equal,            plus      ],
-                        [           equal,            plus      ]       };
-    key <BKSL> {        [       backslash,           slash      ],
-                        [       backslash,             bar      ]       };
-    key <AB10> {        [           slash,        question      ],
-                        [           slash,        question      ]       };
-    key <LSGT> {        [           slash,             bar      ]       };
-
-key.type[group2]="ALPHABETIC";
-
-    key <TLDE> {        [           grave,      asciitilde      ]       };
-    key <AD01> {        [ Cyrillic_shorti, Cyrillic_SHORTI      ],
-                        [               q,               Q      ]       };
-    key <AD02> {        [    Cyrillic_tse,    Cyrillic_TSE      ],
-                        [               w,               W      ]       };
-    key <AD03> { 	[      Cyrillic_u,      Cyrillic_U 	],
-                 	[ Cyrillic_u_straight, Cyrillic_U_straight ]    };
-    key <AD04> {        [     Cyrillic_ka,     Cyrillic_KA      ],
-                        [               r,               R      ]       };
-    key <AD05> {        [     Cyrillic_ie,     Cyrillic_IE      ],
-                        [               t,               T      ]       };
-    key <AD06> { 	[      Cyrillic_en,    Cyrillic_EN 	],  
-                 	[ Cyrillic_en_descender, Cyrillic_EN_descender ] };            
-    key <AD07> {        [    Cyrillic_ghe,    Cyrillic_GHE      ],
-                        [               u,               U      ]       };
-    key <AD08> {        [    Cyrillic_sha,    Cyrillic_SHA      ],
-                        [               i,               I      ]       };
-    key <AD09> {        [  Cyrillic_shcha,  Cyrillic_SHCHA      ],
-                        [               o,               O      ]       };
-    key <AD10> {        [     Cyrillic_ze,     Cyrillic_ZE      ],
-                        [               p,               P      ]       };
-    key <AD11> {        [     Cyrillic_ha,     Cyrillic_HA      ],
-                        [     bracketleft,       braceleft      ]       };
-    key <AD12> {        [Cyrillic_hardsign,Cyrillic_HARDSIGN    ],
-                        [    bracketright,      braceright      ]       };
-
-    key <AC01> {        [     Cyrillic_ef,     Cyrillic_EF      ],
-                        [               a,               A      ]       };
-    key <AC02> {        [   Cyrillic_yeru,   Cyrillic_YERU      ],
-                        [               s,               S      ]       };
-    key <AC03> {        [     Cyrillic_ve,     Cyrillic_VE      ],
-                        [               d,               D      ]       };
-    key <AC04> {        [      Cyrillic_a,      Cyrillic_A      ],
-                        [               f,               F      ]       };
-    key <AC05> {        [     Cyrillic_pe,     Cyrillic_PE      ],
-                        [               g,               G      ]       };
-    key <AC06> {        [     Cyrillic_er,     Cyrillic_ER      ],
-                        [               h,               H      ]       };
-    key <AC07> { 	[      Cyrillic_o,      Cyrillic_O      ],           
-                        [  Cyrillic_o_bar,  Cyrillic_O_bar      ]       };
-    key <AC08> {        [     Cyrillic_el,     Cyrillic_EL      ],
-                        [               k,               K      ]       };
-    key <AC09> {        [     Cyrillic_de,     Cyrillic_DE      ],
-                        [               l,               L      ]       };
-    key <AC10> {        [    Cyrillic_zhe,    Cyrillic_ZHE      ],
-                        [       semicolon,           colon      ]       };
-    key <AC11> {        [      Cyrillic_e,      Cyrillic_E      ],
-                        [      apostrophe,        quotedbl      ]       };
-
-    key <AB01> {        [     Cyrillic_ya,     Cyrillic_YA      ],
-                        [               z,               Z      ]       };
-    key <AB02> {        [    Cyrillic_che,    Cyrillic_CHE      ],
-                        [               x,               X      ]       };
-    key <AB03> {        [     Cyrillic_es,     Cyrillic_ES      ],
-                        [               c,               C      ]       };
-    key <AB04> {        [     Cyrillic_em,     Cyrillic_EM      ],
-                        [               v,               V      ]       };
-    key <AB06> {        [     Cyrillic_te,     Cyrillic_TE      ],
-                        [               n,               N      ]       };
-    key <AB05> {        [      Cyrillic_i,      Cyrillic_I      ],
-                        [               b,               B      ]       };
-    key <AB07> {        [Cyrillic_softsign,Cyrillic_SOFTSIGN    ],
-                        [               m,               M      ]       };
-    key <AB08> {        [     Cyrillic_be,     Cyrillic_BE      ],
-                        [           comma,            less      ]       };
-    key <AB09> {        [     Cyrillic_yu,     Cyrillic_YU      ],
-                        [          period,         greater      ]       };
-
-key.type[group2]="TWO_LEVEL";
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/ko	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Korean layout for a Type 4 Sun keyboard
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
-
-    key <LNFD> { [ Hangul		]			};
-    key <RALT> { [ Linefeed		]			};
-    key <COMP> { [ Hangul_Hanja		]			};
-
-};
-
-// Korean layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-//    include "sun/us(type5basic)"
-
-    // A few keys are different
-    key <ALGR> { [ Hangul		]				  };
-    key <COMP> { [ Hangul_Hanja		]				  };
-    key <BKSL> { [ backslash, bar	], [ brokenbar			] };
-};
-
-// Korean layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
-//    include "sun/us(type5basic)"
-
-    // A few keys are different
-    key <ALGR> { [ Hangul		]				  };
-    key <COMP> { [ Hangul_Hanja		]				  };
-    key <BKSL> { [ backslash, bar	], [ brokenbar			] };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/kz	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-// layout for a Sun Type 6 Kazakhstan keyboard
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Kazakhstan";
-
-    key <TLDE> {        [               parenleft,              parenright      ],
-                        [             Cyrillic_io,             Cyrillic_IO      ]       };
-    key <AE01> {        [                       1,                  exclam      ],
-                        [                quotedbl,                  exclam      ]       };
-    key <AE02> {        [                       2,                      at      ],
-                        [          Cyrillic_schwa,          Cyrillic_SCHWA      ]       };
-    key <AE03> {        [                       3,              numbersign      ],
-                        [             Ukrainian_i,             Ukrainian_I      ]       };
-    key <AE04> {        [                       4,                  dollar      ],
-                        [   Cyrillic_en_descender,   Cyrillic_EN_descender      ]       };
-    key <AE05> {        [                       5,                 percent      ],
-                        [        Cyrillic_ghe_bar,        Cyrillic_GHE_bar      ]       };
-    key <AE06> {        [                       6,             asciicircum      ],
-                        [                   comma,               semicolon      ]       };
-    key <AE07> {        [                       7,               ampersand      ],
-                        [                  period,                   colon      ]       };
-    key <AE08> {        [                       8,                asterisk      ],
-                        [     Cyrillic_u_straight,     Cyrillic_U_straight      ]       };
-    key <AE09> {        [                       9,               parenleft      ],
-                        [ Cyrillic_u_straight_bar, Cyrillic_U_straight_bar      ]       };
-    key <AE10> {        [                       0,              parenright      ],
-                        [   Cyrillic_ka_descender,   Cyrillic_KA_descender      ]       };
-    key <AE11> {        [                   minus,              underscore      ],
-                        [          Cyrillic_o_bar,          Cyrillic_O_bar      ]       };
-    key <AE12> {        [                   equal,                    plus      ],
-                        [           Cyrillic_shha,           Cyrillic_SHHA      ]       };
-    key <AD01> {        [                       q,                       Q      ],
-                        [         Cyrillic_shorti,         Cyrillic_SHORTI      ]       };
-    key <AD02> {        [                       w,                       W      ],
-                        [            Cyrillic_tse,            Cyrillic_TSE      ]       };
-    key <AD03> {        [                       e,                       E      ],
-                        [              Cyrillic_u,              Cyrillic_U      ]       };
-    key <AD04> {        [                       r,                       R      ],
-                        [             Cyrillic_ka,             Cyrillic_KA      ]       };
-    key <AD05> {        [                       t,                       T      ],
-                        [             Cyrillic_ie,             Cyrillic_IE      ]       };
-    key <AD06> {        [                       y,                       Y      ],
-                        [             Cyrillic_en,             Cyrillic_EN      ]       };
-    key <AD07> {        [                       u,                       U      ],
-                        [            Cyrillic_ghe,            Cyrillic_GHE      ]       };
-    key <AD08> {        [                       i,                       I      ],
-                        [            Cyrillic_sha,            Cyrillic_SHA      ]       };
-    key <AD09> {        [                       o,                       O      ],
-                        [          Cyrillic_shcha,          Cyrillic_SHCHA      ]       };
-    key <AD10> {        [                       p,                       P      ],
-                        [             Cyrillic_ze,             Cyrillic_ZE      ]       };
-    key <AD11> {        [             bracketleft,               braceleft      ],
-                        [             Cyrillic_ha,             Cyrillic_HA      ]       };
-    key <AD12> {        [            bracketright,              braceright      ],
-                        [       Cyrillic_hardsign,       Cyrillic_HARDSIGN      ]       };
-    key <BKSL> {        [               backslash,                     bar      ],
-                        [               backslash,                   slash      ]       };
-    key <AC01> {        [                       a,                       A      ],
-                        [             Cyrillic_ef,             Cyrillic_EF      ]       };
-    key <AC02> {        [                       s,                       S      ],
-                        [           Cyrillic_yeru,           Cyrillic_YERU      ]       };
-    key <AC03> {        [                       d,                       D      ],
-                        [             Cyrillic_ve,             Cyrillic_VE      ]       };
-    key <AC04> {        [                       f,                       F      ],
-                        [              Cyrillic_a,              Cyrillic_A      ]       };
-    key <AC05> {        [                       g,                       G      ],
-                        [             Cyrillic_pe,             Cyrillic_PE      ]       };
-    key <AC06> {        [                       h,                       H      ],
-                        [             Cyrillic_er,             Cyrillic_ER      ]       };
-    key <AC07> {        [                       j,                       J      ],
-                        [              Cyrillic_o,              Cyrillic_O      ]       };
-    key <AC08> {        [                       k,                       K      ],
-                        [             Cyrillic_el,             Cyrillic_EL      ]       };
-    key <AC09> {        [                       l,                       L      ],
-                        [             Cyrillic_de,             Cyrillic_DE      ]       };
-    key <AC10> {        [               semicolon,                   colon      ],
-                        [            Cyrillic_zhe,            Cyrillic_ZHE      ]       };
-    key <AC11> {        [              apostrophe,                quotedbl      ],
-                        [              Cyrillic_e,              Cyrillic_E      ]       };
-    key <AB01> {        [                       z,                       Z      ],
-                        [             Cyrillic_ya,             Cyrillic_YA      ]       };
-    key <AB02> {        [                       x,                       X      ],
-                        [            Cyrillic_che,            Cyrillic_CHE      ]       };
-    key <AB03> {        [                       c,                       C      ],
-                        [             Cyrillic_es,             Cyrillic_ES      ]       };
-    key <AB04> {        [                       v,                       V      ],
-                        [             Cyrillic_em,             Cyrillic_EM      ]       };
-    key <AB05> {        [                       b,                       B      ],
-                        [              Cyrillic_i,              Cyrillic_I      ]       };
-    key <AB06> {        [                       n,                       N      ],
-                        [             Cyrillic_te,             Cyrillic_TE      ]       };
-    key <AB07> {        [                       m,                       M      ],
-                        [       Cyrillic_softsign,       Cyrillic_SOFTSIGN      ]       };
-    key <AB08> {        [                   comma,                    less      ],
-                        [             Cyrillic_be,             Cyrillic_BE      ]       };
-    key <AB09> {        [                  period,                 greater      ],
-                        [             Cyrillic_yu,             Cyrillic_YU      ]       };
-    key <AB10> {        [                   slash,                question      ], 
-                        [              numerosign,                question      ]       };
-    key	<LSGT> {	[		     less,	           greater	],
-			[		      bar,		brokenbar	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/lt	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-// $XFree86$
-// Lithuanian keyboard map by Ričardas Čepas <[email protected]>
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Describes popular Lithuanian keymap 'Baltic' aka querty/numeric
-// Don't rename this file because it includes 'lt'
-// Extensions:  „ “ instead of 9 0 in Lithuanian mode, endash/Euro on 102nd key
-//  Usage:  setxkbmap -option grp:shift_toggle 'lt'
-//   # +lt(left_switch) turns key between left ctrl and shift on "German" keyboards into AltGr
-// Option	"XkbModel"	"pc105"
-// Option	"XkbLayout"	"lt+lt(left_switch)"
-//   # Double shift toggles between numbers and Lithuanian letters, you may choose other keys
-// Option	"XkbOptions"	"grp:shift_toggle"
-
-
-partial default alphanumeric_keys modifier_keys 
-xkb_symbols "basic" {
-
-include "us(basic)"
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Lithuanian";
-    include "lt(us_group2)"
-
-    key	<AE01> {	[		1,	    exclam	],
-			[	  onequarter,	    1	]	};
-    key	<AE02> {	[		2,		at	],
-			[	   onehalf,	    doublequote]	};
-    key	<AE03> {	[		3,	numbersign	],
-			[	  threequarters,	   3	]	};
-    key	<AE04> {	[		4,	    dollar	],
-			[	currency,	 4	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[	  cent,	   5	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[	   degree,	    6	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[	  section,	   7	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[	  multiply,	   question	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[ doublelowquotemark,    parenleft	]	};
-    key	<AE10> {	[		0,	parenright	],
-// this is actually right quote for Lithuanian
-			[ leftdoublequotemark,  parenright	]	};
-
-
-
-    key	<AE12> {	[	    equal,	      plus	],
-			[	   zcaron,	    Zcaron	]	};
-    key	<LSGT> {	[	   endash,	  EuroSign 	],
-			[	   endash,	  EuroSign 	]	};
-
-    key <AD01> {	[], [	  q,	Q 		],	 
-			    [	  onesuperior,    aogonek] 	};
-    key <AD02> {	[], [	  w,	W		],
-			    [	  twosuperior,	  zcaron]};
-    key <AD03> {	[], [	  e,	E		],
-			    [	  threesuperior]	};
-		
-    key <AD04> {	[], [	  r,	R		],
-			    [ 	  registered]			};
-    key <AD05> {	[], [	  t,	T		]	};
-    key <AD06> {	[], [	  y,	Y		]	};
-    key <AD07> {	[], [	  u,	U		]	};
-    key <AD08> {	[], [	  i,	I		]	};
-    key <AD09> {	[], [	  o,	O		]	};
-    key <AD10> {	[], [	  p,	P		]	};
-    key <AD11> {	[], [ bracketleft,	braceleft	],	
-			    [         iogonek,         Iogonek      ]        };
-    key <AD12> {	[], [ bracketright,	braceright	]	};
-
-    key <AC01> {	[], [	  a,	A 		]	};
-    key <AC02> {	[], [	  s,	S		],	
-			    [	  ssharp]	};
-    key <AC03> {	[], [	  d,	D		]	};
-    key <AC04> {	[], [	  f,	F		]	};
-    key <AC05> {	[], [	  g,	G		]	};
-    key <AC06> {	[], [	  h,	H		]	};
-    key <AC07> {	[], [	  j,	J		]	};
-    key <AC08> {	[], [	  k,	K		]	};
-    key <AC09> {	[], [	  l,	L		],	
-			    [	  sterling ]		};
-    key <AC10> {	[], [ semicolon,	colon		],	
-			    [ uogonek,		Uogonek]	};
-    key <AC11> {	[], [ quoteright,	quotedbl	],	
-			    [ eabovedot,	Eabovedot	] };
-    key <AC12>  {	[], [ slash,		bar	]	};
-
-    key <AB01> {	[], [	  onesuperior,	twosuperior		],	
-			    [	  threesuperior]	};
-    key <AB02> {	[], [	  z,	Z 		]	};
-    key <AB03> {	[], [	  x,	X		],
-			    [     umacron,	Umacron]	};
-    key <AB04> {	[], [	  c,	C		]	};
-    key <AB05> {	[], [	  v,	V		]	};
-    key <AB06> {	[], [	  b,	B		]	};
-    key <AB07> {	[], [	  n,	N		],
-		            [	  notsign	]	};
-    key <AB08> {	[], [	  m,	M		]	};
-    key <AB09> {	[], [     comma,	less		],
-			    [	  ccaron,	Ccaron	]	};
-    key <AB10> {	[], [    period,	greater		],	
-			    [    middledot,	scaron,		Scaron] };
-    key <AB11> {	[], [     slash,	question	]	};
-    key <BKSL> {	[], [ backslash,	question		],	
-			    [ division,		eogonek] };
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "us_group2" {
-
-    // Keyboard must work as usual when "Lithuanian" group is locked.
-    key <TLDE> {	[], [ quoteleft,	asciitilde	]	};
-    key <AE01> {	[], [	  1,	exclam 		]	};
-    key <AE02> {	[], [	  2,	at		]	};
-    key <AE03> {	[], [	  3,	numbersign	]	};
-    key <AE04> {	[], [	  4,	dollar		]	};
-    key <AE05> {	[], [	  5,	percent		]	};
-    key <AE06> {	[], [	  6,	asciicircum	]	};
-    key <AE07> {	[], [	  7,	ampersand	]	};
-    key <AE08> {	[], [	  8,	asterisk	]	};
-    key <AE09> {	[], [	  9,	parenleft	]	};
-    key <AE10> {	[], [	  0,	parenright	]	};
-    key <AE11> {	[], [     minus,	underscore	]	};
-    key <AE12> {	[], [     equal,	plus		]	};
-
-    key <AD01> {	[], [	  q,	Q 		]	};
-    key <AD02> {	[], [	  w,	W		]	};
-    key <AD03> {	[], [	  e,	E		]	};
-    key <AD04> {	[], [	  r,	R		]	};
-    key <AD05> {	[], [	  t,	T		]	};
-    key <AD06> {	[], [	  y,	Y		]	};
-    key <AD07> {	[], [	  u,	U		]	};
-    key <AD08> {	[], [	  i,	I		]	};
-    key <AD09> {	[], [	  o,	O		]	};
-    key <AD10> {	[], [	  p,	P		]	};
-    key <AD11> {	[], [ bracketleft,	braceleft	]	};
-    key <AD12> {	[], [ bracketright,	braceright	]	};
-
-    key <AC01> {	[], [	  a,	A 		]	};
-    key <AC02> {	[], [	  s,	S		]	};
-    key <AC03> {	[], [	  d,	D		]	};
-    key <AC04> {	[], [	  f,	F		]	};
-    key <AC05> {	[], [	  g,	G		]	};
-    key <AC06> {	[], [	  h,	H		]	};
-    key <AC07> {	[], [	  j,	J		]	};
-    key <AC08> {	[], [	  k,	K		]	};
-    key <AC09> {	[], [	  l,	L		]	};
-    key <AC10> {	[], [ semicolon,	colon		]	};
-    key <AC11> {	[], [ quoteright,	quotedbl	]	};
-
-    key <AB01> {	[], [	  z,	Z 		]	};
-    key <AB02> {	[], [	  x,	X		]	};
-    key <AB03> {	[], [	  c,	C		]	};
-    key <AB04> {	[], [	  v,	V		]	};
-    key <AB05> {	[], [	  b,	B		]	};
-    key <AB06> {	[], [	  n,	N		]	};
-    key <AB07> {	[], [	  m,	M		]	};
-    key <AB08> {	[], [     comma,	less		]	};
-    key <AB09> {	[], [    period,	greater		]	};
-    key <AB10> {	[], [     slash,	question	]	};
-    key <BKSL> {	[], [ backslash,	bar		]	};
-
-};
-
-
-
-partial alphanumeric_keys 
-xkb_symbols "Sundeadkeys" {
-    include "lt(basic)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "sundeadkeys" {
-    include "lt(Sundeadkeys)" // for consistent naming
-};
-
-partial alphanumeric_keys 
-xkb_symbols "nodeadkeys" {
-    include "lt(basic)" // for consistent naming
-};
-
-// definition for the extra key on 102-key keyboards between left Control and Alt
-// in case you want use it as AltGr
-xkb_symbols "left_switch" {
-    key	<LSGT> {	[     Mode_switch,	 Multi_key 	],
-			[     Mode_switch,	 Multi_key 	]	};
-    // Begin modifier mappings 
-    modifier_map Mod3   { Mode_switch };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/lv	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-
-default partial alphanumeric_keys
-xkb_symbols "type5" {
-include "us(basic)"
-
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Latvian keyboard.
-
-    // Alphanumeric section
-
-    name[group1]="Latvian";
-
-    key <TLDE> {        [       dead_grave, asciitilde      ],
-                        [       question,       soft_hyphen        ]       };
-    key <AE01> {        [       1,      exclam          ],
-                        [       bar,      exclamdown      ]       };
-    key <AE02> {        [       2,        at      ],
-                        [       leftdoublequotemark,      2       ]    };
-    key <AE03> {        [       3,      numbersign      ],
-                        [       rightdoublequotemark,        3      ]     };
-    key <AE04> {        [       4,              dollar          ],
-                        [       section, 4              ]       };
-    key <AE05> {        [       5,              percent          ],
-                        [       EuroSign              ]       };
-    key <AE06> {        [       6,              dead_circumflex],
-                        [      slash,           6]       };
-    key <AE08> {        [       8,              asterisk        ],
-                        [       multiply,       8               ]       };
-    key <AE12> {        [       equal,plus            ],
-                        [       F,              f               ]       };
-    key <AD01> {        [       q,              Q               ],
-                        [       umacron,        Umacron         ]       };
-    key <AD02> {        [       w,              W               ],
-                        [       g,              G               ]       };
-    key <AD03> {        [       e,              E               ],
-                        [       j,              J       ]       };
-    key <AD04> {        [       r,              R               ],
-                        [       r,              R       ]       };
-    key <AD05> {          [       t,            T              ],
-                        [       m,              M       ]       };
-    key <AD06> {          [       y,            Y              ],
-                        [       v,              V       ]       };
-    key <AD07> {        [       u,              U               ],
-                        [       n,      N               ]       };
-    key <AD08> {        [       i,              I               ],
-                        [       z,              Z       ]       };
-    key <AD09> {        [       o,              O               ],
-                        [       emacron,        Emacron         ]       };
-    key <AD10> {        [       p,              P              ],
-                        [       emacron,    Emacron         ]};
-    key <AD11> {        [       bracketleft,    braceleft       ],
-                        [       zcaron,    Zcaron          ]       };
-    key <AD12> {        [       bracketright,    braceright       ],
-                        [       h,               h       ]};
-    key <AC01> {        [       a,              A               ],
-                        [       smacron,        Smacron         ]       };
-    key <AC02> {        [       s,              S               ],
-                        [       u,              U               ]       };
-    key <AC03> {        [       d,              D               ],
-                        [       s,              S       ]};
-    key <AC04> {        [       f,              F               ],
-                        [       i,              I       ]};
-    key <AC05> {        [       g,              G               ],
-                        [       l,             L       ]};
-    key <AC06> {        [       h,              H               ],
-                        [       d,              D       ]};
-    key <AC07> {        [       j,              J               ],
-                        [       a,              AD       ]};
-    key <AC08> {        [       k,              K               ],
-                        [       t,      T       ]       };
-    key <AC09> {        [       l,              L               ],
-                        [       e,      E       ]       };
-    key <AC10> {        [       semicolon,    colon               ],
-                        [       C,              c ]      };
-    key <AC11> {        [       apostrophe,quotedbl               ],
-                        [       degree,         apostrophe    ]  };
-    key <AC12> {        [       degree,         brokenbar         ],
-                        [        kcedilla,  Kcedilla        ]};
-    key <BKSL> {        [       degree,         bar             ]       };
-    key <LSGT> {        [       backslash,      bar             ]       };
-    key <AB01> {        [       backslash,      bar                     ],
-                        [       gcedilla,  Gcedilla        ]};
-    key <AB02> {        [       z,              Z                     ],
-                        [       ncedilla,       Ncedilla ]};
-    key <AB03> {        [       x,              X               ],
-                        [       b,              B               ]       };
-    key <AB04> {        [       c,              C               ],
-                        [       imacron,    Imacron         ]};
-    key <AB05> {        [       v,              V               ],
-                        [       k,           K         ]};
-    key <AB06> {        [       b,              B               ],
-                        [       p,      P       ]       };
-    key <AB07> {        [       n,              N               ],
-                        [       o,      O       ]       };
-    key <AB08> {        [       m,              M               ],
-                        [       amacron,        Amacron ]       };
-    key <AB09> {        [       comma,          less            ],
-                        [       semicolon,      comma   ]       };
-    key <AB10> {        [       period,         greater         ],
-                        [       colon,  period  ]       };
-    key <AB11> {        [       slash,          question                ],
-                        [       lcedilla,       Lcedilla        ]       };
-
-
-    // End alphanumeric section
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "lv(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "lv(Sundeadkeys)"
-
-};
--- a/src/xorg/keytables/sun-src/symbols/sun/nl	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-    // A few keys are different
-
-    key <BKSL> { [ at, section		], [notsign ]		};
-    key <BRCR> { [ backslash, bar	]			};
-    key <AE01> { [ 1, exclam		], [onesuperior	]	};
-    key <AE02> { [ 2, quotedbl		], [twosuperior	]	};
-    key <AE03> { [ 3, numbersign	], [threesuperior]	};
-    key <AE04> { [ 4, dollar		], [onequarter	]	};
-    key <AE05> { [ 5, percent		], [onehalf	]	};
-    key <AE06> { [ 6, ampersand		], [threequarters]	};
-    key <AE07> { [ 7, underscore	], [sterling	]	};
-    key <AE08> { [ 8, parenleft		], [braceleft	]	};
-    key <AE09> { [ 9, parenright	], [braceright	]	};
-    key <AE10> { [ 0, quoteright	], [quoteleft	]	};
-    key <AE11> { [ slash, question	], [backslash  ]	};
-    key <AE12> { [ degree, SunFA_Tilde	], [SunFA_Cedilla]	};
-    key <AD03> { [ e, E			], [EuroSign, Eacute	]};
-    key <AD11> { [ SunFA_Diaeresis, SunFA_Circum ], [asciitilde, asciicircum]};
-    key <AD12> { [ asterisk, bar	], [asciitilde	]	};
-    key <AC02> { [ S, S		], [ssharp	]		};
-    key <AC10> { [ plus, plusminus	]			};
-    key <AC11> { [ SunFA_Acute, SunFA_Grave]			};
-    key <TLDE> { [ less, greater	], [asciicircum	]	};
-    key <LSGT> { [ bracketleft, bracketright], [brokenbar ]	};
-    key <AB01> { [ z, Z		], [guillemotleft]	};
-    key <AB02> { [ x, X		], [guillemotright]	};
-    key <AB03> { [ c, C		], [cent	]	};
-    key <AB07> { [ m, M		], [Greek_mu, masculine ]	};
-    key <AB08> { [ comma, semicolon	], [cedilla, guillemotleft]	};
-    key <AB09> { [ period, colon	], [periodcentered, guillemotright ] };
-    key <AB10> { [ minus, equal		], [hyphen ]		};
-    key <CAPS> { [ SunAltGraph		]			};
-//    key <COMP> { [ SunCompose		]			};
-    key <ALGR> { [ Caps_Lock		]			}; 
-};
-
-
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-
-    key <AE01> {	[         1,	exclam   	],
-			[ onesuperior			]	};
-    key <AE02> {	[         2,	quotedbl 	],
-			[ twosuperior			]	};
-    key <AE03> {	[         3,	numbersign	],
-			[ threesuperior			]	};
-    key <AE04> {	[         4,	dollar   	],
-			[ onequarter			]	};
-    key <AE05> {	[         5,	percent  	],
-			[ onehalf			]	};
-    key <AE06> {	[         6,	ampersand	],
-			[ threequarters			]	};
-    key <AE07> {	[         7,	underscore	],
-			[  sterling			]	};
-    key <AE08> {	[         8,	parenleft	],
-			[ braceleft			]	};
-    key <AE09> {	[         9,	parenright	],
-			[ braceright			]	};
-    key <AE10> {	[         0,	quoteright	],	
-			[ quoteleft                     ]       };              
-    key <AE11> {	[     slash,	question 	],
-			[ backslash			]	};
-    key <AE12> {	[    degree,	SunFA_Tilde	],
-			[ SunFA_Cedilla			]	};
-    key <AD03> {	[         e,	E        	],
-			[    EuroSign		   	]	};
-    key <AD11> {	[ SunFA_Diaeresis, SunFA_Circum ]	};
-    key <AD12> {	[  asterisk,	bar      	],
-                        [  asciitilde 			]	};
-    key <AC02> {	[         s,	S        	],
-			[    ssharp			]	};
-    key <AC10> {	[      plus,	plusminus	]	};
-    key <AC11> {	[ SunFA_Acute,   SunFA_Grave    ]	};
-    key <LSGT> {	[ bracketleft,	bracketright	],
-			[ brokenbar			]	};
-    key <TLDE> {	[      	at,	section  	],
-			[  notsign			]	};
-    key <BKSL> {	[      less,	greater  	],	
-                        [ asciicircum			]       };
-    key <AB01> {	[         z,	Z        	],
-			[ guillemotleft			]	};
-    key <AB02> {	[         x,	X        	],
-			[ guillemotright		]	};
-    key <AB03> {	[         c,	C        	],
-			[      cent			]	};
-    key <AB07> {	[ 	m,	M		],
-			[	mu			]	};
-    key <AB08> {        [     comma,	semicolon	]       };
-    key <AB09> {        [    period,	colon		]       };
-    key <AB10> {        [     minus,	equal           ]       };
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/no	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-    // A few keys are different
-
-    key <BKSL> { [ bar, section		]			};
-    key <BRCR> { [ asciitilde, asciicircum]			};
-    key <AE02> { [ 2, quotedbl		], [at		]	};
-    key <AE03> { [ 3, numbersign	], [sterling	]	};
-    key <AE04> { [ 4, currency		], [dollar	]	};
-    key <AE06> { [ 6, ampersand		]			};
-    key <AE07> { [ 7, slash		], [braceleft	]	};
-    key <AE08> { [ 8, parenleft		], [bracketleft	]	};
-    key <AE09> { [ 9, parenright	], [bracketright]	};
-    key <AE10> { [ 0, equal		], [braceright	]	};
-    key <AE11> { [ plus, question	]			};
-    key <AE12> { [ backslash, SunFA_Grave], [SunFA_Acute]	};
-    key <AD03> { [ e, E			], [EuroSign	]	};
-    key <AD11> { [ Aring		]			};
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Circum],[SunFA_Tilde] };
-    key <LCTL> { [ Caps_Lock		]			};
-    key <AC10> { [ Ooblique		]			};
-    key <AC11> { [ AE			]			};
-    key <TLDE> { [ quoteright, asterisk ], [quoteleft	]	};
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    key <CAPS> { [ Control_L		]			};
-
-};
-
-xkb_symbols "type5" {
-    include "no"
-
-    key <AE05> { [ 5, percent		], [asciitilde			]};
-    key <AE06> { [ 6, ampersand		], [asciicircum			]};
-    key <AE07> { [ 7, slash		], [ braceleft			]};
-    key <AE08> { [ 8, parenleft		], [ bracketright		]};
-    key <AE09> { [ 9, parenright	], [ bracketright		]};
-    key <AE10> { [ 0, equal		], [ braceright			]};
-
-    key <BKSL> { [ quoteright, asterisk	], [ quoteleft			]};
-    key <LSGT> { [ less, greater	]				};
-};
-
-
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-
-    key <TLDE> {	[             bar,         section      ]	};
-    key <LSGT> {	[	     less,	   greater	]	};
-    key <BKSL> {	[      apostrophe,      asterisk	],
-			[	grave				]	};
-    key <AE02> {	[               2,        quotedbl  	],
-			[	       at			]	};
-    key <AE03> {	[              	3,	numbersign	],
-			[	 sterling			]	};
-    key <AE04> {	[               4,        currency     	],
-			[	   dollar			]	};
-    key <AE05> {	[               5,         percent     	],
-			[        asciitilde			]	};
-    key <AE06> {	[               6,       ampersand     	],
-			[      asciicircum			]	};
-    key <AE07> {	[               7,           slash     	],
-			[       braceleft			]	};
-    key <AE08> {	[               8,       parenleft     	],
-			[     bracketleft			]	};
-    key <AE09> {	[               9,      parenright     	],
-			[    bracketright			]	};
-    key <AE10> {	[               0,           equal     	],
-                        [      braceright			]	};
-    key <AE11> {	[            plus,        question      ]	};
-    key <AE12> {   	[       backslash,      SunFA_Grave     ],
-                 	[      SunFA_Acute          	        ]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign		        ]	};
-    key <AD11> {	[	    aring,           Aring 	]	};
-    key <AD12> {   	[ SunFA_Diaeresis,    SunFA_Circum      ],
-                 	[      SunFA_Tilde			]	};
-    key	<AC10> {	[	   oslash,        Oslash 	]	}; 
-    key	<AC11> {	[	       ae,	        AE	]	};
-    key <AB08> {        [	    comma,	semicolon	]       };
-    key <AB09> {        [	    period,	colon		]       };
-    key <AB10> {        [	     minus,	underscore      ]       };
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/pl	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type5" {
-    include "sun/us(type5basic)"
-    // A few keys are different
-    key <TLDE> { [ quoteleft, asciitilde], [ degree, degree ]	};
-    key <AE02> { [ 2, quotedbl		], [ at		]	};
-    key <AE03> { [ 3, colon		], [ numbersign	]	};
-    key <AE04> { [ 4, question		], [ dollar	]	};
-    key <AE06> { [ 6, plus		], [ asciicircum ]	};
-    key <AE07> { [ 7, underscore	], [ ampersand	]	};
-    key <AE08> { [ 8, parenleft		], [ asterisk	]	};
-    key <AE09> { [ 9, parenright	]			};
-    key <AE10> { [ 0, equal		]			};
-    key <AE11> { [ zabovedot, Zabovedot	]			};
-    key <AE12> { [ dead_ogonek, Aacute ]			};
-    key <AD11> { [ oacute, zacute	], [ bracketleft, braceleft ] };
-    key <AD12> { [ slash, section	], [ bracketright, braceright ] };
-    key <AC02> { [ s, S			], [ ssharp	]	};
-    key <AC08> { [ k, K			], [ ampersand	]	};
-    key <AC10> { [ lstroke, Lstroke	]			};
-    key <AC11> { [ aogonek, eogonek	], [ quoteright	]	};
-    key <BKSL> { [ backslash, semicolon	], [ currency, bar ]	};
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, sacute	], [ less	]	};
-    key <AB09> { [ period, nacute	], [ greater	]	};
-    key <AB10> { [ minus, cacute	]			};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/pl_dev	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-// $Xorg: pl,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
-
-// $XFree86: xc/programs/xkbcomp/symbols/pl,v 3.5 2001/01/17 23:45:59 dawes Exp $
-
-//  Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple QWERTY Polish keybaord
-    // Polish Developer version
-
-    name[Group1]= "Polish";
-
-    key <TLDE> { [ grave, 		asciitilde	]	};
-    key <AE01> { [ 1,			exclam		]	};
-    key <AE02> { [ 2,			at		]	};
-    key <AE03> { [ 3,			numbersign 	]	};
-    key <AE04> { [ 4,			dollar	 	]	};
-    key <AE05> { [ 5,			percent 	]	};
-    key <AE06> { [ 6,			asciicirum	]	};
-    key <AE07> { [ 7,			ampersand	]	};
-    key <AE08> { [ 8,			asterisk	]	};
-    key <AE09> { [ 9,			parenleft	]	};
-    key <AE10> { [ 0,			parenright	]	};
-    key <AE11> { [ minus,		underscore 	]	};
-    key <AE12> { [ equal,		plus	 	]	};
-    key <AD03> { [ e,			E		], 	
-		 [ eogonek,		Eogonek		]	};       
-    key <AD07> { [ u,			U		],
-                 [ EuroSign				]	};
-    key <AD09> { [ o,			O		],	
-		 [ oacute,		Oacute		]	};
-    key <AD11> { [ bracketleft, 	braceleft	]	};
-    key <AD12> { [ bracketright,	braceright	]	};
-    key <AC01> { [ a,			A		],
-		 [ aogonek,		Aogonek		]	};
-    key <AC02> { [ s,			S		],
-		 [ sacute,		Sacute		]	};
-    key <AC09> { [ l,			L		],
-		 [ lstroke,             Lstroke		]	};
-    key <AC10> { [ semicolon,		colon		]	};
-    key <AC11> { [ apostrophe,		quotedbl 	]	};
-    key <BKSL> { [ backslash,		bar		],
-		 [	brokenbar			]	};
-    key <AB01> { [ z, 			Z	 	],
-		 [ zabovedot,		Zabovedot	]	};
-    key <AB02> { [ x,			X	 	],
-		 [ zacute,		Zacute		]	};
-    key <AB03> { [ c,			C	 	],
-		 [ cacute,		Cacute		]	};
-    key <AB06> { [ n,			N	 	],
-		 [ nacute,		Nacute		]	};
-    key <AB08> { [ comma,		less 		]	};
-    key <AB09> { [ period,		greater	 	]	};
-    key <AB10> { [ slash,		question	]	};
-
-    key <LSGT> { [ less,		greater		],
-		 [ bar,			brokenbar	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3	{ Mode_switch };
-};
-
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-  include "sun/pl_dev(basic)"
-
-};
--- a/src/xorg/keytables/sun-src/symbols/sun/pt	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type4" {
-    //this is a Portugal4 keyboard
-
-    key <BKSL> { [ bracketleft, braceleft], [guillemotleft]	};
-    key <BRCR> { [ bracketright, braceright], [guillemotright]	};
-    key <AE02> { [ 2, quotedbl		], [at		]	};
-    key <AE03> { [ 3, numbersign	], [sterling	]	};
-    key <AE04> { [ 4, dollar		], [section	]	};
-    key <AE06> { [ 6, ampersand		], [notsign	]	};
-    key <AE07> { [ 7, slash		]			};
-    key <AE08> { [ 8, parenleft		]			};
-    key <AE09> { [ 9, parenright	], [backslash	]	};
-    key <AE10> { [ 0, equal		], [bar		]	};
-    key <AE11> { [ quoteright, question	], [quoteleft	]	};
-    key <AE12> { [ exclamdown, questiondown]			};
-    key <AD03> { [ e, E			], [EuroSign	]	};
-    key <AD11> { [ SunFA_Diaeresis, asterisk], [plus	]	};
-    key <AD12> { [ SunFA_Acute, SunFA_Grave], [asciitilde]	};
-    key <LCTL> { [ Caps_Lock		]			};
-    key <AC10> { [ Ccedilla		]			};
-    key <AC11> { [ masculine, ordfeminine]			};
-    key <TLDE> { [ SunFA_Tilde, SunFA_Circum], [asciicircum]	};
-    key <LSGT> { [ less, greater	]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    key <CAPS> { [ Control_L		]			};
-
-};
-
-xkb_symbols "type5" {
-    include "pt"
-
-    key <TLDE> { [ backslash, bar	]				};
-    key <AE05> { [ 5, percent		], [asciitilde			]};
-    key <AE06> { [ 6, ampersand		], [asciicircum			]};
-    key <AE07> { [ 7, slash		], [ braceleft			]};
-    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
-    key <AE09> { [ 9, parenright	], [ bracketright		]};
-    key <AE10> { [ 0, equal		], [ braceright			]};
-    key <AE11> { [ quoteright, question	], [quoteleft			]};
-
-    key <AD11> { [ plus, asterisk	], [SunFA_Diaeresis		]};
-
-};
-
- 
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-
-    key <LSGT> {	[	     less,	   greater	]	};
-    key <TLDE> { 	[       backslash,             bar      ]       };
-    key <AE02> {        [               2,        quotedbl      ],
-                        [              at			]       };
-    key <AE03> {        [               3,	numbersign	],
-                        [	sterling			]       };
-    key <AE04> {        [               4,	dollar		],
-                        [	section				]       };
-    key <AE05> { 	[ 		5,	percent		],
-			[	asciitilde			]	};
-    key <AE06> {	[		6,	ampersand	],
-			[	asciicircum			]	};
-    key <AE07> {	[		7,	slash		],
-			[	 braceleft			]	};
-    key <AE08> {	[		8,	parenleft	],
-			[ 	bracketleft			]	};
-    key <AE09> {	[		9,	parenright	],
-			[	bracketright			]	};
-    key <AE10> { 	[		0,	equal		],
-			[	 braceright			]	};
-    key <AE11> { 	[	quoteright,	question	],
-			[	quoteleft			]	};
-    key <AE12> {	[   guillemotleft,  guillemotright     	]	};
-    key <AD03> {        [               e,               E      ],
-                        [        EuroSign			]       };
-    key <AD11> {	[	     plus,        asterisk 	],
-			[ SunFA_Diaeresis			]	};
-    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
-    key <BKSL> {	[     SunFA_Tilde,    SunFA_Circum	]	};
-    key <AC10> {        [        ccedilla,        Ccedilla      ]       };
-    key <AC11> {	[       masculine,     ordfeminine      ]	};
-    key <AB08> {        [           comma,       semicolon      ]       };
-    key <AB09> {        [          period,           colon      ]       };
-    key <AB10> {        [           minus,      underscore      ]       };
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/ru	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// layout for a Sun Type 6 Russian keyboard
-partial
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-
-    key <AE02> {        [               2,	quotedbl        	],
-                        [              at			]       };
-    key <AE03> {        [               3,	numerosign      ],
-                        [               3,	numbersign      ]       };
-    key	<AE04> {	[		4,	percent		],
-			[		4,	dollar		]	};
-    key	<AE05> {	[		5,	colon    	],
-			[		5,	percent		]	};
-    key	<AE07> {	[		7,	period		],
-			[		7,	ampersand	]	};
-    key	<AE08> {	[		8,	semicolon 	],
-			[		8,	asterisk  	]	};
-
-    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	],
-			[		q,		 Q	]	};
-    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	],
-			[		w,		 W	]	};
-    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	],
-			[		e,		 E	]	};
-    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	],
-			[		r,		 R	]	};
-    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	],
-			[		t,		 T	]	};
-    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	],
-			[		y,		 Y	]	};
-    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	],
-			[		u,		 U	]	};
-    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	],
-			[		i,		 I	]	};
-    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	],
-			[		o,		 O	]	};
-    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	],
-			[		p,		 P	]	};
-    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	],
-			[     bracketleft,	 braceleft	]	};
-    key	<AD12> {	[ Cyrillic_hardsign, Cyrillic_HARDSIGN	],
-			[    bracketright,	braceright	]	};
-    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	],
-			[		a,		 A	]	};
-    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	],
-			[		s,		 S	]	};
-    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	],
-			[		d,		 D	]	};
-    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	],
-			[		f,		 F	]	};
-    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	],
-			[		g,		 G	]	};
-    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	],
-			[		h,		 H	]	};
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	],
-			[		j,		 J	]	};
-    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	],
-			[		k,		 K	]	};
-    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	],
-			[		l,		 L	]	};
-    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	],
-			[	semicolon,	     colon	]	};
-    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	],
-			[      apostrophe,	  quotedbl	]	};
-    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	],
-			[		z,		 Z	]	};
-    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	],
-			[		x,		 X	]	};
-    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	],
-			[		c,		 C	]	};
-    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	],
-			[		v,		 V	]	};
-    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	],
-			[		n,		 N	]	};
-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	],
-			[		b,		 B	]	};
-    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	],
-			[		m,		 M	]	};
-    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	],
-			[	    comma,	      less	]	};
-    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	],
-			[	   period,	   greater	]	};
-    key	<BKSL> {	[	    slash,	  question	],
-			[       backslash,             bar	]	};
-    key	<AB10> {	[      ediaeresis,      Ediaeresis 	],
-			[	    slash,        question	]	};
-    key	<LSGT> {	[	backslash,	       bar	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/se	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,285 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Swedish layout for a Type 5/5c Sun keyboard
-xkb_symbols "sun5" {
-    include "en_US(basic)+se(basic)"
-
-    // Begin alphanumeric section
-    // These two are not supposed to be dead.
-    // A few others supposedly ARE dead, but don't care for now.
-    key <AC12> { [ apostrophe, asterisk	], 	[ 	grave ] };
-    key <AD12> { [			],	[  asciitilde ] };
-
-    key <RTSH> { [ 	Shift_R		]	};
-
-    key <LALT> { [	Alt_L		]	};
-    key <ALGR> { [	Mode_switch	]	};
-    key <LMTA> { [	Meta_L		]	};
-    key <RMTA> { [	Meta_R		]	};
-    key <COMP> { [	Multi_key	]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1		]			};
-    key <FK02> { [ F2		]			};
-    key <FK03> { [ F3		]			};
-    key <FK04> { [ F4		]			};
-    key <FK05> { [ F5		]			};
-    key <FK06> { [ F6		]			};
-    key <FK07> { [ F7		]			};
-    key <FK08> { [ F8		]			};
-    key <FK09> { [ F9		]			};
-    key <FK10> { [ F10		]			};
-    key <FK11> { [ F11		],	[ SunF36]	};
-    key <FK12> { [ F12		],	[ SunF37]	};
-    key <STOP> { [ Cancel 	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ Print	],	[ Sys_Req, SunSys_Req ]	};
-    key <SCLK> { [ Scroll_Lock	]			};
-    key <PAUS> { [ Pause	],	[ Break	]	};
-    key <LEFT> { [ Left		]			};
-    key <RGHT> { [ Right	]			};
-    key <UP>   { [ Up		]			};
-    key <DOWN> { [ Down		]			};
-
-    key <DELE> { [ Delete	]			};
-    key <INS>  { [ Insert	]			};
-    key <PGUP> { [ Prior	]			};
-    key <PGDN> { [ Next		]			};
-    key <HOME> { [ Home		]			};
-    key <END>  { [ End		]			};
-    key <HELP> { [ Help		]			};
-    // End "Editing" section
-    
-    // Begin "Keypad" section
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ KP_Divide		],	[	F25	]	};
-    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
-    key <KPSU> { [ KP_Subtract		]				};
-
-    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
-    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
-    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
-    key <KPAD> { [  	KP_Add		]				};
-
-    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
-    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
-    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
-
-    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
-    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
-    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
-    key <KPEN> { [  	KP_Enter	]				};
-
-    key  <KP0> { [  KP_Insert,	KP_0	]				};
-    key <KPDL> { [  KP_Delete,	KP_Decimal ]				};
-    // End "Keypad" section, 
-
-    // Begin "four keys up on the right"
-    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
-    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
-    // End "four keys up on the right"
-
-    // Begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2   { Num_Lock };
-    modifier_map Mod3	{ Mode_switch };
-    modifier_map Mod4	{ Alt_L };
-    // End modifier mappings
-};
-
-// Swedish layout for a Type 4 Sun keyboard
-xkb_symbols "sun4" {
-    include "en_US(basic)+se(basic)"
-
-    // Begin alphanumeric section
-    // These two are not supposed to be dead.
-    // A few others supposedly ARE dead, but don't care for now.
-    key <AC12> { [ apostrophe, asterisk	], 	[ 	grave ] };
-    key <AD12> { [			],	[  asciitilde ] };
-
-    key <AF14> { [	asciitilde,	asciicircum	] };
-
-    key <RTSH> { [ 	Shift_R		]	};
-
-    key <LALT> { [	Alt_L		]	};
-    key <ALGR> { [	Mode_switch	]	};
-    key <LMTA> { [	Meta_L		]	};
-    key <RMTA> { [	Meta_R		]	};
-    key <COMP> { [	Multi_key	]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1		]			};
-    key <FK02> { [ F2		]			};
-    key <FK03> { [ F3		]			};
-    key <FK04> { [ F4		]			};
-    key <FK05> { [ F5		]			};
-    key <FK06> { [ F6		]			};
-    key <FK07> { [ F7		]			};
-    key <FK08> { [ F8		]			};
-    key <FK09> { [ F9		]			};
-    key <FK10> { [ F10		]			};
-    key <FK11> { [ F11		],	[ SunF36]	};
-    key <FK12> { [ F12		],	[ SunF37]	};
-    key <STOP> { [ Cancel 	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <LNFD> { [ Linefeed	]	};
-    key <DELE> { [ Delete	]			};
-    key <PRSC> { [ Print	],	[ Sys_Req, SunSys_Req ]	};
-    key <SCLK> { [ Scroll_Lock	]			};
-    key <PAUS> { [ Pause	],	[ Break	]	};
-    key <HELP> { [ Help		]			};
-    // End "Editing" section
-    
-    // Begin "Keypad" section
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPEQ> { [ KP_Equal		]				};
-    key <KPDV> { [ KP_Divide		],	[	F25	]	};
-    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
-    key <KPSU> { [ KP_Subtract		]				};
-
-    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
-    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
-    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
-    key <KPAD> { [  	KP_Add		]				};
-
-    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
-    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
-    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
-
-    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
-    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
-    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
-    key <KPEN> { [  	KP_Enter	]				};
-
-    key  <KP0> { [  KP_Insert,	KP_0	]				};
-    key <KPDL> { [  KP_Delete,	KP_Decimal ]				};
-    // End "Keypad" section, 
-
-    // Begin modifier mappings
-    modifier_map Shift	{ Shift_R };
-    modifier_map Mod1	{ Alt_L };
-    modifier_map Mod2	{ Num_Lock };
-    modifier_map Mod3	{ Mode_switch };
-    modifier_map Mod4	{ Meta_L };
-    modifier_map Mod5	{ Meta_R };
-    // End modifier mappings
-};
-
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Swedish keyboard
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-
-    key <TLDE> {	[         section,         onehalf    	]	};
-    key <LSGT> {	[	     less,	   greater      ],
-                 	[             bar			]	};
-    key <AE02> {	[               2,        quotedbl  	],
-			[	       at			]	};
-    key <AE03> {	[              	3,	numbersign	],
-			[	 sterling			]	};
-    key <AE04> {	[               4,        currency     	],
-			[	   dollar			]	};
-    key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash     	],
-			[       braceleft			]	};
-    key <AE08> {	[               8,       parenleft     	],
-			[     bracketleft			]	};
-    key <AE09> {	[               9,      parenright     	],
-			[    bracketright			]	};
-    key <AE10> {	[               0,           equal     	],
-                  	[      braceright 		    	]	};
-    key <AE11> {	[            plus,        question     	],
-			[       backslash			]	};
-    key <AE12> {  	[      SunFA_Acute,      SunFA_Grave   	]	};
-    key <AD03> {  	[               e,               E     	],
-                  	[        EuroSign		 	]	};
-    key <AD11> {	[	    aring,           Aring 	]	};
-    key <AD12> {  	[  SunFA_Diaeresis,    asciicircum     	],
-                 	[      asciitilde 		    	]	};
-    key <AC10> {	[      odiaeresis,      Odiaeresis	]	};
-    key <AC11> {	[      adiaeresis,      Adiaeresis	]	};
-    key <BKSL> {	[      apostrophe,        asterisk	],
-                 	[           grave 			]	};
-    key <AB08> {	[           comma,       semicolon 	]	};
-    key <AB09> {	[          period,           colon     	]	};
-    key <AB10> {	[           minus,      underscore     	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/sk	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    key <TLDE>  { 	[       semicolon,      dead_abovering  ],
-			[       quoteleft,          asciitilde  ]	};
-    key <AE01>  { 	[	     plus,         1		],
-		  	[          exclam,          asciitilde	]	};
-    key <AE02>  {	[	   lcaron,         2		],
-			[              at,          dead_caron  ]	};
-    key <AE03>  {	[	   scaron,         3		],
-			[      numbersign,        SunFA_Circum	]	};
-    key <AE04>  {	[          ccaron,         4		],
-			[          dollar,          dead_breve	]	};
-    key <AE05>  {	[	   tcaron,         5		],
-			[         percent,      dead_abovering  ]	};
-    key <AE06>  {	[	   zcaron,         6		],
-			[     asciicircum,         dead_ogonek  ]	};
-    key <AE07>  {	[	   yacute,         7		],
-			[       ampersand,               grave  ]	};
-    key <AE08>  {	[	   aacute,         8		],
-			[        asterisk,       dead_abovedot  ]	};
-    key <AE09>  {	[	   iacute,         9		],
-			[       parenleft,          apostrophe  ]	};
-    key <AE10>  {	[	   eacute,         0		],
-			[      parenright,    dead_doubleacute  ]	};
-    key <AE11>  {	[	    equal,             percent	],
-			[  dead_diaeresis,           backslash	]	};
-    key <AE12>  {	[     SunFA_Acute,          dead_caron	],
-			[    dead_cedilla,               minus 	]	};
-    key <AD01>  {	[ 		q,         Q		],
-			[       backslash		        ]	};
-    key <AD02>  {	[	        w,         W		],
-			[             bar	                ]	};
-    key <AD03>  {	[	        e,         E		],
-			[        EuroSign 			]	};
-    key <AD06>  {       [               z,         Z            ]       };
-    key <AD11>  {	[	   uacute,               slash	],
-			[        division		        ]	};
-    key <AD12>  {	[      adiaeresis,           parenleft	],
-			[        multiply      			]	};
-    key <AC02>  {	[	        s,         S		],
-			[         dstroke		        ]	};
-    key <AC03>  {	[	        d,         D		],
-			[         Dstroke			]	};
-    key <AC04>  {	[	        f,         F		],
-			[     bracketleft			]	};
-    key <AC05>  {	[	        g,         G		],
-			[    bracketright			]	};
-    key <AC08>  {	[		k,         K		],
-			[         lstroke 		        ]	};
-    key <AC09>  {	[	        l,         L		],
-			[         Lstroke		        ]	};
-    key <AC10>  {	[     ocircumflex,            quotedbl	],
-			[          dollar		        ]	};
-    key <AC11>  {	[         section,              exclam	],
-			[          ssharp   		        ]	};
-    key <AC12>  {	[          ncaron,          parenright	],
-			[        currency,            currency  ]	};
-    key <BKSL>  {	[          ncaron,          parenright	],
-			[       backslash,                 bar  ]	};
-    key <LSGT>  { 	[       backslash,                 bar  ], 
-                        [           slash,           brokenbar  ]       };
-    key <AB01>  {       [               y,        Y             ],
-			[            less  	                ]	};
-    key <AB02>  {	[	        x,        X		],
-			[         greater,          numbersign  ]	};
-    key <AB03>  {	[		c,        C		],
-			[	ampersand	 		]	};
-    key <AB04>  {	[	        v,        V		],
-			[              at 		        ]	};
-    key <AB05>  {	[	        b,        B		],
-			[       braceleft              		]	};
-    key <AB06>  {	[        	n,        N		],
-			[      braceright              		]	};
-    key <AB08>  {	[  	    comma,            question	],
-			[	     less 			]	};
-    key <AB09>  {	[	   period,               colon	],
-			[	  greater			]	};
-    key <AB10>  {	[ 	    minus,          underscore	],
-			[	 asterisk 			]	};
-
-
-};
-
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-  include "sun/sk(basic)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/solaris	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-//-------------------------------------------------------------------------
-//
-// Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-//-------------------------------------------------------------------------
-//
-// ident "@(#)solaris 1.7     05/11/08 SMI"
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Default map provides backwards compatibility with Sun keyboards from
-// long ago and the key mappings still used in Solaris Xsun today
-
-partial default
-xkb_symbols "defaults_common" {
-
-    // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards
-    // and the names have stuck (you can spot a longtime Sun admin when you
-    // hear them say to hit "L1-A" to enter the OpenBoot PROM)
-    // These names get mapped to the keysyms F11-F20
-    key <STOP> { [ L1,  L1              ], [ SunStop    ]       };
-    key <AGAI> { [ L2,  L2              ], [ SunAgain   ]       };
-    key <PROP> { [ L3,  L3              ], [ SunProps   ]       };
-    key <UNDO> { [ L4,  L4              ], [ SunUndo    ]       };
-    key <FRNT> { [ L5,  L5              ], [ SunFront   ]       };
-    key <COPY> { [ L6,  L6              ], [ SunCopy    ]       };
-    key <OPEN> { [ L7,  L7              ], [ SunOpen    ]       };
-    key <PAST> { [ L8,  L8              ], [ SunPaste   ]       };
-    key <FIND> { [ L9,  L9              ], [ SunFind    ]       };
-    key <CUT>  { [ L10, L10             ], [ SunCut     ]       };
-
-    // And on the right side, the function keys were labeled R1-R15,
-    // which get mapped to the keysyms F21-F35
-    // This includes the keys that became the numeric keypad
-    key <PAUS> { [ R1,  R1              ], [ Pause              ] };
-    key <PRSC> { [ R2,  R2              ], [ Print              ] };
-    key <SCLK> { [ R3,  R3              ], [ Scroll_Lock, Break ] };
-
-    key <KPEQ> { [ KP_Equal             ], [ R4, KP_Equal       ] };
-    key <KPDV> { [ KP_Divide            ], [ R5, KP_Divide      ] };
-    key <KPMU> { [ KP_Multiply          ], [ R6, KP_Multiply    ] };
-
-    key  <KP7> { [ KP_Home,  KP_7, R7   ], [ R7, KP_7, Home     ] };
-    key  <KP8> { [ KP_Up,    KP_8, R8   ], [ R8, KP_8, Up       ] };
-    key  <KP9> { [ KP_Prior, KP_9, R9   ], [ R9, KP_9, Prior    ] };
-
-    key  <KP4> { [ KP_Left,  KP_4, R10  ], [ R10, KP_4, Left    ] };
-    key  <KP5> { [ KP_Begin, KP_5, R11  ], [ R11, KP_5          ] };
-    key  <KP6> { [ KP_Right, KP_6, R12  ], [ R12, KP_6, Right   ] };
-
-    key  <KP1> { [ KP_End,   KP_1, R13  ], [ R13, KP_1, End     ] };
-    key  <KP2> { [ KP_Down,  KP_2, R14  ], [ R14, KP_2, Down    ] };
-    key  <KP3> { [ KP_Next,  KP_3, R15  ], [ R15, KP_3, Next    ] };
-
-    // F11 & F12 are mapped to SunF36 and SunF37 since they were added
-    // after F11-F35 were already assigned on Sun keyboards
-    key <FK11> { [ SunF36               ], [ F11                ] };
-    key <FK12> { [ SunF37               ], [ F12                ] };
-
-    // These were added to the keyboard much later and simply got mapped
-    // to their logical names
-    key <HELP> { [ Help                 ]                       };
-    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
-    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    key <LALT> { [ Alt_L                ]                       };
-    // key <RALT> { [ Mode_switch          ]                       };
-    // key <ALGR> { [ Mode_switch          ]                       };
-    key <LMTA> { [ Meta_L               ]                       };
-    key <RMTA> { [ Meta_R               ]                       };
-    key <COMP> { [ Multi_key            ]                       };
-};
-
-partial default
-xkb_symbols "defaults" {
-    include "sun/solaris(defaults_common)"
-    // begin modifier mappings
-    modifier_map Shift          { Shift_R, Shift_L };
-    modifier_map Mod1           { Alt_L };
-    modifier_map Mod2           { Num_Lock };
-    modifier_map Mod3           { Alt_R, Mode_switch };
-    modifier_map Mod4           { Meta_L, Meta_R };
-};
-
-partial default
-xkb_symbols "defaults_type7jp" {
-    include "sun/solaris(defaults_common)"
-    // begin modifier mappings
-    modifier_map Shift          { Shift_R, Shift_L };
-    modifier_map Mod1           { Alt_L , Alt_R};
-    modifier_map Mod2           { Num_Lock };
-    modifier_map Mod3           { Mode_switch };
-    modifier_map Mod4           { Meta_L, Meta_R };
-};
-
-// Map the keys to the actual key names instead of the ancient Sun function
-// keys
-partial
-xkb_symbols "keynames" {
-    key <FK11> { [ F11          ],      [ SunF36   ]    };
-    key <FK12> { [ F12          ],      [ SunF37   ]    };
-
-    key <STOP> { [ Cancel	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
-
-    key <HELP> { [ Help		]	                };
-
-    key <PAUS> {  [  Pause                      ]       };
-    key <PRSC> {  [  Print                      ]       };
-    key <SCLK> {  [  Scroll_Lock, Break         ]       };
-
-    key  <KP7> {        [  KP_Home,     KP_7    ]       };
-    key  <KP8> {        [  KP_Up,       KP_8    ]       };
-    key  <KP9> {        [  KP_Prior,    KP_9    ]       };
-
-    key  <KP4> {        [  KP_Left,     KP_4    ]       };
-    key  <KP5> {        [  KP_Begin,    KP_5    ]       };
-    key  <KP6> {        [  KP_Right,    KP_6    ]       };
-
-    key  <KP1> {        [  KP_End,      KP_1    ]       };
-    key  <KP2> {        [  KP_Down,     KP_2    ]       };
-    key  <KP3> {        [  KP_Next,     KP_3    ]       };
-
-    key <KPEN> {        [       KP_Enter        ]       };
-    key <KPEQ> {        [       KP_Equal        ]       };
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    key <LALT> { [ Alt_L                ]                       };
-    key <RALT> { [ Mode_switch          ]                       };
-    key <ALGR> { [ Mode_switch          ]                       };
-    key <LMTA> { [ Meta_L               ]                       };
-    key <RMTA> { [ Meta_R               ]                       };
-    key <COMP> { [ Multi_key            ]                       };
-
-};
-
-// Map the keys to the XFree86 key names instead of the Sun key names
-partial
-xkb_symbols "xf86keynames" {
-    key <STOP> { [ XF86Stop	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ XF86Copy	],	[ F16	]	};
-    key <OPEN> { [ XF86Open	],	[ F17	]	};
-    key <PAST> { [ XF86Paste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ XF86Cut	],	[ F20	]	};
-
-    key <MUTE> { [ XF86AudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ]	};
-    key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness	]	};
-    key <POWR> { [ XF86Sleep,		XF86PowerDown	]	};
-};
--- a/src/xorg/keytables/sun-src/symbols/sun/sw	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-xkb_symbols "type4de" {
-    include "sun/us(type4basic)"
-    // A few keys are different
-    key <BKSL> { [ less, braceleft      ]                       };
-
-    key <BRCR> { [ greater, braceright  ]                       };
-    key <DELE> { [ Delete               ]                       };
-
-    key <AE01> { [ 1, plus              ], [exclam      ]       };
-    key <AE02> { [ 2, quotedbl          ], [at          ]       };
-    key <AE03> { [ 3, asterisk          ], [numbersign  ]       };
-    key <AE04> { [ 4, ccedilla          ], [cent        ]       };
-    key <AE05> { [ 5, percent           ], [asciitilde  ]       };
-    key <AE06> { [ 6, ampersand         ], [section     ]       };
-    key <AE07> { [ 7, slash             ], [bar         ]       };
-    key <AE08> { [ 8, parenleft         ], [degree      ]       };
-    key <AE09> { [ 9, parenright        ], [backslash   ]       };
-    key <AE10> { [ 0, equal             ], [asciicircum ]       };
-    Key <AE11> { [ quoteright, question ], [quoteleft   ]       };
-    key <AE12> { [ SunFA_Circum, SunFA_Grave    ]               };
-    key <AD03> { [ e, E                 ], [EuroSign    ]       };
-    key <AD06> { [ Z                    ]                       };
-    key <AD11> { [ udiaeresis, egrave   ]                       };
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ]               };
-    key <AC10> { [ odiaeresis, eacute   ]                       };
-    key <AC11> { [ adiaeresis, agrave   ]                       };
-    key <TLDE> { [ dollar, SunFA_Tilde  ], [sterling    ]       };
-    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
-    key <AB01> { [ Y                    ]                       };
-    key <AB07> { [ M, NoSymbol          ], [mu  ]               };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    key <COMP> { [ SunAltGraph          ]                       };
-    key <ALGR> { [ SunCompose           ]                       };
-
-};
-
-xkb_symbols "type4fr" {
-    include "sun/us(type4basic)"
-    // A few keys are different
-    key <BKSL> { [ less, braceleft	]			};
-
-    key <BRCR> { [ greater, braceright  ]                       };
-    key <DELE> { [ Delete               ]                       };
-
-    key <AE01> { [ 1, plus		], [exclam	]	};
-    key <AE02> { [ 2, quotedbl		], [at	 	]	};
-    key <AE03> { [ 3, asterisk		], [numbersign	]	};
-    key <AE04> { [ 4, ccedilla		], [cent	]	};
-    key <AE05> { [ 5, percent		], [asciitilde	]	};
-    key <AE06> { [ 6, ampersand		], [section	]	};
-    key <AE07> { [ 7, slash		], [bar		]	};
-    key <AE08> { [ 8, parenleft		], [degree	]	};
-    key <AE09> { [ 9, parenright	], [backslash	]	};
-    key <AE10> { [ 0, equal		], [asciicircum	]	};
-    Key <AE11> { [ quoteright, question ], [quoteleft	]	};
-    key <AE12> { [ SunFA_Circum, SunFA_Grave	]		};
-    key <AD03> { [ e, E			], [EuroSign	]	};
-    key <AD06> { [ Z			]			};
-    key <AD11> { [ egrave, udiaeresis	]			};
-    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute	]		};
-    key <AC10> { [ eacute, odiaeresis	]			};
-    key <AC11> { [ agrave, adiaeresis	]			};
-    key <TLDE> { [ dollar, SunFA_Tilde	], [sterling	]	};
-    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
-    key <AB01> { [ Y			]			};
-    key <AB07> { [ M, NoSymbol		], [mu	]		};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    key <COMP> { [ SunAltGraph		]			};
-    key <ALGR> { [ SunCompose		]			}; 
-
-
-
-};
-
-xkb_symbols "type5fr" {
-
-    key <TLDE> { [ section, degree	]				};
-
-    key <AE01> { [ 1, plus		], [bar				]};
-    key <AE02> { [ 2, quotedbl		], [at	 	]		};
-    key <AE03> { [ 3, asterisk		], [numbersign	]		};
-    key <AE04> { [ 4, ccedilla		], [asciicircum	]		};
-    key <AE05> { [ 5, percent		], [asciitilde	]		};
-    key <AE06> { [ 6, ampersand		], [section	]		};
-    key <AE07> { [ 7, slash		], [bar		]		};
-    key <AE08> { [ 8, parenleft		], [degree	]		};
-    key <AE09> { [ 9, parenright	], [backslash	]		};
-    key <AE10> { [ 0, equal		], [quoteleft	]		};
-    Key <AE11> { [ quoteright, question ], [SunFA_Acute	]		};
-    key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde		]};
-    key <AD03> { [ e, E			], [EuroSign	]		};
-    key <AD06> { [ z, Z			]				};
-    key <AD11> { [ egrave, udiaeresis	], [ bracketleft		]};
-    key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright		]};
-
-    key <AC10> { [ eacute, odiaeresis	]				};
-    key <AC11> { [ agrave, adiaeresis	], [ braceleft			]};
-    key <BKSL> { [ dollar, sterling	], [ braceright			]};
-
-    key <LSGT> { [ less, greater	], [ backslash			]};
-    key <AB01> { [ y, Y			]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    
-};
-
-xkb_symbols "type5de" {
-
-    key <TLDE> { [ section, degree	]				};
-
-    key <AE01> { [ 1, plus		], [bar				]};
-    key <AE02> { [ 2, quotedbl		], [at	 	]		};
-    key <AE03> { [ 3, asterisk		], [numbersign	]		};
-    key <AE04> { [ 4, ccedilla		], [asciicircum	]		};
-    key <AE05> { [ 5, percent		], [asciitilde	]		};
-    key <AE06> { [ 6, ampersand		], [section	]		};
-    key <AE07> { [ 7, slash		], [bar		]		};
-    key <AE08> { [ 8, parenleft		], [degree	]		};
-    key <AE09> { [ 9, parenright	], [backslash	]		};
-    key <AE10> { [ 0, equal		], [quoteleft	]		};
-    Key <AE11> { [ quoteright, question ], [SunFA_Acute	]		};
-    key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde		]};
-    key <AD03> { [ e, E			], [EuroSign	]		};
-    key <AD06> { [ z, Z			]				};
-    key <AD11> { [ udiaeresis, egrave	], [ bracketleft		]};
-    key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright		]};
-
-    key <AC10> { [ odiaeresis, eacute	]				};
-    key <AC11> { [ adiaeresis, agrave	], [ braceleft			]};
-    key <BKSL> { [ dollar, sterling	], [ braceright			]};
-
-    key <LSGT> { [ less, greater	], [ backslash			]};
-    key <AB01> { [ y, Y			]			};
-    key <AB08> { [ comma, semicolon	]			};
-    key <AB09> { [ period, colon	]			};
-    key <AB10> { [ minus, underscore	]			};
-    
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/tj	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys 
-xkb_symbols "type6" {
-    include "sun/us(type6)"
-    name[Group1]= "Tajikistan";
-
-    key <TLDE> {        [     Cyrillic_io,     Cyrillic_IO      ], [ quoteleft, asciitilde ]   };
-    key <LSGT> {        [             bar,       brokenbar      ], [ less, greater ]   };
-    key <AD01> {        [ Cyrillic_shorti, Cyrillic_SHORTI      ], [ q, Q ]   };
-    key <AE01> {        [               1,          exclam      ], [ 1, exclam ]   };
-    key <AB01> {        [     Cyrillic_ya,     Cyrillic_YA      ], [ z, Z ]   };
-    key <AC02> {        [   Cyrillic_yeru,   Cyrillic_YERU      ], [ s, S ]   };
-    key <AC01> {        [     Cyrillic_ef,     Cyrillic_EF      ], [ a, A ]   };
-    key <AD02> {        [    Cyrillic_tse,    Cyrillic_TSE      ], [ w, W ]   };
-    key <AE02> {        [               2,        quotedbl      ], [ 2, at ]   };
-    key <AB03> {        [     Cyrillic_es,     Cyrillic_ES      ], [ c, C ]   };
-    key <AB02> {        [    Cyrillic_che,    Cyrillic_CHE      ],
-                        [     0x010004b7,      0x010004b6       ]       };
-    key <AC03> {        [     Cyrillic_ve,     Cyrillic_VE      ], [ d, D ]   };
-    key <AD03> {        [      Cyrillic_u,      Cyrillic_U      ],
-                        [      0x010004ef,      0x010004ee      ]       };
-    key <AE04> {        [               4,        asterisk      ], [ 4, dollar ]   };
-    key <AE03> {        [               3,      apostrophe      ], [ 3, numbersign ]   };
-    key <AB04> {        [     Cyrillic_em,     Cyrillic_EM      ], [ v, V ]   };
-    key <AC04> {        [      Cyrillic_a,      Cyrillic_A      ], [ f, F ]   };
-    key <AD05> {        [     Cyrillic_ie,     Cyrillic_IE      ], [ t, T ]   };
-    key <AD04> {        [     Cyrillic_ka,     Cyrillic_KA      ],
-                        [      0x0100049b,      0x0100049a      ]       };
-
-    key <AE05> {        [               5,           colon      ], [ 5, percent ]   };
-    key <AB06> {        [     Cyrillic_te,     Cyrillic_TE      ], [ n, N ]   };
-    key <AB05> {        [      Cyrillic_i,      Cyrillic_I      ],
-                        [      0x010004e3,      0x010004e2      ]       };
-    key <AC06> {        [     Cyrillic_er,     Cyrillic_ER      ], [ h, H ]   };
-    key <AC05> {        [     Cyrillic_pe,     Cyrillic_PE      ], [ g, G ]   };
-    key <AD06> {        [     Cyrillic_en,     Cyrillic_EN      ], [ y, Y ]   };
-    key <AE06> {        [               6,           comma      ], [ 6, asciicircum ]   };
-    key <AB07> {        [Cyrillic_softsign,Cyrillic_SOFTSIGN    ], [ m, M ]   };
-    key <AC07> {        [      Cyrillic_o,      Cyrillic_O      ], [ j, J ]   };
-    key <AD07> {        [    Cyrillic_ghe,    Cyrillic_GHE      ],
-                        [      0x01000493,      0x01000492      ]       };
-    key <AE07> {        [               7,          period      ], [ 7, ampersand ]   };
-    key <AE08> {        [               8,       semicolon      ], [ 8, asterisk ]   };
-    key <AB08> {        [     Cyrillic_be,     Cyrillic_BE      ], [ comma, less ]   };
-    key <AC08> {        [     Cyrillic_el,     Cyrillic_EL      ], [ k, K ]   };
-    key <AD08> {        [    Cyrillic_sha,    Cyrillic_SHA      ],
-                        [  Cyrillic_shcha,  Cyrillic_SHCHA      ]       };
-    key <AD09> {        [    dead_cedilla,     dead_macron      ], [ o, O ]   };
-    key <AE10> {        [               0,      parenright      ], [ 0, parentright ]   };
-    key <AE09> {        [               9,       parenleft      ], [ 9, parentleft ]   };
-    key <AB09> {        [     Cyrillic_yu,     Cyrillic_YU      ], [ period, greater ]   };
-    key <AB10> {        [           slash,        question      ], [ slash, question ]   };
-    key <AC09> {        [     Cyrillic_de,     Cyrillic_DE      ], [ l, L ]   };
-    key <AC10> {        [    Cyrillic_zhe,    Cyrillic_ZHE      ],
-                        [      0x01000497,      0x01000496      ]       };
-    key <AD10> {        [     Cyrillic_ze,     Cyrillic_ZE      ], [ p, P ]   };
-    key <AE11> {        [           minus,      underscore      ], [ minus, underscore ]   };
-    key <AC11> {        [      Cyrillic_e,      Cyrillic_E      ], [ quoteright, quotedbl ]   };
-    key <AD11> {        [     Cyrillic_ha,     Cyrillic_HA      ],
-                        [      0x010004b3,      0x010004b2      ]       };
-    key <AE12> {        [           equal,            plus      ], [ equal, plus ]   };
-    key <AD12> {        [Cyrillic_hardsign,Cyrillic_HARDSIGN    ], [ bracketright, braceright ]   };
-
-    // End alphanumeric section
-
-key.type[group2]="TWO_LEVEL";
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/tr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Turkish "Q" (computer modern) keybaord
-
-    // Alphanumeric section
-    name[Group1]= "Turkish \"Q\" (computer modern)";
-    key <LSGT> {	[      less,	greater  	],
-			[       bar			]	};
-    key <TLDE> {        [  quotedbl,    eacute          ]       };
-    key <AE02> {	[         2,	apostrophe	]	};
-    key <AE03> {	[         3,	asciicircum	],
-			[ numbersign			]	};
-    key <AE04> {	[         4,	plus     	],
-			[    dollar			]	};
-    key <AE06> {	[         6,	ampersand	]	};
-    key <AE07> {	[         7,	slash    	],
-			[ braceleft			]	};
-    key <AE08> {	[         8,	parenleft	],
-			[ bracketleft			]	};
-    key <AE09> {	[         9,	parenright	],
-			[ bracketright			]	};
-    key <AE10> {	[         0,	equal    	],
-			[ braceright			]	};
-    key <AE11> {	[  asterisk,	question 	],
-			[ backslash			]	};
-    key <AE12> {	[     minus,	underscore	]	};
-    key <AD01> {        [         q,    Q               ],
-			[ at				]	};
-    key <AD08> {	[  idotless,    I		]	};
-    key <AD11> {	[    gbreve,    Gbreve		]	};
-    key <AD12> {	[ udiaeresis,	Udiaeresis	],
-			[ asciitilde			]	};
-    key <AC10> {	[   scedilla,   Scedilla	],	
-			[     acute			]	};
-    key <AC11> {	[         i,    Iabovedot	]	};
-    key <BKSL> {	[     comma,	semicolon	],
-			[ quoteleft			]	};
-    key <AB08> {	[ odiaeresis,	Odiaeresis	],
-			[      less			]	};
-    key <AB09> {	[  ccedilla,	Ccedilla 	],
-			[   greater			]	};
-    key <AB10> {	[    period,	colon    	]	};
-
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-  include "sun/tr(basic)"
-	//a few keys are different than in the basic layout
-    key <AD03> {        [               e,       E      ],
-                        [        EuroSign		]       };
-    key <AD11> {	[    gbreve,    Gbreve		],
-			[	diaeresis 		]	};
-    key <AB08> {	[ odiaeresis,	Odiaeresis	]	};
-    key <AB09> {	[  ccedilla,	Ccedilla 	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/tr_f	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-//  turkish "F" keyboard, copyed from LyX turkish keyboard description
-//  right Ctrl key switches to an almost US keyboard (number row is mangled
-//  us keyboard mode, this to allow simple access by AltGr while in turkish
-//  mode to all needed symbols)
-//  as the names of some chars in iso-8859-9 are not consistent whith
-//  the rest of latin iso-8859-* I declare them in hexa (ugly, but what else?)
-//
-//  Pablo Saratxaga <[email protected]>
-//  FIXME: I'm not sure about the ISO_* stuff, the original *.map uses
-//         AltGr_Lock as modifier.
-
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Turkish "F" (traditional) keyboard
-
-    // Alphanumeric section
-    name[Group1]= "Turkish \"F\" (traditional)";
-    #name[Group2]= "US/ASCII";
-
-    key <TLDE> {	[ plus,		asterisk	],
-			[     notsign			]	};
-    key <AE01> {	[	  1,	exclam 		],
-			[ onesuperior			]	};	
-    key <AE02> {	[         2,	quotedbl	],
-			[ twosuperior			]	};
-    key <AE03> {	[         3,	SunFA_Circum	],
-			[ numbersign			]	};
-    key <AE04> {	[         4,	dollar     	],
-			[ onequarter			]	};
-    key <AE05> {	[         5,	percent  	],
-			[ onehalf			]	};
-    key <AE06> {	[         6,	ampersand	],
-			[ threequarters			]	};
-    key <AE07> {	[         7,	quoteright    	],
-			[ braceleft			]	};
-    key <AE08> {	[         8,	parenleft	],
-			[ bracketleft			]	};
-    key <AE09> {	[         9,	parenright	],
-			[ bracketright			]	};
-    key <AE10> {	[         0,	equal    	],
-			[ braceright			]	};
-    key <AE11> {	[  slash,	question 	],
-			[ backslash 		   	]	};
-    key <AE12> {	[     minus,	underscore	],
-			[     bar,    brokenbar		]	};
-
-    key <AD01> {	[         f,	F        	],
-			[         at,	at        	]	};
-    key <AD02> {	[         g,    G		],
-			[         w,	W        	]	};
-    key <AD03> {	[    gbreve,	Gbreve		],
-			[         e,	E        	]	};
-    key <AD04> {	[  idotless,	I		],      
-			[ paragraph		      	]	};
-    key <AD05> {	[         o,	O        	],
-			[         t,	T        	]	};
-    key <AD06> {	[         d,	D        	],
-			[         yen	        	]	};
-    key <AD07> {	[         r,	R        	],
-			[         u,	U        	]	};
-    key <AD08> {	[         n,	N        	],
-			[         i,	I        	]	};
-    key <AD09> {	[         h,	H        	],
-			[    degree 		       	]	};
-    key <AD10> {	[         p,    P	 	],
-			[  sterling			]	};
-    key <AD11> {	[         q,	Q        	],
-			[ diaeresis, dead_diaeresis	]	};
-    key <AD12> {	[         w,	W        	],
-			[ dead_tilde,  asciitilde	]	};
-    key <AC01> {	[         u,	U        	],
-			[         ae,	AE        	]	};
-    key <AC02> {	[         i,	Iabovedot	],
-			[    ssharp 		       	]	};
-    key <AC03> {	[         e,	E        	],
-			[         d,	D        	]	};
-    key <AC04> {	[         a,	A        	],
-			[         f,	F        	]	};
-    key <AC05> {	[  udiaeresis,	Udiaeresis	],
-			[	  g,	G		]	};	
-    key <AC06> {	[         t,	T        	],
-			[         h,	H        	]	};
-    key <AC07> {	[         k,	K        	],
-			[         j,	J        	]	};
-    key <AC08> {	[         m,	M        	],
-			[         k,	K        	]	};
-    key <AC09> {	[         l,    L		]	};
-    key <AC10> {	[         y,	Y        	],
-			[ SunFA_Acute, quoteright   	]	};
-    key <AC11> {	[  scedilla,	Scedilla	],
-			[ numbersign		 	]	};
-
-    key <BKSL> {	[         x,	X        	],
-			[ SunFA_Grave, quoteleft      	]	};
-    key <AB01> {	[         j,	J        	],
-			[ guillemotleft	        	]	};
-    key <AB02> {	[ odiaeresis,	Odiaeresis	],
-			[ guillemotright               	]	};
-    key <AB03> {	[         v,	V        	],
-			[         cent 		       	]	};
-    key <AB04> {	[         c,	C        	],
-			[         v,	V        	]	};
-    key <AB05> {	[  ccedilla,	Ccedilla 	],
-			[         b,	B        	]	};
-    key <AB06> {	[         z,	Z        	],
-			[         n,	N        	]	};
-    key <AB07> {	[         s,	S        	],
-			[         mu 		       	]	};
-    key <AB08> {	[         b,	B        	],
-			[     multiply		     	]	};
-    key <AB09> {	[    period,	colon    	],
-			[    division 		 	]	};
-    key <AB10> {	[     comma,	semicolon	],
-			[ soft_hyphen			]	};
-    key <LSGT> {	[      less,	greater  	],
-			[      bar, 	brokenbar	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-  include "sun/tr_f(basic)"
-	//a few keys are different than in the basic layout
-
-    key <TLDE> {	[ plus,		asterisk	],
-			[     plusminus			]	};
-    key <AE12> {	[     minus,	underscore	],
-			[     	brokenbar		]	};
-    key <AD01> {	[         f,	F        	],
-			[         at	        	]	};
-    key <AD02> {	[         g,    G		]	};
-
-    key <AD03> {	[    gbreve,	Gbreve		]	};
-    key <AD04> {	[  idotless,	I		],      
-			[ paragraph		      	]	};
-    key <AD05> {	[         o,	O        	]	};
-    key <AD06> {	[         d,	D        	],
-			[         yen	        	]	};
-    key <AD07> {	[         r,	R        	]	};
-    key <AD08> {	[         n,	N        	]	};
-    key <AD09> {	[         h,	H        	],
-			[    degree 		       	]	};
-    key <AD10> {	[         p,    P	 	],
-			[  sterling			]	};
-    key <AD11> {	[         q,	Q        	],
-			[ diaeresis			]	};
-    key <AD12> {	[         w,	W        	],
-			[ dead_tilde			]	};
-    key <AC01> {	[         u,	U        	],
-			[         ae,	AE        	]	};
-    key <AC02> {	[         i,	Iabovedot	],
-			[    ssharp 		       	]	};
-    key <AC03> {	[         e,	E        	]	};
-    key <AC04> {	[         a,	A        	]	};
-    key <AC05> {	[  udiaeresis,	Udiaeresis	]	};	
-    key <AC06> {	[         t,	T        	]	};
-    key <AC07> {	[         k,	K        	]	};
-    key <AC08> {	[         m,	M        	]	};
-    key <AC09> {	[         l,    L		]	};
-    key <AC10> {	[         y,	Y        	],
-			[ SunFA_Acute		   	]	};
-    key <AC11> {	[  scedilla,	Scedilla	],
-			[ numbersign		 	]	};
-
-    key <BKSL> {	[         x,	X        	],
-			[ SunFA_Grave		      	]	};
-    key <AB01> {	[         j,	J        	],
-			[ less	        	]	};
-    key <AB02> {	[ odiaeresis,	Odiaeresis	],
-			[ greater               	]	};
-    key <AB03> {	[         v,	V        	],
-			[         cent 		       	]	};
-    key <AB04> {	[         c,	C        	]	};
-    key <AB05> {	[  ccedilla,	Ccedilla 	]	};
-    key <AB06> {	[         z,	Z        	]	};
-    key <AB07> {	[         s,	S        	],
-			[         mu 		       	]	};
-    key <AB08> {	[         b,	B        	],
-			[     multiply		     	]	};
-    key <AB09> {	[    period,	colon    	],
-			[    division 		 	]	};
-    key <AB10> {	[     comma,	semicolon	]	};
-    key <LSGT> {	[      less,	greater  	],	
-			[      bar			]	}; //the same as in Turkish Q layout
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/tuv	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,264 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// US/ASCII layout for a Type 4 Sun keyboard
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-xkb_symbols "type4basic" {
-    include "us(basic)"
-
-    key <RTSH> { [ Shift_R		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <LNFD> { [ Linefeed		]			};
-    key <COMP> { [ Multi_key		]			};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-    key <DELE> { [ Delete		]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]			};
-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
-    key <KPSU> { [ KP_Subtract		]			};
-
-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
-//    key  <KP8> { [ R8,	R8		], [ KP_8		] };
-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-    key <KPAD> { [ KP_Add		]			};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		] };
-    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-    key  <KP6> { [ Right, R12		], [ KP_6		] };
-
-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-    key  <KP2> { [ Down, R14		], [ KP_2		] };
-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-    key <KPEN> { [ KP_Enter		]			}; 
-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R, Shift_L };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2           { Num_Lock };
-    modifier_map Mod3   	{ Mode_switch };
-    modifier_map Mod4		{ Alt_L };
-};
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5basic" {
-    include "us(basic)"
-
-    key <RTSH> { [ Shift_R		]	};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-    key  <KP8> { [ Up, R8		], [ KP_8		]	};
-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		]	};
-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-    key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-    key  <KP2> { [ Down, R14		], [ KP_2		]	};
-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2   { Num_Lock };
-    modifier_map Mod3	{ Alt_R };
-    modifier_map Mod4	{ Alt_L };
-};
-
-xkb_symbols "type5" {
-    include "sun/us(type5basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/tw	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Taiwanese layout for a Type 4 Sun keyboard
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
-
-//    key <LNFD> { [ Hangul		]			};
-//    key <RALT> { [ Linefeed		]			};
-    key <COMP> { [ Henkan_Mode		]			};
-
-};
-
-// Taiwanese layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // A few keys are different
-    key <ALGR> { [ Henkan_Mode		]			};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
-
-};
-
-// Taiwanese layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
-    // A few keys are different from US layout - only those are shown here
-    key <ALGR> { [ Henkan_Mode		]			};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/ua	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-// ukrainian standard keyboard 
-// AEN <[email protected]> & Leon Kanter <[email protected]>
-// Last Changes 2003/09/03 by Andriy Rysin <[email protected]>
-// $XFree86: xc/programs/xkbcomp/symbols/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Ukrainian keyboard
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Ukrainian";
-
-    key	<TLDE> {	[	    grave,	asciitilde	],
-			[      apostrophe,	asciitilde	]	};
-    key	<AE01> {	[		1,	    exclam	],
-			[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,		at	],
-			[		2,        quotedbl	]	};
-    key	<AE03> {	[		3,	numbersign	],
-			[		3,      numbersign	]	};
-    key	<AE04> {	[		4,	    dollar	],
-			[		4,        asterisk	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[		5,	     colon	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[		6,	     comma	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[		7,	    period	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[		8,	 semicolon	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	],
-			[		0,	parenright	]	};
-    key	<AE11> {	[	    minus,	underscore	],
-			[	    minus,	underscore	]	};
-    key	<AE12> {	[	    equal,	      plus	],
-			[	    equal,	      plus	]	};
-
-    key	<AD01> {	[		q,		 Q	],
-			[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<AD02> {	[		w,		 W	],
-			[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<AD03> {	[		e,		 E	],
-			[      Cyrillic_u,	Cyrillic_U	]	};
-    key	<AD04> {	[		r,		 R	],
-			[     Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<AD05> {	[		t,		 T	],
-			[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<AD06> {	[		y,		 Y	],
-			[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<AD07> {	[		u,		 U	],
-			[    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<AD08> {	[		i,		 I	],
-			[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AD09> {	[		o,		 O	],
-			[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
-    key	<AD10> {	[		p,		 P	],
-			[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<AD11> {	[     bracketleft,	 braceleft	],
-			[     Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<AD12> {	[    bracketright,	braceright	],
-			[    Ukrainian_yi,    Ukrainian_YI	]	};
-    key	<BKSL> {	[	backslash,	       bar	],
-			[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
-
-    key	<AC01> {	[		a,		 A	],
-			[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<AC02> {	[		s,		 S	],
-			[     Ukrainian_i,     Ukrainian_I	]	};
-    key	<AC03> {	[		d,		 D	],
-			[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<AC04> {	[		f,		 F	],
-			[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<AC05> {	[		g,		 G	],
-			[     Cyrillic_pe,     Cyrillic_PE	]	};
-    key	<AC06> {	[		h,		 H	],
-			[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<AC07> {	[		j,		 J	],
-			[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<AC08> {	[		k,		 K	],
-			[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<AC09> {	[		l,		 L	],
-			[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<AC10> {	[	semicolon,	     colon	],
-			[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<AC11> {	[      apostrophe,	  quotedbl	],
-			[    Ukrainian_ie,    Ukrainian_IE	]	};
-
-    key	<AB01> {	[		z,		 Z	],
-			[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<AB02> {	[		x,		 X	],
-			[    Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AB03> {	[		c,		 C	],
-			[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<AB04> {	[		v,		 V	],
-			[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<AB06> {	[		n,		 N	],
-			[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<AB05> {	[		b,		 B	],
-			[      Cyrillic_i,	Cyrillic_I	]	};
-    key	<AB07> {	[		m,		 M	],
-			[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<AB08> {	[	    comma,	      less	],
-			[     Cyrillic_be,     Cyrillic_BE	]	};
-    key	<AB09> {	[	   period,	   greater	],
-			[     Cyrillic_yu,     Cyrillic_YU	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	    slash,	  question	]	};
-
-    key <LSGT> {        [            less,         greater      ],
-                        [           slash,             bar      ]       };
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-
-xkb_symbols "type6" {
-  include "sun/us(type6)"
-  include "sun/ua(basic)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/us	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,370 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
-// Sun: @(#)us	1.5	03/04/21 SMI
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-// Symbols shared by all Sun Keyboard layouts
-xkb_symbols "sunbasic" {
-    include "srvr_ctrl(xfree86)"
-    include "srvr_ctrl(stdkeypad)"
-    include "us(basic)"
-
-    key <RTSH> { [ Shift_R		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <RCTL> { [ Control_R		]			};
-    key <COMP> { [ Multi_key		]			};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <DELE> { [ Delete		]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-
-    key <NMLK> {	[  Num_Lock, Pointer_EnableKeys		]	};
-
-    // This default section uses the same symbols as other XKB implementations
-    // for greater compatibility & AccessX MouseKeys support, but it is 
-    // different than the traditional Sun key mappings that date back to the
-    // Sun Type 2 keyboard, in which the right side numpad were "R" function
-    // keys.  To restore the original behavior, comment out this section and
-    // uncomment the section below that lists the R key mappings.
-    key <KPDV> {	[  KP_Divide		]	};
-    key <KPMU> {	[  KP_Multiply		]	};
-    key <KPSU> {	[  KP_Subtract		]	};
-
-    key  <KP7> {	[  KP_Home,	KP_7	]	};
-    key  <KP8> {	[  KP_Up,	KP_8	]	};
-    key  <KP9> {	[  KP_Prior,	KP_9	]	};
-    key <KPAD> {	[  	KP_Add		]	};
-
-    key  <KP4> {	[  KP_Left,	KP_4	]	};
-    key  <KP5> {	[  KP_Begin,	KP_5	]	};
-    key  <KP6> {	[  KP_Right,	KP_6	]	};
-
-    key  <KP1> {	[  KP_End,	KP_1	]	};
-    key  <KP2> {	[  KP_Down,	KP_2	]	};
-    key  <KP3> {	[  KP_Next,	KP_3	]	};
-    key <KPEN> {	[  	KP_Enter	]	};
-
-    key  <KP0> {	[  KP_Insert,	KP_0	]	};
-    key <KPDL> {  [  KP_Delete,	KP_Decimal ]	};
-
-// End New Keypad section - Begin Sun traditional Keypad section
-
-//    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-//    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
-//    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-//    key <KPAD> { [ KP_Add		]			};
-//
-//    key  <KP4> { [ Left, R10		], [ KP_4		] };
-//    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-//    key  <KP6> { [ Right, R12		], [ KP_6		] };
-//
-//    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-//    key  <KP2> { [ Down, R14		], [ KP_2		] };
-//    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-//    key <KPEN> { [ KP_Enter		]			}; 
-//    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-//    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-
-    // End "Keypad" section
-
-    modifier_map Control{ Control_R };
-
-};
-
-// US/ASCII layout for a Type 4 Sun keyboard
-xkb_symbols "type4basic" {
-    include "sun/us(sunbasic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-
-    key <LNFD> { [ Linefeed		]			};
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-
-    // End "Editing" section, begin "Keypad"
-    key <KPEQ> { [ R4,	KP_Equal	], [ KP_Equal		] };
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R, Shift_L };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2           { Num_Lock };
-    modifier_map Mod3   	{ Mode_switch };
-    modifier_map Mod4		{ Alt_L };
-
-};
-
-xkb_symbols "type4" {
-    include "sun/us(type4basic)"
-
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5basic" {
-    include "sun/us(sunbasic)"
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section
-
-    // begin "four keys up on the right"
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift          { Shift_R, Shift_L };
-    modifier_map Mod1           { Alt_L };
-    modifier_map Mod2           { Num_Lock };
-    modifier_map Mod3           { Alt_R, Mode_switch };
-    modifier_map Mod4           { Meta_L, Meta_R };
-};
-
-xkb_symbols "type5" {
-    include "sun/us(type5basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-};
-
-xkb_symbols "type6" {
-    include "sun/us(type5)"
-};
-
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5hobobasic" {
-    include "sun/us(type5basic)"
-};
-
-xkb_symbols "type5hobo" {
-    include "sun/us(type5hobobasic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign 	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-
-    // Here is the hobo keypad:
-
-    key <AE07> { [ 7, ampersand	], [ NoSymbol, NoSymbol	], [ KP_7	] };
-    key <AE08> { [ 8, asterisk	], [ NoSymbol, NoSymbol	], [ KP_8	] };
-    key <AE09> { [ 9, parenleft	], [ NoSymbol, NoSymbol	], [ KP_9	] };
-    key <AE10> { [ 0, parenright], [ NoSymbol, NoSymbol	], [ KP_Multiply] };
-
-    key <AD07> { [ u, U		], [ NoSymbol, NoSymbol	], [ KP_4	] };
-    key <AD08> { [ i, I		], [ NoSymbol, NoSymbol	], [ KP_5	] };
-    key <AD09> { [ o, O		], [ NoSymbol, NoSymbol	], [ KP_6	] };
-    key <AD10> { [ p, P		], [ NoSymbol, NoSymbol	], [ KP_Subtract]};
-
-    key <AC07> { [ j, J		], [ NoSymbol, NoSymbol	], [ KP_1	] };
-    key <AC08> { [ k, K		], [ NoSymbol, NoSymbol	], [ KP_2	] };
-    key <AC09> { [ l, L		], [ NoSymbol, NoSymbol	], [ KP_3	] };
-    key <AC10> { [ semicolon, colon], [ NoSymbol, NoSymbol], [ KP_Add	] };
-
-    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
-
-    key <AB07> { [ m, M		], [ NoSymbol, NoSymbol	], [ KP_0	] };
-
-    key <AB09> { [ period, greater], [ NoSymbol, NoSymbol], [ KP_Decimal] };
-    key <AB10> { [ slash, question], [ NoSymbol, NoSymbol], [ KP_Divide	] };
-
-};
-
-xkb_symbols "pc101" {
-    include "us(pc101)"
-    key <RALT> { [ Mode_switch, Meta_R	] };
-};
-
-xkb_symbols "pc102" {
-    include "us(pc102)"
-    key <RALT> { [ Mode_switch, Meta_R	] };
-};
-
-xkb_symbols "pc104" {
-    include "us(pc104)"
-};
-
-xkb_symbols "pc101currency" {
-
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
-};
-
-xkb_symbols "US101A_Sun" {
-
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
-
-    // Begin "Editing" section
-    key <PRSC> { [ L5, L5		], [ Print, SunSys_Req 		]};
-    key <SCLK> { [ L7, L7		], [  Scroll_Lock		]};
-    key <PAUS> { [ L1, L1		], [ Pause, Break 		]};
-    key  <INS> { [ L8, L8		], [  Insert			]};
-    key <HOME> { [ L6, L6		], [  Home			]};
-    key <PGUP> { [ L3, L3		], [  Prior			]};
-
-
-    key <DELE> { [ L10, L10		], [ Delete			]};
-    key  <END> { [ L9, L9		], [  End			]};
-    key <PGDN> { [ L4, L4		], [  Next			]};
-
-    key   <UP> {	[  Up			]	};
-    key <LEFT> {	[  Left			]	};
-    key <DOWN> {	[  Down			]	};
-    key <RGHT> {	[  Right		]	};
-
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-
-    key  <KP7> { [ R7, KP_7		], [ KP_7, Home		]	};
-    key  <KP8> { [ KP_Up, KP_8		], [ KP_8		]	};
-    key  <KP9> { [ R9, KP_9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ KP_Left, KP_4	], [ KP_4		]	};
-    key  <KP5> { [ R11,	KP_5		], [ KP_5		]	};
-    key  <KP6> { [ KP_Right, KP_6	], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	KP_1		], [ KP_1, End		]	};
-    key  <KP2> { [ KP_Down, KP_2	], [ KP_2		]	};
-    key  <KP3> { [ R15,	KP_3		], [ KP_3, Next		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key <LALT> { [ Meta_L		]				};
-    key <RALT> { [ Alt_L		]				};
-    key <RCTL> { [ Multi_key		]				};
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun/uz	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-// $XdotOrg: $
-//
-// Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial default alphanumeric_keys
-xkb_symbols "type6" { 
-    include "sun/us(type6)"
-    name[Group1]= "Uzbekistan";
-
-
-    key	<AE01> {	[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,        quotedbl	]	};
-    key	<AE03> {	[		3,      numerosign	]	};
-    key	<AE04> {	[		4,       semicolon 	]	};
-    key	<AE05> {	[		5,	   percent 	]	};
-    key	<AE06> {	[		6,	     colon	]	};
-    key	<AE07> {	[		7,	  question	]	};
-    key	<AE08> {	[		8,	  asterisk	]	};
-    key	<AE09> {	[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	]	};
-    key	<BKSL> {	[	backslash,             bar	]	};
-    key	<AB10> {	[	   period,	     comma	]	};
-    key <LSGT> {        [           slash,             bar      ]       };
-
-key.type[group1]="ALPHABETIC";
-
-    key	<AE11> {	[Cyrillic_ghe_bar, Cyrillic_GHE_bar     ],	
-			[           minus,      underscore      ]       };	
-    key	<AE12> {	[Cyrillic_ha_descender, Cyrillic_HA_descender ],
-			[           equal,            plus      ]       }; 
-    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	],
-			[           grave,      asciitilde      ]	};
-
-    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	],	
-			[               q,               Q      ]       };
-    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	],	
-			[               w,               W      ]       };
-    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	],	
-			[               e,               E      ]       };
-    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	],	
-			[               r,               R      ]       };
-    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	],	
-			[               t,               T      ]       };
-    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	],	
-			[               y,               Y      ]       };
-    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	],	
-			[               u,               U      ]       };
-    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	], 	
-			[               i,               I      ]       };
-    key	<AD09> {	[ Byelorussian_shortu, Byelorussian_SHORTU ],	
-			[               o,               O      ]       };
-    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE      ],
-			[               p,               P      ]       };	
-    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA      ],
-			[     bracketleft,       braceleft      ]       };	
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN ],
-			[    bracketright,      braceright      ]       };
-
-    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	],	
-			[               a,               A      ]       };
-    key	<AC02> {	[Cyrillic_ka_descender, Cyrillic_KA_descender ],	
-			[               s,               S      ]       };
-    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	],	
-			[               d,               D      ]       };
-    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	],	
-			[               f,               F      ]       };
-    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	],	
-			[               g,               G      ]       };
-    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	],	
-			[               h,               H      ]       };
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	],	
-			[               j,               J      ]       };
-    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	],	
-			[               k,               K      ]       };
-    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	],	
-			[               l,               L      ]       };
-    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	],	
-			[       semicolon,           colon      ]       };
-    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	],	
-			[      apostrophe,        quotedbl      ]       };
-
-    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	],	
-			[               z,               Z      ]       };
-    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	],	
-			[               x,               X      ]       };
-    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	],	
-			[               c,               C      ]       };
-    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	],
-			[               v,               V      ]       };
-    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	],	
-			[               n,               N      ]       };
-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	],	
-			[               b,               B      ]       };
-    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	],	
-			[               m,               M      ]       };
-    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	],	
-			[           comma,            less      ]       };
-    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	],
-			[          period,         greater      ]       };	
-
-    // End alphanumeric section
-
-key.type[group2]="TWO_LEVEL";
-
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-
-
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "latin" {
-    include "sun/us(type6)"
-    name[Group1]= "Uzbekistan - Latin";
-    key <AC11>  { [0x010002BB, quotedbl] };
-};
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/am	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,128 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys 
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+    name[Group1]= "Armenia";
+    name[Group2]= "USA";
+
+    // Alphanumeric section
+    key <TLDE> {	[ 0x100055d, 0x100055c	], [ quoteleft, asciitilde ]	};
+    key	<LSGT> {	[  question,  0x100058a	], [ less, greater ]	};
+    key <BKSL> {        [ guillemotright, guillemotleft ], [ backslash, bar ] };
+
+    key <AE01> {	[ 0x1000586,  0x1000556	], [ 1, exclam ]	};
+    key <AE02> {	[ 0x1000571,  0x1000541	], [ 2, at ]	};
+    key <AE03> {	[ 0x1002013,  0x1002014 ], [ 3, numbersign ]	};
+    key <AE04> {	[     comma,  dollar	], [ 4, dollar ]	};
+    key <AE05> {	[ 0x1000589,  0x1002026	], [ 5, percent ] 	};
+    key <AE06> {	[ 0x100055e,  percent	], [ 6, asciicircum ]	};
+    key <AE07> {	[ 0x1002024,  0x1000587	], [ 7, ampersand ]	};
+    key <AE08> {	[ 0x100055b,  0x10002bc	], [ 8, asterisk ] 	};
+    key <AE09> {	[ parenright, parenleft ], [ 9, parentleft ] 	};
+    key <AE10> {	[ 0x1000585,  0x1000555	], [ 0, parentright ]	};
+    key <AE11> {	[ 0x1000567,  0x1000537	], [ minus, underscore ] };
+    key <AE12> {	[ 0x1000572,  0x1000542	], [ equal, plus ] };
+
+    key <AD01> {	[ 0x1000573, 0x1000543	], [ q, Q ]   };
+    key <AD02> {	[ 0x1000583, 0x1000553	], [ w, W ]   };
+    key <AD03> {	[ 0x1000562, 0x1000532	], [ e, E ]   };
+    key <AD04> {	[ 0x100057d, 0x100054d	], [ r, R ]   };
+    key <AD05> {	[ 0x1000574, 0x1000544	], [ t, T ]   };
+    key <AD06> {	[ 0x1000578, 0x1000548	], [ y, Y ]   };
+    key <AD07> {	[ 0x1000582, 0x1000552	], [ u, U ]   };
+    key <AD08> {	[ 0x100056f, 0x100053f	], [ i, I ]   };
+    key <AD09> {	[ 0x1000568, 0x1000538	], [ o, O ]   };
+    key <AD10> {	[ 0x1000569, 0x1000539	], [ p, P ]   };
+    key <AD11> {	[ 0x100056e, 0x100053e	], [ bracketleft, braceleft ]   };
+    key <AD12> {	[ 0x1000581, 0x1000551	], [ bracketright, braceright ]   };
+
+    key <AC01> {	[ 0x100057b, 0x100054b	], [ a, A ]   };
+    key <AC02> {	[ 0x100057e, 0x100054e	], [ s, S ]   };
+    key <AC03> {	[ 0x1000563, 0x1000533	], [ d, D ]   };
+    key <AC04> {	[ 0x1000565, 0x1000535	], [ f, F ]   };
+    key <AC05> {	[ 0x1000561, 0x1000531	], [ g, G ]   };
+    key <AC06> {	[ 0x1000576, 0x1000546	], [ h, H ]   };
+    key <AC07> {	[ 0x100056b, 0x100053b	], [ j, J ]   };
+    key <AC08> {	[ 0x100057f, 0x100054f	], [ k, K ]   };
+    key <AC09> {	[ 0x1000570, 0x1000540	], [ l, L ]   };
+    key <AC10> {	[ 0x100057a, 0x100054a	], [ semicolon, colon ]   };
+    key <AC11> {	[ 0x1000580, 0x1000550	], [ quoteright, quotedbl ]   };
+
+    key <AB01> {	[ 0x100056a, 0x100053a	], [ z, Z ]   };
+    key <AB02> {	[ 0x1000564, 0x1000534	], [ x, X ]   };
+    key <AB03> {	[ 0x1000579, 0x1000549	], [ c, C ]   };
+    key <AB04> {	[ 0x1000575, 0x1000545	], [ v, V ]   };
+    key <AB05> {	[ 0x1000566, 0x1000536	], [ b, B ]   };
+    key <AB06> {	[ 0x100056c, 0x100053c	], [ n, N ]   };
+    key <AB07> {	[ 0x1000584, 0x1000554	], [ m, M ]   };
+    key <AB08> {	[ 0x100056d, 0x100053d	], [ comma, less ]   };
+    key <AB09> {	[ 0x1000577, 0x1000547	], [ period, greater ]   };
+    key <AB10> {	[ 0x100057c, 0x100054c	], [ slash, question ]   };
+
+    key <LCTL> {	[ Control_L ] };
+
+key.type[group2]="TWO_LEVEL";
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ar	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,218 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    name[Group2]= "Arabic";
+
+    key <TLDE> { [  ], [     Arabic_thal,      Arabic_shadda   ]	};
+    key <AE01> { [  ], [               1,          exclam      ]       };
+    key <AE02> { [  ], [               2,              at      ]       };
+    key <AE03> { [  ], [               3,      numbersign      ]       };
+    key <AE04> { [  ], [               4,          dollar      ]       };
+    key <AE05> { [  ], [               5,         percent      ]       };
+    key <AE06> { [  ], [               6,     asciicircum      ]       };
+    key <AE07> { [  ], [               7,       ampersand      ]       };
+    key <AE08> { [  ], [               8,        asterisk      ]       };
+    key <AE09> { [  ], [               9,       parenleft      ]       };
+    key <AE10> { [  ], [               0,      parenright      ]       };
+    key <AE11> { [  ], [           minus,      underscore      ]       };
+    key <AE12> { [  ], [           equal,            plus      ]       };
+						
+    key <AD01> { [  ], [      Arabic_dad,     Arabic_fatha     ]       };
+    key <AD02> { [  ], [      Arabic_sad,     Arabic_fathatan  ]       };
+    key <AD03> { [  ], [     Arabic_theh,     Arabic_damma     ]       };
+    key <AD04> { [  ], [      Arabic_qaf,     Arabic_dammatan  ]       };
+    key <AD05> { [  ], [      Arabic_feh,       0x100fef9      ]       };
+    key <AD06> { [  ], [   Arabic_ghain, Arabic_hamzaunderalef ]       };
+    key <AD07> { [  ], [      Arabic_ain,         grave        ]       };
+    key <AD08> { [  ], [       Arabic_ha,        division      ]       };
+    key <AD09> { [  ], [     Arabic_khah,       multiply       ]       };
+    key <AD10> { [  ], [      Arabic_hah,    Arabic_semicolon  ]       };
+    key <AD11> { [  ], [     Arabic_jeem,          greater     ]       };
+    key <AD12> { [  ], [      Arabic_dal,          less        ]       };	    
+
+    key <AC01> { [  ], [    Arabic_sheen,	Arabic_kasra   ]       };
+    key <AC02> { [  ], [     Arabic_seen,       Arabic_kasratan    ]       };
+    key <AC03> { [  ], [      Arabic_yeh,       bracketleft    ]       };
+    key <AC04> { [  ], [      Arabic_beh,       bracketright   ]       };
+    key <AC05> { [  ], [      Arabic_lam,       0x100fef7      ]       };
+    key <AC06> { [  ], [     Arabic_alef,   Arabic_hamzaonalef ]       };
+    key <AC07> { [  ], [      Arabic_teh,      Arabic_tatweel  ]       };
+    key <AC08> { [  ], [     Arabic_noon,      Arabic_comma    ]       };
+    key <AC09> { [  ], [     Arabic_meem,         slash        ]       };
+    key <AC10> { [  ], [      Arabic_kaf,           colon      ]       };
+    key <AC11> { [  ], [      Arabic_tah,        quotedbl      ]       };
+    key <BKSL> { [  ], [            less,         greater      ]       };
+
+    key <LSGT> { [  ], [             bar,      brokenbar	   ]       };
+    key <AB01> { [  ], [Arabic_hamzaonyeh,    asciitilde       ]       };
+    key <AB02> { [  ], [    Arabic_hamza,      Arabic_sukun    ]       };
+    key <AB03> { [  ], [Arabic_hamzaonwaw,     braceleft       ]       };
+    key <AB04> { [  ], [       Arabic_ra,      braceright      ]       };
+    key <AB05> { [  ], [       0x100fefb,      0x100fef5       ]       };
+    key <AB06> { [  ], [Arabic_alefmaksura, Arabic_maddaonalef ]       };
+    key <AB07> { [  ], [Arabic_tehmarbuta,    apostrophe       ]       };
+    key <AB08> { [  ], [      Arabic_waw,         comma        ]       };
+    key <AB09> { [  ], [     Arabic_zain,         period       ]       };
+    key <AB10> { [  ], [      Arabic_zah, Arabic_question_mark ]       };
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+};
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+  include "sun_vndr/ar(basic)"
+
+    key <TLDE> { [	  quoteleft,	asciitilde	 ],
+		 [     Arabic_thal,      Arabic_shadda   ]	 };
+    key <AE01> { [               1,          exclam      ],
+		 [       0x1000661,          exclam      ]       };
+    key <AE02> { [               2,              at      ],
+		 [       0x1000662,              at      ]       };
+    key <AE03> { [               3,      numbersign      ],
+		 [       0x1000663,      numbersign      ]       };
+    key <AE04> { [               4,          dollar      ],
+		 [       0x1000664,          dollar      ]       };
+    key <AE05> { [               5,         percent      ],
+		 [       0x1000665,         percent      ]       };
+    key <AE06> { [               6,     asciicircum      ],
+		 [       0x1000666,     asciicircum      ]       };
+    key <AE07> { [               7,       ampersand      ],
+		 [       0x1000667,       ampersand      ]       };
+    key <AE08> { [               8,        asterisk      ],
+		 [       0x1000668,        asterisk      ]       };
+    key <AE09> { [               9,       parenleft      ],
+		 [       0x1000669,       parenleft      ]       };
+    key <AE10> { [               0,      parenright      ],
+		 [       0x1000660,      parenright      ]       };
+		
+								
+    key <AD01> { [		 q,	      Q          ],
+		 [      Arabic_dad,     Arabic_fatha     ]       };
+    key <AD02> { [		 w,	      W		 ],
+		 [      Arabic_sad,     Arabic_fathatan  ]       };
+    key <AD03> { [		 e,		E	 ],
+		 [     Arabic_theh,     Arabic_damma     ]       };
+    key <AD04> { [		 r,		R	 ],
+		 [      Arabic_qaf,     Arabic_dammatan  ]       };
+    key <AD05> { [		 t,		T	 ],
+		 [      Arabic_feh,       0x100fef9      ]       };
+    key <AD06> { [		 y,		Y	 ],
+		 [   Arabic_ghain, Arabic_hamzaunderalef ]       };
+    key <AD07> { [		 u,		U	 ],
+		 [      Arabic_ain,         grave        ]       };
+    key <AD08> { [		i,		I	 ],
+		 [       Arabic_ha	                 ]       };
+    key <AD09> { [		o,		O	 ],
+		 [     Arabic_khah	                 ]       };
+    key <AD10> { [		p,		P	 ],
+		 [      Arabic_hah,    Arabic_semicolon  ]       };
+    key <AD11> { [     bracketleft,	braceleft	 ],
+		 [     Arabic_jeem,          greater     ]       };
+    key <AD12> { [    bracketright,	braceright	 ],
+		 [      Arabic_dal,          less        ]       };
+    key <BKSL> { [	backslash,		bar	 ]	 };
+    key <LSGT> { [	less,		greater		 ],
+		 [             bar,     brokenbar        ]       };
+
+    key <AC01> { [	  	a,		A	 ],
+		 [    Arabic_sheen,	Arabic_kasra     ]       };
+    key <AC02> { [  	 	s,	S		 ],
+		 [     Arabic_seen,      Arabic_kasratan ]       };
+    key <AC03> { [  	  	d,	D		 ],
+		 [      Arabic_yeh,       bracketleft    ]       };
+    key <AC04> { [  		  f,	F		 ],
+		 [      Arabic_beh,       bracketright   ]       };
+    key <AC05> { [  		  g,	G		 ],
+		 [      Arabic_lam,       0x100fef7      ]       };
+    key <AC06> { [  		  h,	H		 ],
+		 [     Arabic_alef,   Arabic_hamzaonalef ]       };
+    key <AC07> { [  		  j,	J		 ],
+		 [      Arabic_teh,      Arabic_tatweel  ]       };
+    key <AC08> { [  		  k,	K		 ],
+		 [     Arabic_noon,      Arabic_comma    ]       };
+    key <AC09> { [ 		  l,	L		 ],
+		 [     Arabic_meem,         slash        ]       };
+    key <AC10> { [   	 semicolon,	colon		 ],
+		 [      Arabic_kaf,           colon      ]       };
+    key <AC11> { [ 	 quoteright,	quotedbl	 ],
+		 [      Arabic_tah,        quotedbl      ]       };
+
+    key <AB01> { [		  z,	Z		 ],
+		 [ Arabic_hamzaonyeh		         ]       };
+    key <AB02> { [ 	  	  x,	X		 ],
+		 [    Arabic_hamza,      Arabic_sukun    ]       };
+    key <AB03> { [ 		  c,	C		 ],
+		 [Arabic_hamzaonwaw,     braceleft       ]       };
+    key <AB04> { [ 		  v,	V		 ],
+		 [       Arabic_ra,      braceright      ]       };
+    key <AB05> { [ 		  b,	B		 ],
+		 [       0x100fefb,      0x100fef5       ]       };
+    key <AB06> { [ 		  n,	N		 ],
+		 [Arabic_alefmaksura, Arabic_maddaonalef ]       };
+    key <AB07> { [ 		  m,	M		 ],
+		 [    Arabic_tehmarbuta			 ]       };
+    key <AB08> { [ 	     comma,	less		 ],
+		 [      Arabic_waw,         comma        ]       };
+    key <AB09> { [ 	    period,	greater		 ],
+		 [     Arabic_zain,         period       ]       };
+    key <AB10> { [  	     slash,	question	 ],
+		 [      Arabic_zah, Arabic_question_mark ]       };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/az	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,160 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+    name[Group1]= "Azerbaijan";
+    
+
+  key <TLDE> {   [      grave,   asciitilde ], [   dead_grave,      dead_tilde ]   };
+
+  key <AE03> {   [          3,   numbersign ], [    0x1002166,      numerosign ]   };
+  key <AE06> {   [          6,        colon ], [     EuroSign,  periodcentered ]   };
+  key <AE07> {   [          7,     question ]                                      };
+  key <AE08> {   [          8,     asterisk ], [  asciicircum, dead_circumflex ]   };
+  key <AE11> {   [      minus,   underscore ], [       hyphen,          emdash ]   };
+
+  key <AD02> {   [ udiaeresis,   Udiaeresis ]                                      };
+  key <AD04> {   [          r,            R ], [    registered                 ]   };
+  key <AD08> {   [          i,    Iabovedot ]                                      };
+  key <AD11> {   [ odiaeresis,   Odiaeresis ], [   bracketleft,      braceleft ]   };
+  key <AD12> {   [     gbreve,       Gbreve ], [  bracketright,     braceright ]   };
+
+  key <AC10> {   [   idotless,            I ]                                      };
+  key <AC11> {   [      schwa,        SCHWA ]                                      };
+
+  key <AB03> {   [          c,            C ], [     copyright,       division ]   };
+  key <AB07> {   [          m,            M ], [periodcentered,       currency ]   };
+  key <AB08> {   [   ccedilla,     Ccedilla ]                                      };
+  key <AB09> {   [   scedilla,     Scedilla ]                                      };
+  key <AB10> {   [     period,        comma ]                                      };
+  // End alphanumeric section
+
+key.type[group2]="TWO_LEVEL";
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "cyrillic" {
+    include "sun_vndr/ru"
+    name[Group1]= "Azerbaijan - Cyrillic";
+
+  key <AE02> {[ 2,                 quotedbl           ] };
+  key <AE03> {[ 3,                 numbersign         ] };
+  key <AE04> {[ 4,                 semicolon          ] };
+  key <AE06> {[ 6,                 colon              ] };
+  key <AE07> {[ 7,                 question           ] };
+  key <AE08> {[ 8,                 asterisk ],[   braceleft    ] };
+  key <AE09> {[ 9,                 parenleft ],[  bracketleft  ] };
+  key <AE10> {[ 0,                 parenright ],[ bracketright ] };
+  key <AE11> {[ minus,             underscore ],[ braceright   ] };
+
+  key <AD01> {[ Cyrillic_je,          Cyrillic_JE        ], [ q, Q ] };
+  key <AD02> {[ Cyrillic_u_straight, Cyrillic_U_straight ], [ w, W ] };
+  key <AD03> {[ Cyrillic_u,           Cyrillic_U         ], [ e, E ] };
+  key <AD04> {[ Cyrillic_ka,          Cyrillic_KA        ], [ r, R ] };
+  key <AD05> {[ Cyrillic_ie,          Cyrillic_IE        ], [ t, T ] };
+  key <AD06> {[ Cyrillic_en,          Cyrillic_EN        ], [ y, Y ] };
+  key <AD07> {[ Cyrillic_ghe,         Cyrillic_GHE       ], [ u, U ] };
+  key <AD08> {[ Cyrillic_sha,         Cyrillic_SHA       ], [ i, I ] };
+  key <AD09> {[ Cyrillic_shha,        Cyrillic_SHHA      ], [ o, O ] };
+  key <AD10> {[ Cyrillic_ze,          Cyrillic_ZE        ], [ p, P ] };
+  key <AD11> {[ Cyrillic_ha,          Cyrillic_HA        ], [ bracketleft, braceleft ] };
+  key <AD12> {[ Cyrillic_che_vertstroke, Cyrillic_CHE_vertstroke ], [ bracketright, braceright ] };
+
+  key <AC01> {[ Cyrillic_ef,       Cyrillic_EF        ], [ a, A ] };
+  key <AC02> {[ Cyrillic_yeru,     Cyrillic_YERU      ], [ s, S ] };
+  key <AC03> {[ Cyrillic_ve,       Cyrillic_VE        ], [ d, D ] };
+  key <AC04> {[ Cyrillic_a,        Cyrillic_A         ], [ f, F ] };
+  key <AC05> {[ Cyrillic_pe,       Cyrillic_PE        ], [ g, G ] };
+  key <AC06> {[ Cyrillic_er,       Cyrillic_ER        ], [ h, H ] };
+  key <AC07> {[ Cyrillic_o,        Cyrillic_O         ], [ j, J ] };
+  key <AC08> {[ Cyrillic_el,       Cyrillic_EL        ], [ k, K ] };
+  key <AC09> {[ Cyrillic_de,       Cyrillic_DE        ], [ l, L ] };
+  key <AC10> {[ Cyrillic_zhe,      Cyrillic_ZHE       ], [ semicolon, colon ] };
+  key <AC11> {[ Cyrillic_ka_vertstroke,Cyrillic_KA_vertstroke ], [ apostrophe, quotedbl ] };
+
+  key <AB01> {[ Cyrillic_schwa,    Cyrillic_SCHWA     ], [ z, Z ] };
+  key <AB02> {[ Cyrillic_che,      Cyrillic_CHE       ], [ x, X ] };
+  key <AB03> {[ Cyrillic_es,       Cyrillic_ES        ], [ c, C ] };
+  key <AB04> {[ Cyrillic_em,       Cyrillic_EM        ], [ v, V ] };
+  key <AB05> {[ Cyrillic_i,        Cyrillic_I         ], [ b, B ] };
+  key <AB06> {[ Cyrillic_te,       Cyrillic_TE        ], [ n, N ] };
+  key <AB07> {[ Cyrillic_ghe_bar,  Cyrillic_GHE_bar   ], [ m, M ] };
+  key <AB08> {[ Cyrillic_be,       Cyrillic_BE        ], [ comma, less ] };
+  key <AB09> {[ Cyrillic_o_bar,    Cyrillic_O_bar     ], [ period, greater ] };
+  key <AB10> {[ period,            comma              ], [ slash, question ] };
+
+  // End alphanumeric section
+
+key.type[group2]="TWO_LEVEL";
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/be	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,124 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Belgian keyboard
+
+    name[Group1]= "Belgian";
+
+    key <TLDE> {	[     twosuperior,   threesuperior 	]	};
+    key <AE01> {	[       ampersand,               1 	],
+			[             bar                  	]	};
+    key <AE02> {	[          eacute,               2	],
+			[              at 			]	};
+    key <AE03> {	[        quotedbl,               3 	],
+			[      numbersign 			]	};
+    key <AE04> {	[      apostrophe,               4 	]	};
+    key <AE05> {	[       parenleft,               5 	]	};
+    key <AE06> {	[         section,               6 	],
+			[     asciicircum 			]	};
+    key <AE07> {	[          egrave,               7	]	};
+    key <AE08> {	[          exclam,               8	]	};
+    key <AE09> {	[        ccedilla,               9	],
+			[       braceleft,       plusminus 	]	};
+    key <AE10> {	[          agrave,               0 	],
+			[      braceright,          degree	]	};
+    key <AE11> {	[      parenright,          degree 	]	};
+    key <AE12> {	[           minus,      underscore 	]	};
+    key <AD01> {	[               a,               A 	]	};
+    key <AD02> {	[               z,               Z 	]	};
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign,            cent      ]	};
+    key <AD11> {	[ SunFA_Circum,  dead_diaeresis 	],
+			[     bracketleft			]	};
+    key <AD12> {	[          dollar,        asterisk	],
+			[    bracketright			]	};
+    key <AC01> {	[               q,               Q 	]	};
+    key <AC10> {	[               m,               M	]	};
+    key <AC11> {	[          ugrave,         percent 	],
+			[      SunFA_Acute 			]	};
+    key <BKSL> {	[              mu,        sterling 	],
+			[      SunFA_Grave			]	};
+    key <LSGT> {	[            less,         greater	],
+			[       backslash			]	};
+    key <AB01> {	[               w,               W 	]	};
+    key <AB07> {	[           comma,        question 	],
+			[    dead_cedilla			]	};
+    key <AB08> {	[       semicolon,          period 	]	};
+    key <AB09> {	[           colon,           slash 	]	};
+    key <AB10> {	[           equal,            plus	],
+			[      dead_tilde			]	};
+    // End alphanumeric section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3	{ Mode_switch };
+};
+
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+  include "sun_vndr/be(basic)"
+	//a few keys are different than in the basic layout
+    key <AE09> {	[        ccedilla,               9	],
+			[       braceleft		 	]	};
+    key <AE10> {	[          agrave,               0 	],
+			[      braceright         		]	};
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign  	                ]	};
+    key <AB07> {	[           comma,        question 	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/br	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,127 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+include "us(basic)"
+
+    key <TLDE> {        [      apostrophe,        quotedbl      ], 
+			[	  notsign			]	};
+    key <AE01> {        [               1,          exclam      ],
+                        [     onesuperior,      exclamdown      ]       };
+    key <AE02> {        [               2,              at      ],
+                        [     twosuperior,         onehalf      ]       };
+    key <AE03> {        [               3,      numbersign      ],
+                        [   threesuperior,   threequarters      ]       };
+    key <AE04> {        [               4,          dollar      ],
+                        [        sterling,      onequarter      ]       };
+    key <AE05> {        [               5,         percent      ],
+                        [            cent                       ]       };
+    key <AE06> {        [               6,  dead_diaeresis      ],
+                        [         notsign,       diaeresis      ]       };
+    key <AE07> {        [               7,       ampersand      ],
+                        [       braceleft                       ]       };
+    key <AE08> {        [               8,        asterisk      ],
+                        [     bracketleft                       ]       };
+    key <AE09> {        [               9,       parenleft      ],
+                        [    bracketright                       ]       };
+    key <AE10> {        [               0,      parenright      ],
+                        [      braceright                       ]       };
+    key <AE11> {        [           minus,      underscore      ],
+                        [       backslash                       ]       };
+    key <AE12> {        [           equal,            plus      ],
+                        [         section                       ]       };
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign                       ]       };
+    key <AD04> {        [               r,               R      ],
+                        [      registered                       ]       };
+    key <AD11> {        [      SunFA_Acute,    SunFA_Grave      ],
+                        [           acute,           grave      ]       };
+    key <AD12> {        [     bracketleft,       braceleft      ],
+                        [     ordfeminine                       ]       };
+    key <AC10> {        [        ccedilla,        Ccedilla      ], 
+			[      exclamdown			]	};
+    key <AC11> {        [      dead_tilde,    SunFA_Circum      ],
+                        [      asciitilde,     asciicircum      ]       };
+    key <AC12> {        [    bracketright,      braceright      ],
+                        [       masculine                       ]       };
+    key <AB01> {        [               z,               Z      ],
+                        [   guillemotleft 		        ]       };
+    key <AB02> {        [               x,               X      ],
+                        [  guillemotright                       ]       };
+    key <AB03> {        [               c,               C      ],
+                        [       copyright                       ]       };
+    key <AB07> {        [               m,               M      ],
+                        [              mu                       ]       };
+    key <BKSL> {        [     bracketleft,       braceleft      ], 
+			[       masculine			]	};
+    key <AB08> {        [           comma,            less      ],
+                        [        question                       ]       };
+    key <AB09> {        [          period,         greater      ],
+                        [    questiondown                       ]       };
+    key <AB10> {        [       semicolon,           colon      ]       };
+    key <AB11> {        [           slash,        question      ],
+                        [          degree,    questiondown      ]       };
+
+    key <KPPT> {        [  KP_Decimal                           ]       };
+    key <KPDL> {        [  KP_Delete,   comma                   ]       };
+
+};
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+  include "sun_vndr/br(basic)"
+    key <BKSL> {        [    bracketright,      braceright      ],
+                        [       masculine                       ]       };
+    key <LSGT> {        [   	    slash,      bar	        ],
+			[          degree                       ]       };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ca	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,141 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+
+    key <FK01> { [ Escape               ]                       };
+    key <FK02> { [ F1                   ]                       };
+    key <FK03> { [ F2                   ]                       };
+    key <FK04> { [ F3                   ]                       };
+    key <FK05> { [ F4                   ]                       };
+    key <FK06> { [ F5                   ]                       };
+    key <FK07> { [ F6                   ]                       };
+    key <FK08> { [ F7                   ]                       };
+    key <FK09> { [ F8                   ]                       };
+    key <FK10> { [ F9                   ]                       };
+    key <FK11> { [ F10                  ]                       };
+    key <FK12> { [ SunF36               ]                       };
+    key <BKSL> { [ SunF37, NoSymbol	] 			};
+    key <ESC>  { [ degree		], [ notsign	]	};
+    key <AE02> { [ 2, quotedbl		], [ at		]	};
+    key <AE06> { [ 6, question		] 			};
+    key <AE07> { [ 7, ampersand		], [ braceleft	]	};
+    key <AE08> { [ 8, asterisk		], [ bracketleft ]	};
+    key <AE09> { [ 9, parenleft		], [ bracketright ]	};
+    key <AE10> { [ 0, parenright	], [ braceright	]	};
+//    key <AD11> { [ SunFA_Circum, SunFA_Diaresis ], [ asciicircum ] };
+    key <AD12> { [ Ccedilla, NoSymbol	], [ asciitilde	]	};
+    key <LCTL> { [ Caps_Lock		]			};
+    key <AC11> { [ Egrave		]			};
+    key <TLDE> { [ Agrave, NoSymbol	], [ quoteleft 	]	};
+    key <LSGT> { [ Ugrave, NoSymbol	], [ backslash	]	};
+    key <AB08> { [ comma, quoteright	], [ less	]	};
+    key <AB09> { [ period, NoSymbol	], [ greater	]	};
+    key <AB10> { [ Eacute, NoSymbol	], [ slash	]	};
+    key <CAPS> { [ SunAltGraph		]			};
+    key <COMP> { [ SunCompose		]			};
+    key <ALGR> { [ Control_R		]			};
+ 
+};
+
+xkb_symbols "type5" {
+
+    key <TLDE> { [ slash, backslash	], [ bar			]};
+    key <AE01> { [ 1, exclam		], [ plusminus			]};
+    key <AE02> { [ 2, at		]				};
+    key <AE03> { [ 3, numbersign	], [ sterling			]};
+    key <AE04> { [ 4, dollar		], [ cent			]};
+    key <AE05> { [ 5, percent		], [ currency			]};
+    key <AE06> { [ 6, question		]				};
+    key <AE07> { [ 7, ampersand		], [ braceleft ]		};
+    key <AE08> { [ 8, asterisk		], [ braceright ]		};
+    key <AE09> { [ 9, parenleft		], [ bracketleft		]};
+    key <AE10> { [ 0, parenright	], [ bracketright		]};
+    key <AE11> { [ minus, underscore	]				};
+    key <AE12> { [ equal, plus		], [ notsign			]};
+    
+    key <AD10> { [ p, P			], [ paragraph			]};
+    key <AD11> { [ SunFA_Circum, SunFA_Diaeresis], [ SunFA_Grave	]};
+    key <AD12> { [ ccedilla, Ccedilla	], [ asciitilde			]};
+
+    key <AC10> { [ semicolon, colon	], [ degree			]};
+    key <AC11> { [ Egrave		]				};
+    key <BKSL> { [ Agrave		]				};
+
+    key <LSGT> { [ Uacute		]				};
+    key <AB01> { [ z, Z			], [ guillemotleft		]};
+    key <AB02> { [ x, X			], [ guillemotright		]};
+    key <AB07> { [ m, M			], [ mu				]};
+    key <AB08> { [ comma, quoteright	], [ less			]};
+    key <AB09> { [ period, quotedbl	], [ greater			]};
+    key <AB10> { [ eacute, Eacute	], [ quoteleft			]};
+    
+};
+
+xkb_symbols "type5tbits5"
+{
+    include "sun_vndr/ca(type5)"
+    
+    key <LSGT> { [ Ugrave		]				};
+    key <SPCE> { [ space, space		], [ nobreakspace		]};
+};
+
+xkb_symbols "x86"
+{
+    include "ca"
+    
+    key <ALGR> { [ Mode_switch		]				};
+    key <RALT> { [ Alt_R		]				};
+    key <RCTL> { [ Control_R		]				};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ca_bi	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,163 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+
+    key <FK01> { [ Escape               ]                       };
+    key <FK02> { [ F1                   ]                       };
+    key <FK03> { [ F2                   ]                       };
+    key <FK04> { [ F3                   ]                       };
+    key <FK05> { [ F4                   ]                       };
+    key <FK06> { [ F5                   ]                       };
+    key <FK07> { [ F6                   ]                       };
+    key <FK08> { [ F7                   ]                       };
+    key <FK09> { [ F8                   ]                       };
+    key <FK10> { [ F9                   ]                       };
+    key <FK11> { [ F10                  ]                       };
+    key <FK12> { [ SunF36               ]                       };
+    key <BKSL> { [ SunF37, NoSymbol	] 			};
+    key <ESC>  { [ degree		], [ notsign	]	};
+    key <AE02> { [ 2, quotedbl		], [ at		]	};
+    key <AE06> { [ 6, question		] 			};
+    key <AE07> { [ 7, ampersand		], [ braceleft	]	};
+    key <AE08> { [ 8, asterisk		], [ bracketleft ]	};
+    key <AE09> { [ 9, parenleft		], [ bracketright ]	};
+    key <AE10> { [ 0, parenright	], [ braceright	]	};
+//    key <AD11> { [ SunFA_Circum, SunFA_Diaresis ], [ asciicircum ] };
+    key <AD12> { [ Ccedilla, NoSymbol	], [ asciitilde	]	};
+    key <LCTL> { [ Caps_Lock		]			};
+    key <AC11> { [ Egrave		]			};
+    key <TLDE> { [ Agrave, NoSymbol	], [ quoteleft 	]	};
+    key <LSGT> { [ Ugrave, NoSymbol	], [ backslash	]	};
+    key <AB08> { [ comma, quoteright	], [ less	]	};
+    key <AB09> { [ period, NoSymbol	], [ greater	]	};
+    key <AB10> { [ Eacute, NoSymbol	], [ slash	]	};
+    key <CAPS> { [ SunAltGraph		]			};
+    key <COMP> { [ SunCompose		]			};
+    key <ALGR> { [ Control_R		]			};
+ 
+};
+
+xkb_symbols "type5" {
+
+    key <TLDE> { [ slash, backslash	], [ bar			]};
+    key <AE01> { [ 1, exclam		], [ plusminus			]};
+    key <AE02> { [ 2, at		]				};
+    key <AE03> { [ 3, numbersign	], [ sterling			]};
+    key <AE04> { [ 4, dollar		], [ cent			]};
+    key <AE05> { [ 5, percent		], [ currency			]};
+    key <AE06> { [ 6, question		]				};
+    key <AE07> { [ 7, ampersand		], [ braceleft ]		};
+    key <AE08> { [ 8, asterisk		], [ braceright ]		};
+    key <AE09> { [ 9, parenleft		], [ bracketleft		]};
+    key <AE10> { [ 0, parenright	], [ bracketright		]};
+    key <AE11> { [ minus, underscore	]				};
+    key <AE12> { [ equal, plus		], [ notsign			]};
+    
+    key <AD10> { [ p, P			], [ paragraph			]};
+    key <AD11> { [ SunFA_Circum, SunFA_Diaeresis], [ SunFA_Grave	]};
+    key <AD12> { [ ccedilla, Ccedilla	], [ asciitilde			]};
+
+    key <AC10> { [ semicolon, colon	], [ degree			]};
+    key <AC11> { [ Egrave		]				};
+    key <BKSL> { [ Agrave		]				};
+
+    key <LSGT> { [ Uacute		]				};
+    key <AB01> { [ z, Z			], [ guillemotleft		]};
+    key <AB02> { [ x, X			], [ guillemotright		]};
+    key <AB07> { [ m, M			], [ mu				]};
+    key <AB08> { [ comma, quoteright	], [ less			]};
+    key <AB09> { [ period, quotedbl	], [ greater			]};
+    key <AB10> { [ eacute, Eacute	], [ quoteleft			]};
+    
+};
+
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+
+   key <TLDE> { [ slash, bar           ], [ backslash                  ]};
+   key <AE01> { [ 1, exclam            ], [ plusminus                  ]};
+   key <AE02> { [ 2, at                ]                                };
+   key <AE03> { [ 3, numbersign        ], [ sterling                   ]};
+   key <AE04> { [ 4, dollar            ], [ cent                       ]};
+   key <AE05> { [ 5, percent           ], [ currency                   ]};
+   key <AE06> { [ 6, question 	       ], [ notsign	               ]};
+   key <AE07> { [ 7, ampersand         ], [ braceleft                  ]};
+   key <AE08> { [ 8, asterisk          ], [ braceright                 ]};
+   key <AE09> { [ 9, parenleft         ], [ bracketleft                ]};
+   key <AE10> { [ 0, parenright        ], [ bracketright               ]};
+   key <AE11> { [ minus, underscore    ], [ onehalf	               ]};
+   key <AE12> { [ equal, plus          ], [ notsign                    ]};
+  
+   key <AD03> { [ e, E                 ], [ EuroSign		       ]};
+   key <AD09> { [ o, O		       ], [ section		       ]};
+   key <AD10> { [ p, P                 ], [ paragraph                  ]};
+   key <AD11> { [ SunFA_Circum, SunFA_Diaeresis], [ SunFA_Grave        ]};
+   key <AD12> { [ ccedilla, Ccedilla   ], [ asciitilde                 ]};
+
+   key <AC10> { [ semicolon, colon     ], [ degree                     ]};
+   key <AC11> { [ egrave, Egrave       ], [ braceleft                  ]};
+   key <AC12> { [ agrave, Agrave       ], [ braceright                 ]};
+   key <BKSL> { [ agrave, Agrave       ], [ braceright                 ]};
+
+   key <LSGT> { [ uacute, Uacute       ]                                };
+   key <AB01> { [ z, Z                 ], [ guillemotleft              ]};
+   key <AB02> { [ x, X                 ], [ guillemotright             ]};
+   key <AB07> { [ m, M                 ], [ mu                         ]};
+   key <AB08> { [ comma, quoteright    ], [ less                       ]};
+   key <AB09> { [ period, quotedbl     ], [ greater                    ]};
+   key <AB10> { [ eacute, Eacute       ], [ quoteleft                  ]};
+   
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/cz	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,159 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5)"
+    include "cz"
+ 
+    // A few keys are different
+     
+ 
+    key <TLDE> { [ quoteleft, asciitilde        ]                       };
+//     key <AE02> { [ ecaron, 2         ], [ at                 ]       };
+//     key <AE03> { [ scaron, 3         ], [ numbersign         ]       };
+//     key <AE04> { [ ccaron, 4         ], [ dollar             ]       };
+//     key <AE05> { [ rcaron, 5         ], [ percent            ]       };
+//     key <AE06> { [ zcaron, 6         ], [ asciicircum        ]       };
+//     key <AE07> { [ yacute, 7         ], [ ampersand          ]       };
+//     key <AE08> { [ aacute, 8         ], [ asterisk           ]       };
+    key <AE09> { [ iacute, 9            ], [ braceleft          ]       };
+    key <AE10> { [ eacute, 0            ], [ braceright         ]       };
+ 
+    key <AD03> { [ e, E                 ]                               };
+    key <AD06> { [ dcaron, d         ,D            ]                   };
+    key <AD11> { [ uacute, slash        ], [ bracketleft                ] };
+    key <AD12> { [ parenright, parenleft], [ bracketright               ] };
+     
+    key <AC02> { [ s, S                 ], [ ssharp, ssharp             ] };
+    key <BKSL> { [ SunFA_Diaeresis, backslash   ]                         };
+ 
+    key <LSGT> { [ backslash, bar               ]                       };
+     
+};
+
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+
+    key <TLDE>	{ [ semicolon, dead_abovering 	],
+		  [ quoteleft,     asciitilde   ]	};
+    key <AE01>	{ [      plus,          1 	],  
+		  [    exclam,     asciitilde 	]	};
+    key <AE02>	{ [    ecaron,          2 	],  
+		  [        at,     dead_caron 	]	};
+    key <AE03>	{ [    scaron,          3 	],  
+		  [ numbersign,  SunFA_Circum 	] 	};
+    key <AE04>	{ [    ccaron,          4 	],  
+		  [    dollar,     dead_breve 	]	};
+    key <AE05>	{ [    rcaron,          5 	],  
+		  [   percent, dead_abovering 	] 	};
+    key <AE06>	{ [    zcaron,          6 	],  
+		  [ asciicircum,  dead_ogonek 	]	};
+    key <AE07>	{ [    yacute,          7 	],  
+		  [ ampersand,          grave 	]	};
+    key <AE08>	{ [    aacute,          8 	],  
+		  [  asterisk,  dead_abovedot	]	};
+    key <AE09>	{ [    iacute,          9 	],  
+		  [ parenleft,    SunFA_Acute 	]	};
+    key <AE10>	{ [    eacute,          0 	],  
+		  [ parenright, dead_doubleacute] 	};
+    key <AE11>	{ [     equal,    percent 	],  
+		  [ dead_diaeresis, backslash 	]	};
+    key <AE12>	{ [ SunFA_Acute, dead_caron 	], 
+		  [ dead_cedilla, minus 	]	};
+    key <AD01>	{ [         q,          Q 	], 
+		  [  backslash 			]	};
+    key <AD02>	{ [         w,          W 	], 
+		  [       bar 			]	};
+    key <AD03>	{ [         e,          E 	], 
+		  [    EuroSign 		]	};
+    key <AD06>	{ [         z,          Z 	]	};
+    key <AD11>	{ [    uacute,      slash 	], 
+		  [    division 		]	};
+    key <AD12>	{ [parenright,  parenleft 	], 
+		  [    multiply 		]	};
+    key <AC02>	{ [         s,          S 	], 
+		  [   dstroke			]	};
+    key <AC03>	{ [         d,          D 	], 
+		  [     Dstroke 		]	};
+    key <AC04>	{ [         f,          F 	], 
+		  [ bracketleft 		]	};
+    key <AC05>	{ [         g,          G 	], 
+		  [ bracketright 		]	};
+    key <AC08>	{ [         k,          K 	], 
+		  [      lstroke 		]	};
+    key <AC09>	{ [         l,          L 	], 
+		  [      Lstroke 		]	};              
+    key <AC10>	{ [      uring,       quotedbl 	], 
+		  [     dollar 			]	};
+    key <AC11>	{ [    section,         exclam 	], 
+		  [     ssharp,       currency	]	};
+    key <BKSL>	{ [ dead_diaeresis, apostrophe 	], 
+		  [  backslash,            bar	]	};
+    key <LSGT>	{ [  backslash,       asterisk 	], 
+		  [      slash,	     brokenbar	]	};
+    key <AB01>	{ [          y,          Y 	], 
+		  [       less	 		]	};
+    key <AB02>	{ [          x,          X 	], 
+		  [    greater,     numbersign 	]	};
+    key <AB04>	{ [          v,          V 	], 
+		  [         at 			]	};
+    key <AB05>	{ [          b,          B 	],
+		  [  braceleft 			]	};
+    key <AB06>	{ [          n,          N 	],
+		  [ braceright	 		]	};
+    key <AB08>	{ [      comma,       question 	],
+		  [ 	  less			]	};
+    key <AB09>	{ [     period,          colon 	],
+		  [    greater			]	};
+    key <AB10>	{ [      minus,     underscore 	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/de	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,138 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+    key <BKSL> { [ less, braceleft      ]                       };
+
+    key <BRCR> { [ greater, braceright  ]                       };
+    key <DELE> { [ Delete               ]                       };
+
+    key <AE01> { [ 1, plus              ], [exclam      ]       };
+    key <AE02> { [ 2, quotedbl          ], [at          ]       };
+    key <AE03> { [ 3, asterisk          ], [numbersign  ]       };
+    key <AE04> { [ 4, ccedilla          ], [cent        ]       };
+    key <AE05> { [ 5, percent           ], [asciitilde  ]       };
+    key <AE06> { [ 6, ampersand         ], [section     ]       };
+    key <AE07> { [ 7, slash             ], [bar         ]       };
+    key <AE08> { [ 8, parenleft         ], [degree      ]       };
+    key <AE09> { [ 9, parenright        ], [backslash   ]       };
+    key <AE10> { [ 0, equal             ], [asciicircum ]       };
+    Key <AE11> { [ quoteright, question ], [quoteleft   ]       };
+    key <AE12> { [ SunFA_Circum, SunFA_Grave    ]               };
+    key <AD03> { [ e, E                 ], [EuroSign    ]       };
+    key <AD06> { [ Z                    ]                       };
+    key <AD11> { [ udiaeresis, egrave   ]                       };
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ]               };
+    key <AC10> { [ odiaeresis, eacute   ]                       };
+    key <AC11> { [ adiaeresis, agrave   ]                       };
+    key <TLDE> { [ dollar, SunFA_Tilde  ], [sterling    ]       };
+    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
+    key <AB01> { [ Y                    ]                       };
+    key <AB07> { [ M, NoSymbol          ], [mu  ]               };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    key <COMP> { [ SunAltGraph          ]                       };
+    key <ALGR> { [ SunCompose           ]                       };
+};
+
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+
+    key <TLDE> {	[ asciicircum,	degree		]	};
+
+
+    key <AE02> {        [               2,        quotedbl      ],
+			[	twosuperior			]	};
+    key <AE03> {	[		3,	section		],
+			[	threesuperior			]	};
+    key <AE04> {	[		4,	dollar		]	};
+    key <AE06> { 	[               6,    ampersand         ], 
+			[         section     			]       };
+    key <AE07> {	[	  	7,	slash		],
+			[ 	braceleft			]	};
+    key <AE08> {	[	  	8,	parenleft	],
+			[ 	bracketleft			]	};
+    key <AE09> {	[	  	9,	parenright	],
+			[ 	bracketright			]	};
+    key <AE10> {	[	  	0,	equal		],
+			[ 	braceright			]	};
+    key <AE11> {	[	   ssharp,	question	],
+			[ 	backslash			]	};
+    key <AE12> {	[     SunFA_Acute,	SunFA_Grave	]	};
+    key <AD01> {	[		q,	Q		],
+			[	at				]	};
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign			]       };
+    key <AD06> {        [               z,               Z      ]	};
+    key <AD11> {	[      udiaeresis,	Udiaeresis	]	};
+    key <AD12> {	[      	     plus,	asterisk	],
+			[       asciitilde			]	};
+    key <AC10> {	[ 	odiaeresis,	Odiaeresis	]	};
+    key <AC11> {	[ 	adiaeresis,	Adiaeresis	]	};
+
+    key <AB01> {        [               y,               Y      ]       };
+    key <AB07> {	[		m,	M		],
+			[		mu			]	};
+    key <AB08> {        [           comma,       semicolon      ]       };
+    key <AB09> {        [          period,           colon      ]       };
+    key <AB10> {        [           minus,      underscore      ]       };
+    key <BKSL> {	[      numbersign,      apostrophe	],
+			[	grave				]	};
+    key <LSGT> {	[            less,       greater  	],
+			[	bar				]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/de_CH	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,96 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+
+    key <TLDE> { [ section, degree	]	};
+    key <AE01> { [ 1, plus		],
+		 [ bar			]	};
+    key <AE02> { [ 2, quotedbl		],
+		 [ at			]	};
+    key <AE03> { [ 3, asterisk		],
+		 [ numbersign		]	};
+    key <AE04> { [ 4, ccedilla		],
+		 [ asciicircum		]	};
+    key <AE05> { [ 5, percent		],
+		 [ asciitilde		]	};
+    key <AE06> { [ 6, ampersand		]	};
+    key <AE07> { [ 7, slash		]	};
+    key <AE08> { [ 8, parenleft		]	};
+    key <AE09> { [ 9, parenright	]	};
+    key <AE10> { [ 0, equal		],
+		 [ quoteleft		]	};
+    Key <AE11> { [ quoteright, question ],
+		 [ SunFA_Acute		]	};
+    key <AE12> { [ SunFA_Circum, SunFA_Grave ],
+		 [ SunFA_Tilde		]	};
+    key <AD03> { [ e, E			], 
+		 [ EuroSign		]	};
+    key <AD06> { [ z, Z			]	};
+    key <AD11> { [ udiaeresis, egrave	],
+		 [ bracketleft		]	};
+    key <AD12> { [ SunFA_Diaeresis, exclam ],
+		 [ bracketright		]	};
+    key <AC10> { [ odiaeresis, eacute	]	};
+    key <AC11> { [ adiaeresis, agrave	],
+		 [ braceleft		]	};
+    key <BKSL> { [ dollar, sterling	],
+		 [ braceright		]	};
+    key <LSGT> { [ less, greater	],
+		 [ backslash		]	};
+    key <AB01> { [ y, Y			]	};
+    key <AB08> { [ comma, semicolon	]	};
+    key <AB09> { [ period, colon	]	};
+    key <AB10> { [ minus, underscore	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/dk	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,139 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+   key <BKSL> { [ onehalf, section	]                       };
+   key <BRCR> { [ asciitilde, asciicircum	 ] 		};
+   key <AE02> { [ 2, quotedbl		], [ at		]	};
+   key <AE03> { [ 3, numbersign		], [ sterling	]	};
+   key <AE04> { [ 4, currency		], [ dollar	]	};
+   key <AE06> { [ 6, ampersand		] 			};
+   key <AE07> { [ 7, slash		], [ braceleft	]	};
+   key <AE08> { [ 8, parenleft		], [ bracketleft]	};
+   key <AE09> { [ 9, parenright		], [ bracketright] 	};
+   key <AE10> { [ 0, equal		], [ braceright	]	};
+   key <AE11> { [ plus, question	]			};
+   key <AE12> { [ SunFA_Acute, SunFA_Grave], [ bar	]	};
+   key <AD03> { [ e, E			], [ EuroSign	]	};
+   key <AD11> { [ Aring			]			};
+   key <AD12> { [ SunFA_Diaeresis, SunFA_Circum], [SunFA_Tilde] };
+   key <LCTL> { [ Caps_Lock		]			};
+   key <AC10> { [ AE			]			};
+   key <AC11> { [ Ooblique		]			};
+   key <TLDE> { [ quoteright, asterisk	], [ quoteleft	]	};
+   key <LSGT> { [ less, greater		], [ backslash  ]	};
+   key <AB08> { [ comma, semicolon	]			};
+   key <AB09> { [ period, colon		]			};
+   key <AB10> { [ minus, underscore	]			};
+   key <CAPS> { [ Control_L		]			};
+   key <COMP> { [ SunAltGraph		]			};
+   key <ALGR> { [ SunCompose		]			};
+
+
+};
+
+xkb_symbols "type5" {
+   include "sun_vndr/dk(type4)"
+
+    key <AE05> { [ 5, percent		], [asciitilde			]};
+    key <AE06> { [ 6, ampersand		], [asciicircum			]};
+    key <AE07> { [ 7, slash		], [ braceleft			]};
+    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
+    key <AE09> { [ 9, parenright	], [ bracketright		]};
+    key <AE10> { [ 0, equal		], [ braceright			]};
+    key <BKSL> { [ quoteright, asterisk	], [ quoteleft			]};
+  
+};
+
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+
+    key <TLDE> {	[         onehalf,         section      ]	};
+    key <AE02> {	[               2,        quotedbl  	],
+			[	       at			]	};
+    key <AE03> {	[              	3,	numbersign	],
+			[	 sterling			]	};
+    key <AE04> {	[               4,        currency     	],
+			[	   dollar			]	};
+    key <AE05> {	[               5,         percent     	],
+			[        asciitilde			]	};
+    key <AE06> {	[               6,       ampersand     	],
+			[      asciicircum			]	};
+    key <AE07> {	[               7,           slash     	],
+			[       braceleft			]	};
+    key <AE08> {	[               8,       parenleft     	],
+			[     bracketleft			]	};
+    key <AE09> {	[               9,      parenright     	],
+			[    bracketright			]	};
+    key <AE10> {	[               0,           equal     	],
+                        [      braceright			]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AE12> {   	[     SunFA_Acute,      SunFA_Grave     ],
+                 	[             bar		        ]	};
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign		        ]	};
+    key <AD11> {	[	    aring,           Aring 	]	};
+    key <AD12> {   	[ SunFA_Diaeresis,    SunFA_Circum      ],
+                 	[      SunFA_Tilde			]	};
+    key <BKSL> {	[      apostrophe,      asterisk	],
+			[	grave				]	};
+    key	<AC10> {	[	       ae,	        AE	]	};
+    key <AC11> {	[	   oslash,        Ooblique 	]	};
+    key <AB08> {        [	    comma,	semicolon	]       };
+    key <AB09> {        [	    period,	colon		]       };
+    key <AB10> {        [	     minus,	underscore      ]       };
+    key <LSGT> {	[	      less,	greater  	],
+			[	 backslash			]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/dvorak	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,113 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "us(basic)"
+
+    key <TLDE> { [       grave, asciitilde ], [ dead_grave, dead_tilde      ] };
+
+    key <AE01> { [          1,  exclam          ]       };
+    key <AE02> { [          2,  at              ]       };
+    key <AE03> { [          3,  numbersign      ]       };
+    key <AE04> { [          4,  dollar          ]       };
+    key <AE05> { [          5,  percent         ]       };
+    key <AE06> { [          6,  asciicircum ], [ dead_circumflex,  dead_circumflex ] };
+    key <AE07> { [          7,  ampersand       ]       };
+    key <AE08> { [          8,  asterisk        ]       };
+    key <AE09> { [          9,  parenleft ], [ dead_grave] };
+    key <AE10> { [          0,  parenright      ]       };
+    key <AE11> { [ bracketleft, braceleft       ]       };
+    key <AE12> { [ bracketright, braceright ], [ dead_tilde] };
+
+    key <AD01> { [  apostrophe, quotedbl ], [ dead_acute, dead_diaeresis    ] };
+    key <AD02> { [      comma,  less ], [ dead_cedilla, dead_caron        ] };
+    key <AD03> { [      period, greater ], [ dead_abovedot, periodcentered  ] };
+    key <AD04> { [          p,  P               ]       };
+    key <AD05> { [          y,  Y               ]       };
+    key <AD06> { [          f,  F               ]       };
+    key <AD07> { [          g,  G               ]       };
+    key <AD08> { [          c,  C               ]       };
+    key <AD09> { [          r,  R               ]       };
+    key <AD10> { [          l,  L               ]       };
+    key <AD11> { [      slash,  question        ]       };
+    key <AD12> { [      equal,  plus            ]       };
+
+    key <AC01> { [          a,  A               ]       };
+    key <AC02> { [          o,  O               ]       };
+    key <AC03> { [          e,  E               ]       };
+    key <AC04> { [          u,  U               ]       };
+    key <AC05> { [          i,  I               ]       };
+    key <AC06> { [          d,  D               ]       };
+    key <AC07> { [          h,  H               ]       };
+    key <AC08> { [          t,  T               ]       };
+    key <AC09> { [          n,  N               ]       };
+    key <AC10> { [          s,  S               ]       };
+    key <AC11> { [      minus,  underscore      ]       };
+    key <AB01> { [   semicolon, colon ], [ dead_ogonek, dead_doubleacute ] };
+    key <AB02> { [          q,  Q               ]       };
+    key <AB03> { [          j,  J               ]       };
+    key <AB04> { [          k,  K               ]       };
+    key <AB05> { [          x,  X               ]       };
+    key <AB06> { [          b,  B               ]       };
+    key <AB07> { [          m,  M               ]       };
+    key <AB08> { [          w,  W               ]       };
+    key <AB09> { [          v,  V               ]       };
+    key <AB10> { [          z,  Z               ]       };
+
+    key <BKSL> { [  backslash,  bar             ]       };
+};
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+  include "sun_vndr/dvorak(basic)"
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/es	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,144 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+ 
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+xkb_symbols "type4" {
+    key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft    ] };
+    key <BRCR> { [ bracketright, braceright ], [ guillemotright ] };
+    key <AE02> { [ 2, quotedbl          ], [ at                 ] };
+    key <AE03> { [ 3, periodcentered    ], [ numbersign       ] };
+    key <AE05> { [ 5, percent           ], [ degree           ] };
+    key <AE06> { [ 6, ampersand         ], [ notsign          ] };
+    key <AE07> { [ 7, slash             ]                       };
+    key <AE08> { [ 8, parenleft         ]                       };
+    key <AE09> { [ 9, parenright        ], [ backslash        ] };
+    key <AE10> { [ 0, equal             ], [ bar              ] };
+    key <AE11> { [ quoteright, question ], [ quoteleft        ] };
+    key <AE12> { [ exclamdown, questiondown ] };
+    key <AD03> { [ e, E                 ], [ EuroSign         ] };
+    key <AD09> { [ o, O                 ], [ masculine        ] };
+    key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ asciicircum ] };
+    key <AD12> { [ plus, asterisk       ], [ asciitilde       ] };
+    key <AC01> { [ a, A                 ], [ ordfeminine      ] };
+    key <AC10> { [ Ntilde               ]                       };
+    key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ]                       };
+    key <TLDE> { [ Ccedilla             ]                       };
+    key <RALT> { [ Alt_R                ]                       };
+    key <LCTL> { [ Caps_Lock ] };
+    key <CAPS> { [ Control_L ] };
+    key <LSGT> { [ less, greater        ]                       };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+};
+ 
+
+xkb_symbols "type5" {
+    include "sun_vndr/es(type4)"
+ 
+    key <AE03> { [ 3, periodcentered    ], [ numbersign                 ] };
+    key <AE04> { [ 4, dollar            ], [ asciicircum                ] };
+    key <AE05> { [ 5, percent           ], [ asciitilde                 ] };
+    key <AE07> { [ 7, slash             ], [ braceleft                  ]};
+    key <AE08> { [ 8, parenleft         ], [ bracketleft                ]};
+    key <AE09> { [ 9, parenright        ], [ bracketright               ]};
+    key <AE10> { [ 0, equal             ], [ braceright                 ]};
+    key <AE11> { [ quoteright, question ], [ quoteleft                  ] };
+ 
+    key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ bracketleft           ] };
+ 
+    key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ], [ braceleft          ] };
+};
+ 
+
+xkb_symbols "type6" {
+     include "sun_vndr/us(type6)"
+
+
+    key <TLDE> {        [       masculine,     ordfeminine      ],
+                        [       backslash			]       };
+    key <LSGT> {        [            less,         greater      ],
+                        [             bar,       brokenbar      ]       };
+    key <AE01> {        [               1,      exclam          ],
+                        [             bar			]       };
+    key <AE02> {        [               2,        quotedbl      ],
+                        [              at			]       };
+    key <AE03> {        [               3,  periodcentered      ],
+                        [      numbersign			]       };
+    key <AE04> {        [               4,          dollar      ],
+                        [     asciicircum			]       };
+    key <AE05> { 	[ 		5,	   percent	], 
+			[      asciitilde			]	};
+    key <AE06> {        [               6,       ampersand      ],
+                        [         notsign			]       };
+    key <AE07> {        [               7,           slash      ]       };
+    key <AE08> {        [               8,       parenleft      ]       };
+    key <AE09> {        [               9,      parenright      ]       }; 
+    key <AE10> {        [               0,           equal      ]       };
+    key <AE11> {        [      apostrophe,        question      ],
+			[	    grave			]       };
+    key <AE12> {        [      exclamdown,    questiondown      ]       };
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign			]       };
+    key <AD11> {        [     SunFA_Grave,    SunFA_Circum      ],
+                        [     bracketleft			]       };
+    key <AD12> {        [            plus,        asterisk      ],
+                        [    bracketright			]       };
+    key <AC10> {        [          ntilde,          Ntilde      ]       };
+    key <AC11> {        [     SunFA_Acute, SunFA_Diaeresis      ],
+                        [       braceleft			]       };
+    key <BKSL> {        [        ccedilla,        Ccedilla      ],
+                        [      braceright			]       };
+    key <AB08> {        [           comma,       semicolon      ]       };
+    key <AB09> {        [          period,           colon      ]       };
+    key <AB10> {        [           minus,      underscore      ]       };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/fi	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,101 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+ 
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "basic" {
+    include "fi"
+    // A few keys are different
+    key <AE11> {        [            plus,        question      ],
+                        [       backslash                       ]       };
+    key <AD12> {        [       diaeresis,     asciicircum      ],
+                        [      asciitilde                       ]       };
+    key <BKSL> {        [      apostrophe,        asterisk      ],
+                        [       quoteleft                       ]       };
+};
+
+
+xkb_symbols "type6" {
+     include "sun_vndr/us(type6)"
+
+    key <TLDE> {        [         section,         onehalf      ]	};
+    key <AE02> {        [               2,        quotedbl      ],
+                        [              at		        ]	};
+    key <AE03> {        [               3,      numbersign      ],
+                        [        sterling		        ]	};
+    key <AE04> {        [               4,        currency      ],
+                        [          dollar		        ]	};
+    key <AE06> {        [               6,       ampersand      ]	};
+    key <AE07> {        [               7,           slash      ],
+                        [       braceleft			]	};
+    key <AE08> {        [               8,       parenleft      ],
+                        [     bracketleft			]	};
+    key <AE09> {        [               9,      parenright      ],
+                        [    bracketright			]	};
+    key <AE10> {        [               0,           equal      ],
+                        [      braceright			]	};
+    key <AE11> {        [            plus,        question      ],
+                        [       backslash			]	};
+    key <AE12> {        [      SunFA_Acute,      SunFA_Grave    ]	};
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign			]       };
+    key <AD11> {	[	    aring,	Aring		]	};
+    key <AD12> {        [  SunFA_Diaeresis,     asciicircum     ],
+                        [      asciitilde    			]	};
+    key <AC10> {	[ 	odiaeresis,	Odiaeresis	]	};
+    key <AC11> {	[ 	adiaeresis,	Adiaeresis	]	};
+    key <BKSL> {	[      apostrophe,      asterisk	],
+			[	quoteleft			]	};
+    key <AB08> {        [	     comma,	semicolon	]       };
+    key <AB09> {        [	    period,	colon		]       };
+    key <AB10> {        [	     minus,	underscore      ]       };
+    key <LSGT> {	[	      less,	greater  	],
+			[	       bar			]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/fr	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,110 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple French keybaord
+
+    name[Group1]= "French";
+    key <TLDE> {        [     twosuperior                       ]       };
+    key <AE01> {        [       ampersand,               1      ]	};
+    key <AE02> {        [          eacute,               2      ],
+                        [      asciitilde			]       };
+    key <AE03> {        [        quotedbl,               3      ],
+                        [      numbersign		        ]       };
+    key <AE04> {        [      apostrophe,               4      ],
+                        [       braceleft			]       };
+    key <AE05> {        [       parenleft,               5      ],
+                        [     bracketleft			]       };
+    key <AE06> {        [           minus,               6      ],
+                        [             bar			]       };
+    key <AE07> {        [          egrave,               7      ],
+                        [           grave			]       };
+    key <AE08> {        [      underscore,               8      ],
+                        [       backslash			]       };
+    key <AE09> {        [        ccedilla,               9      ],
+                        [     asciicircum			]       };
+    key <AE10> {        [          agrave,               0      ],
+                        [              at			]       };
+    key <AE11> {        [      parenright,          degree      ],
+                        [    bracketright			]       };
+    key <AE12> {        [           equal,            plus      ],
+                        [      braceright			]       };
+    key <AD01> {        [               a,               A      ]	};
+    key <AD02> {        [               z,               Z      ]	};
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign			]       };
+    key <AD11> {        [    SunFA_Circum, SunFA_Diaeresis      ]       };
+    key <AD12> {        [          dollar,        sterling      ],
+                        [        currency			]       };
+    key <AC01> {        [               q,               Q      ]	};
+    key <AC10> {        [               m,               M      ]	};
+    key <AC11> {        [          ugrave,         percent      ]       };
+    key <LSGT> {        [            less,         greater      ]	};
+    key <AB01> {        [               w,               W      ]	};
+    key <AB07> {        [           comma,        question      ]	};
+    key <AB08> {        [       semicolon,          period      ]       };
+    key <AB09> {        [           colon,           slash      ]       };
+    key <AB10> {        [          exclam,         section      ]       };
+    key <BKSL> {        [        asterisk,              mu      ]       };
+    // End alphanumeric section
+
+};
+
+
+xkb_symbols "type6" {
+     include "sun_vndr/us(type6)"
+     include "sun_vndr/fr(basic)"
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/fr_CH	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,96 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+
+    key <TLDE> { [ section, degree	]	};
+    key <AE01> { [ 1, plus		],
+		 [ bar			]	};
+    key <AE02> { [ 2, quotedbl		],
+		 [ at			]	};
+    key <AE03> { [ 3, asterisk		],
+		 [ numbersign		]	};
+    key <AE04> { [ 4, ccedilla		],
+		 [ asciicircum		]	};
+    key <AE05> { [ 5, percent		],
+		 [ asciitilde		]	};
+    key <AE06> { [ 6, ampersand		]	};
+    key <AE07> { [ 7, slash		]	};
+    key <AE08> { [ 8, parenleft		]	};
+    key <AE09> { [ 9, parenright	]	};
+    key <AE10> { [ 0, equal		],
+		 [ quoteleft		]	};
+    Key <AE11> { [ quoteright, question ],
+		 [ SunFA_Acute		]	};
+    key <AE12> { [ SunFA_Circum, SunFA_Grave ],
+		 [ SunFA_Tilde		]	};
+    key <AD03> { [ e, E			], 
+		 [ EuroSign		]	};
+    key <AD06> { [ z, Z			]	};
+    key <AD11> { [ egrave, udiaeresis	],
+		 [ bracketleft		]	};
+    key <AD12> { [ SunFA_Diaeresis, exclam ],
+		 [ bracketright		]	};
+    key <AC10> { [ eacute, odiaeresis	]	};
+    key <AC11> { [ agrave, adiaeresis	],
+		 [ braceleft		]	};
+    key <BKSL> { [ dollar, sterling	],
+		 [ braceright		]	};
+    key <LSGT> { [ less, greater	],
+		 [ backslash		]	};
+    key <AB01> { [ y, Y			]	};
+    key <AB08> { [ comma, semicolon	]	};
+    key <AB09> { [ period, colon	]	};
+    key <AB10> { [ minus, underscore	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/gb	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,91 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+    key <AE01> { [ 1, exclam		], [brokenbar	]	};
+    key <AE03> { [ 3, sterling		], [numbersign	]	};
+    key <AE04> { [ 4, dollar		], [EuroSign	]	};
+    key <AE11> { [ minus, underscore	], [notsign	]	};
+    key <AD03> { [ e, E			], [EuroSign	]	};
+
+
+};
+
+
+xkb_symbols "type5" {
+    include "gb(Sundeadkeys)"
+
+    key <TLDE> { 	[	quoteleft,	notsign		],
+			[	brokenbar			]	};
+    key <AD03> {	[		e,	E		],
+			[	EuroSign			]	};
+};
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple British keyboard
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+
+    key <TLDE> { 	[	quoteleft,	notsign		],
+			[	brokenbar			]	};
+
+    key <AE02> {        [               2,        quotedbl      ]	};
+    key <AE03> {	[		3,	sterling	]	};
+    key <AE04> {	[		4,	dollar		],
+			[	EuroSign			]	};
+    key <BKSL> {	[      numbersign,      asciitilde	]	};
+    key <AC11> {	[      apostrophe,              at 	]	};
+    key <LSGT> {	[       backslash,	       bar  	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ge	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,122 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys 
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+    name[Group1]= "Georgia";
+
+    key <TLDE> { [ 0x0100201e, 0x0100201c ], [ 0x0100201e, asciitilde ] };
+    key <AE01> { [ 1, exclam ], [ apostrophe ] };
+    key <AE02> { [ 2, at ], [ 0x0100201e ] };
+    key <AE03> { [ 3, numbersign ], [ 0x0100201c ] };
+    key <AE04> { [ 4, dollar ], [ 0x01002116 ] };
+    key <AE05> { [ 5, percent ], [ EuroSign ] };
+    key <AE06> { [ 6, asciicircum ] };
+    key <AE07> { [ 7, ampersand ], [ section ] };
+    key <AE08> { [ 8, asterisk ], [	degree ] };
+    key <AE09> { [ 9, parenleft ], [ 9, parentleft ] };
+    key <AE10> { [ 0, parenright ], [ 0, parentright ] };
+    key <AE11> { [ minus, underscore ], [ 0x01002014 ] };
+    key <AE12> { [ equal, plus ], [ 0x01002013 ] };
+
+    key <AD01> { [ 0x010010e5,  Q               ], [ q, Q ]    };
+    key <AD02> { [ 0x010010ec,  0x010010ed      ], [ w, W ]    };
+    key <AD03> { [ 0x010010d4,  E ], [ 0x010010f1 ]      };
+    key <AD04> { [ 0x010010e0,  0x010010e6 ], [ 0x010000ae ] };
+    key <AD05> { [ 0x010010e2,  0x010010d7 ], [ t, T ]         };
+    key <AD06> { [ 0x010010e7,  Y ], [ 0x010010f8   ]    };
+    key <AD07> { [ 0x010010e3,  U               ], [ u, U ]    };
+    key <AD08> { [ 0x010010d8,  I ], [ 0x010010f2   ]    };
+    key <AD09> { [ 0x010010dd,  O               ], [ o, O ]    };
+    key <AD10> { [ 0x010010de,  P               ], [ p, P ]    };
+    key <AD11> { [ bracketleft, braceleft       ], [ bracketleft, braceleft ]    };
+    key <AD12> { [ bracketright,braceright      ], [ bracketright, braceright ]    };
+
+    key <AC01> { [ 0x010010d0,  A ], [ 0x010010fa   ]       };
+    key <AC02> { [ 0x010010e1,  0x010010e8      ], [ s, S ]       };
+    key <AC03> { [ 0x010010d3,  D               ], [ d, D ]       };
+    key <AC04> { [ 0x010010e4,  F ], [ 0x010010f6   ]       };
+    key <AC05> { [ 0x010010d2,  G ], [ 0x010010f9   ]       };
+    key <AC06> { [ 0x010010f0,  H ], [ 0x010010f5   ]       };
+    key <AC07> { [ 0x010010ef, 0x010010df ], [ 0x010010f7 ] };
+    key <AC08> { [ 0x010010d9,  K               ], [ k, K ]       };
+    key <AC09> { [ 0x010010da,  L               ], [ l, L ]       };
+    key <AC10> { [ semicolon, colon             ], [ semicolon, colon ]       };
+    key <AC11> { [ apostrophe, quotedbl         ], [ quoteright, quotedbl ]       };
+    key <BKSL> { [ backslash, bar ], [ asciitilde, asciitilde ]  };
+
+    key <LSGT> { [ guillemotleft,guillemotright ], [ less, greater ]       };
+    key <AB01> { [ 0x010010d6,  0x010010eb      ], [ z, Z ]       };
+    key <AB02> { [ 0x010010ee,  X, 0x010010f4   ], [ x, X ]       };
+    key <AB03> { [ 0x010010ea, 0x010010e9 ], [ 0x010000a9 ] };
+    key <AB04> { [ 0x010010d5,  V ], [ 0x010010f3   ]       };
+    key <AB05> { [ 0x010010d1,  B               ], [ b, B ]       };
+    key <AB06> { [ 0x010010dc,  N ], [ 0x010010fc   ]       };
+    key <AB07> { [ 0x010010db,  M               ], [ m, M ]       };
+    key <AB08> { [ comma, less ], [ guillemotleft   ]       };
+    key <AB09> { [ period, greater ], [ guillemotright    ] };
+    key <AB10> { [ slash, question ], [ 0x010010fb  ]       };
+
+key.type[group2]="TWO_LEVEL";
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/gr	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,132 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "basic" {
+     include "us(basic)"
+     include "gr(basic)"
+}; 
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+    // A few keys are different
+    key <AE04> { [ 4, dollar ], [ EuroSign ] };
+    key <AD03> { [ e, E], [ EuroSign ] };
+    key <AC10> { [ dead_acute, dead_diaeresis ]                 };
+    key <LSGT> { [ backslash, bar       ]                       };
+};
+
+xkb_symbols "type6" {
+	include "sun_vndr/us(type6)"
+
+	key <TLDE> { [                 grave,     asciitilde ], [          onehalf ] };
+	key <AE01> { [                     1,         exclam ] };
+	key <AE02> { [                     2,             at ] };
+	key <AE03> { [                     3,     numbersign ], [         sterling ] };
+	key <AE04> { [                     4,         dollar ], [         EuroSign ] };
+	key <AE05> { [                     5,        percent ], [         EuroSign ] };
+	key <AE06> { [                     6,    asciicircum ], [          notsign ] };
+	key <AE07> { [                     7,      ampersand ] };
+	key <AE08> { [                     8,       asterisk ] };
+	key <AE09> { [                     9,      parenleft ] };
+	key <AE10> { [                     0,     parenright ], [           degree ] };
+	key <AE11> { [                 minus,     underscore ], [        plusminus ] };
+	key <AE12> { [                 equal,           plus ] };
+
+	key <AD01> { [             semicolon,          colon ], [   periodcentered ] };
+	key <AD02> { [ Greek_finalsmallsigma, periodcentered ], [      Greek_SIGMA ] };
+	key <AD03> { [         Greek_epsilon,  Greek_EPSILON ], [         EuroSign ] };
+	key <AD04> { [             Greek_rho,      Greek_RHO ], [       registered ] };
+	key <AD05> { [             Greek_tau,      Greek_TAU ] };
+	key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] };
+	key <AD07> { [           Greek_theta,    Greek_THETA ] };
+	key <AD08> { [            Greek_iota,     Greek_IOTA ] };
+	key <AD09> { [         Greek_omicron,  Greek_OMICRON ] };
+	key <AD10> { [              Greek_pi,       Greek_PI ] };
+	key <AD11> { [           bracketleft,      braceleft ], [    guillemotleft ] };
+	key <AD12> { [          bracketright,     braceright ], [   guillemotright ] };
+
+	key <AC01> { [           Greek_alpha,    Greek_ALPHA ] };
+	key <AC02> { [           Greek_sigma,    Greek_SIGMA ] };
+	key <AC03> { [           Greek_delta,    Greek_DELTA ] };
+	key <AC04> { [             Greek_phi,      Greek_PHI ] };
+	key <AC05> { [           Greek_gamma,    Greek_GAMMA ] };
+	key <AC06> { [             Greek_eta,      Greek_ETA ] };
+	key <AC07> { [              Greek_xi,       Greek_XI ] };
+	key <AC08> { [           Greek_kappa,    Greek_KAPPA ] };
+	key <AC09> { [           Greek_lamda,    Greek_LAMDA ] };
+	key <AC10> { [            dead_acute, dead_diaeresis ] };
+	key <AC11> { [            apostrophe,       quotedbl ] };
+	key <BKSL> { [             backslash,            bar ], [        brokenbar ] };
+
+	key <LSGT> { [         guillemotleft, guillemotright ], [        brokenbar ] };
+        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };
+        key <AB02> { [             Greek_chi,      Greek_CHI ] };
+        key <AB03> { [             Greek_psi,      Greek_PSI ], [        copyright ] };
+        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };
+        key <AB05> { [            Greek_beta,     Greek_BETA ] };
+        key <AB06> { [              Greek_nu,       Greek_NU ] };
+        key <AB07> { [              Greek_mu,       Greek_MU ] };
+	key <AB08> { [                 comma,           less ], [    guillemotleft ] };
+	key <AB09> { [                period,        greater ], [   guillemotright ] };
+	key <AB10> { [                 slash,       question ] };
+ 
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+        include "us(basic)"
+        include "gr(basic)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+        include "gr(Sundeadkeys)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/hu	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,357 @@
+// Hungarian keyboard symbols for XKB and PC keyboard
+//
+// (C) 2002 Peter Soos <[email protected]>
+//
+// Permission is granted to anyone to use, distribute and modify
+// this file in any way, provided that the above copyright notice
+// is left intact and the author of the modification summarizes
+// the changes in this header.
+//
+// This file is distributed without any expressed or implied warranty.
+//
+// It describes the differences between a very simple US/ASCII keyboard
+// layout and some widely used Hungarian keyboard layouts.
+// Tested on Linux with XFree86 3.3.6
+//
+// $XFree86: xc/programs/xkbcomp/symbols/hu,v 1.7 2002/12/13 04:18:03 dawes Exp $
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+// Default layout
+default partial
+xkb_symbols "default" {
+    include "hu(102_qwertz_comma)"
+};
+
+// Standard layout
+partial
+xkb_symbols "standard" {
+    include "hu(102_qwertz_comma)"
+};
+
+// Main layouts
+
+// 101_qwertz_comma:
+// Unicode based 101 key qwertz layout with decimal comma on keypad
+// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
+partial
+xkb_symbols "101_qwertz_comma" {
+    name[Group1] = "Hungarian";
+    include "hu(def_uni)"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "hu(def_comma)"
+    include "hu(def_common)"
+};
+
+// 101_qwertz_dot:
+// Unicode based 101 key qwertz layout with decimal dot on keypad
+// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
+partial
+xkb_symbols "101_qwertz_dot" {
+    name[Group1] = "Hungarian";
+    include "hu(def_uni)"
+    include "hu(def_101)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_common)"
+};
+
+// 101_qwerty_comma:
+// Unicode based 101 key qwerty layout with decimal comma on keypad
+// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
+partial
+xkb_symbols "101_qwerty_comma" {
+    name[Group1] = "Hungarian";
+    include "hu(def_uni)"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "hu(def_comma)"
+    include "hu(def_common)"
+};
+
+// 101_qwerty_dot:
+// Unicode based 101 key qwerty layout with decimal dot on keypad
+// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
+partial
+xkb_symbols "101_qwerty_dot" {
+    name[Group1] = "Hungarian";
+    include "hu(def_uni)"
+    include "hu(def_101)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_common)"
+};
+
+// 102_qwertz_comma:
+// Unicode based 102 key qwertz layout with decimal comma on keypad
+// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
+partial
+xkb_symbols "102_qwertz_comma" {
+    name[Group1] = "Hungarian";
+    include "hu(def_uni)"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "hu(def_comma)"
+    include "hu(def_common)"
+};
+
+// 102_qwertz_dot:
+// Unicode based 102 key qwertz layout with decimal dot on keypad
+// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
+partial
+xkb_symbols "102_qwertz_dot" {
+    name[Group1] = "Hungarian";
+    include "hu(def_uni)"
+    include "hu(def_102)"
+    include "hu(def_qwertz)"
+    include "hu(def_dot)"
+    include "hu(def_common)"
+};
+
+// 102_qwerty_comma:
+// Unicode based 102 key qwerty layout with decimal comma on keypad
+// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
+partial
+xkb_symbols "102_qwerty_comma" {
+    name[Group1] = "Hungarian";
+    include "hu(def_uni)"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "hu(def_comma)"
+    include "hu(def_common)"
+};
+
+// 102_qwerty_dot:
+// Unicode based 102 key qwerty layout with decimal dot on keypad
+// You have to set your locale settings (at least LC_CTYPE) to hu_HU.
+partial
+xkb_symbols "102_qwerty_dot" {
+    name[Group1] = "Hungarian";
+    include "hu(def_uni)"
+    include "hu(def_102)"
+    include "hu(def_qwerty)"
+    include "hu(def_dot)"
+    include "hu(def_common)"
+};
+
+// Partial layouts
+
+// def_uni:
+// Unicode based Hungarian keybaord.
+
+hidden partial alphanumeric_keys
+xkb_symbols "def_uni" {
+
+    key <AD07> {        [                u, U                ],
+                        [         EuroSign                   ]       };
+    key <AC02> {        [                s, S                ],
+                        [          dstroke                   ]       };
+    key <AC03> {        [                d, D                ],
+                        [          Dstroke                   ]       };
+    key <AC08> {        [                k, K                ],
+                        [          lstroke                   ]       };
+    key <AC09> {        [                l, L                ],
+                        [          Lstroke                   ]       };
+    key <AD11> {        [     odoubleacute, Odoubleacute     ],
+                        [         division                   ]       };
+    key <BKSL> {        [     udoubleacute, Udoubleacute     ],
+                        [         currency                   ]       };
+};
+
+// def_102:
+// The standard Hungarian 102 key layout
+
+hidden partial alphanumeric_keys
+xkb_symbols "def_102" {
+    key <TLDE> {        [                0, section          ],
+                        [          notsign                   ]       };
+};
+
+// def_101:
+// An alternative layout for 101 key keyboards
+
+hidden partial alphanumeric_keys
+xkb_symbols "def_101" {
+    key <TLDE> {        [           iacute, Iacute           ],
+                        [                0, section          ]       };
+};
+
+// def_qwertz:
+// The standard Hungaryan qwertz layout
+
+hidden partial alphanumeric_keys
+xkb_symbols "def_qwertz" {
+    key <AB01> {        [                y, Y                ],
+                        [          greater                   ]       };
+    key <AD06> {        [                z, Z                ]       };
+};
+
+// def_qwerty:
+// The qwerty layout for people who familiar with the standard US layout
+
+hidden partial alphanumeric_keys
+xkb_symbols "def_qwerty" {
+    key <AB01> {        [                z, Z                ],
+                        [          greater                   ]       };
+    key <AD06> {        [                y, Y                ]       };
+};
+
+// def_comma:
+// The Hungarian standard is the comma on the keypad not decimal dot
+hidden partial keypad_keys
+xkb_symbols "def_comma" {
+   key  <KPDL> {        [        KP_Delete, KP_Separator     ]       };
+};
+
+// def_dot:
+// The Hungarian standard is the comma on the keypad not decimal dot,
+// but programmers hate it
+hidden partial keypad_keys
+xkb_symbols "def_dot" {
+   key  <KPDL> {        [        KP_Delete, KP_Decimal       ]       };
+};
+
+// def_common:
+// The common part of all Hungarian layout above
+hidden partial alphanumeric_keys modifier_keys
+xkb_symbols "def_common" {
+
+    // Alphanumeric section
+    key <AE01> {        [                1, apostrophe       ],
+                        [       asciitilde, dead_tilde       ]       };
+    key <AE02> {        [                2, quotedbl         ],
+                        [       dead_caron, caron            ]       };
+    key <AE03> {        [                3, plus             ],
+                        [      asciicircum, dead_circumflex  ]       };
+    key <AE04> {        [                4, exclam           ],
+                        [       dead_breve, breve            ]       };
+    key <AE05> {        [                5, percent          ],
+                        [   dead_abovering, degree           ]       };
+    key <AE06> {        [                6, slash            ],
+                        [      dead_ogonek, ogonek           ]       };
+    key <AE07> {        [                7, equal            ],
+                        [            grave, dead_grave       ]       };
+    key <AE08> {        [                8, parenleft        ],
+                        [    dead_abovedot, degree           ]       };
+    key <AE09> {        [                9, parenright       ],
+                        [       dead_acute, acute            ]       };
+    key <AE10> {        [       odiaeresis, Odiaeresis       ],
+                        [ dead_doubleacute, doubleacute      ]       };
+    key <AE11> {        [       udiaeresis, Udiaeresis       ],
+                        [   dead_diaeresis, diaeresis        ]       };
+    key <AE12> {        [           oacute, Oacute           ],
+                        [     dead_cedilla, cedilla          ]       };
+
+    key <AD01> {        [                q, Q                ],
+                        [        backslash                   ]       };
+    key <AD02> {        [                w, W                ],
+                        [              bar                   ]       };
+    key <AD08> {        [                i, I                ],
+                        [           Iacute                   ]       };
+    key <AD12> {        [           uacute, Uacute           ],
+                        [         multiply                   ]       };
+
+    key <AC04> {        [                f, F                ],
+                        [      bracketleft                   ]       };
+    key <AC05> {        [                g, G                ],
+                        [     bracketright                   ]       };
+    key <AC07> {        [                j, J                ],
+                        [           iacute                   ]       };
+    key <AC10> {        [           eacute, Eacute           ],
+                        [           dollar                   ]       };
+    key <AC11> {        [           aacute, Aacute           ],
+                        [           ssharp                   ]       };
+
+    key <LSGT> {        [           iacute, Iacute           ],
+                        [             less                   ]       };
+    key <AB02> {        [                x, X                ],
+                        [       numbersign                   ]       };
+    key <AB03> {        [                c, C                ],
+                        [        ampersand                   ]       };
+    key <AB04> {        [                v, V                ],
+                        [               at                   ]       };
+    key <AB05> {        [                b, B                ],
+                        [        braceleft                   ]       };
+    key <AB06> {        [                n, N                ],
+                        [       braceright                   ]       };
+    key <AB07> {        [                m, M                ],
+                        [             less                   ]       };
+    key <AB08> {        [            comma, question         ],
+                        [        semicolon                   ]       };
+    key <AB09> {        [           period, colon            ],
+                        [          greater                   ]       };
+    key <AB10> {        [            minus, underscore       ],
+                        [         asterisk                   ]       };
+    key <RALT> {        [      Mode_switch, Multi_key        ]       };
+    key <LALT> {        [            Alt_L, Meta_L           ]       };
+
+    // End alphanumeric section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+};
+
+partial
+xkb_symbols "Sundeadkeys" {
+    include "hu(default)" // for consistent naming
+};
+
+partial
+xkb_symbols "sundeadkeys" {
+    include "hu(Sundeadkeys)" // for consistent naming
+};
+
+partial
+xkb_symbols "nodeadkeys" {
+    // modify the default Hungarian layout to not have any dead keys
+    include "hu(default)"
+    key <AE01> {        [                1, apostrophe       ],
+                        [       asciitilde                   ]       };
+    key <AE02> {        [                2, quotedbl         ],
+                        [            caron                   ]       };
+    key <AE03> {        [                3, plus             ],
+                        [      asciicircum                   ]       };
+    key <AE04> {        [                4, exclam           ],
+                        [            breve                   ]       };
+    key <AE05> {        [                5, percent          ],
+                        [           degree                   ]       };
+    key <AE06> {        [                6, slash            ],
+                        [           ogonek                   ]       };
+    key <AE07> {        [                7, equal            ],
+                        [            grave                   ]       };
+    key <AE08> {        [                8, parenleft        ],
+                        [         abovedot                   ]       };
+    key <AE09> {        [                9, parenright       ],
+                        [            acute                   ]       };
+    key <AE10> {        [       odiaeresis, Odiaeresis       ],
+                        [      doubleacute                   ]       };
+    key <AE11> {        [       udiaeresis, Udiaeresis       ],
+                        [        diaeresis                   ]       };
+    key <AE12> {        [           oacute, Oacute           ],
+                        [          cedilla                   ]       };
+
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/is	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,161 @@
+// $Xorg: is,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
+// XKB keyboard by Hrafnkell Eiriksson - [email protected]
+//     fixes by Olafur Osvaldsson - [email protected]
+// $XFree86: xc/programs/xkbcomp/symbols/is,v 3.7 2002/11/26 01:57:24 dawes Exp $
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and an Icelandic one - hopefully
+
+    // Alphanumeric section
+    name[Group1]= "Icelandic";
+    key <TLDE> {        [ dead_abovering, dead_diaeresis       ],
+                        [   notsign                     ]       };
+    key <AE02> {        [         2,    quotedbl        ],
+                        [ twosuperior                   ]       };
+    key <AE03> {        [         3,    numbersign      ],
+                        [ threesuperior,sterling        ]       };
+    key <AE04> {        [         4,    dollar          ],
+                        [ onequarter,   currency        ]       };
+    key <AE05> {        [         5,    percent         ],
+                        [   onehalf                     ]       };
+    key <AE06> {        [         6,    ampersand       ],
+                        [ threequarters                 ]       };
+    key <AE07> {        [         7,    slash           ],
+                        [ braceleft                     ]       };
+    key <AE08> {        [         8,    parenleft       ],
+                        [ bracketleft                   ]       };
+    key <AE09> {        [         9,    parenright      ],
+                        [ bracketright, plusminus       ]       };
+    key <AE10> {        [         0,    equal           ],
+                        [ braceright,   degree          ]       };
+    key <AE11> {        [    odiaeresis, Odiaeresis     ],
+                        [ backslash,    questiondown    ]       };
+    key <AE12> {        [ minus,        underscore      ],
+                        [ ccedilla                      ]       };
+    key <AD01> {        [         q,    Q               ],
+                        [        at                     ]       };
+    key <AD03> {        [         e,    E               ],
+                        [  EuroSign,    cent            ]       };
+//    key <AD05> {      [         t,    T               ]       };
+//    key <AD06> {      [         z,    Z               ]       };
+//    key <AD07> {      [         u,    U               ]       };
+//    key <AD08> {      [         i,    I               ]       };
+    key <AD11> {        [ eth,                  Eth     ],
+                        [ dead_diaeresis                ]       };
+    key <AD12> {        [ apostrophe ,  question        ],
+                        [  dead_tilde,   dead_macron     ]       };
+//    key <AC04> {      [         f,    F               ]       };
+//    key <AC05> {      [         g,    G               ]       };
+    key <AC10> {        [ ae,                   AE      ],
+                        [ asciicircum                   ]       };
+    key <AC11> {        [ dead_acute,   dead_acute	],
+                        [ dead_circumflex               ]       };
+
+    key <LSGT> {        [      less,    greater         ],
+                        [       bar                     ]       };
+//    key <AB01> {      [         y,    Y               ],
+//                      [ guillemotleft, less           ]       };
+//    key <AB07> {      [         m,    M               ],
+//                      [        mu                     ]       };
+    key <AB08> {        [     comma,    semicolon       ]       };
+    key <AB09> {        [    period,    colon           ],
+                        [ periodcentered, division      ]       };
+    key <AB10> {        [     thorn,    Thorn   ]       };
+    key <BKSL> {        [ plus,         asterisk        ],
+                        [ grave                 ]       };
+
+    // End alphanumeric section
+
+    // begin modifier mappings
+    include "ralt(mode_switch)"
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+    // modify the default Icelandic layout to use Sun dead keys
+    include "is(basic)"
+//    key <TLDE> {        [ SunFA_Circum, degree          ],
+//                        [   notsign                     ]       };
+//    key <AE12> {        [ SunFA_Acute,  SunFA_Grave     ],
+//                        [ SunFA_Cedilla                 ]       };
+//    key <AD11> {        [ udiaeresis,   Udiaeresis      ],
+//                        [ SunFA_Diaeresis               ]       };
+//    key <AD12> {        [      plus,    asterisk        ],
+//                        [ SunFA_Tilde,  dead_macron     ]       };
+//    key <AC10> {        [ odiaeresis,   Odiaeresis      ],
+//                        [ SunFA_Acute                   ]       };
+//    key <AC11> {        [ adiaeresis,   Adiaeresis      ],
+//                        [ SunFA_Circum                  ]       };
+//    key <BKSL> {        [ numbersign,   acute           ],
+//                        [ SunFA_Grave                   ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+    include "is(Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    // modify the default Icelandic layout to not have any dead keys
+    include "is(basic)"
+    key <TLDE> {        [ degree, 	diaeresis       ],
+                        [ notsign                     ]       };
+    key <AE12> {        [ minus,        underscore      ],
+                        [ ccedilla                      ]       };
+    key <AD11> {        [ eth,                  Eth     ],
+                        [ diaeresis  			]       };
+    key <AD12> {        [ apostrophe ,  question        ],
+                        [ asciitilde,   macron     ]       };
+    key <AC10> {        [ ae,                   AE      ],
+                        [ asciicircum                   ]       };
+    key <AC11> {        [ acute,   	acute		],
+                        [ asciicircum			]       };
+    key <BKSL> {        [ plus,         asterisk        ],
+                        [ grave                 ]       };
+
+//    key <TLDE> {        [ asciicircum,  degree          ],
+//                        [   notsign                     ]       };
+//    key <AE12> {        [ apostrophe,   grave           ],
+//                        [ cedilla                       ]       };
+//    key <AD11> {        [ udiaeresis,   Udiaeresis      ],
+//                        [ diaeresis                     ]       };
+//    key <AD12> {        [      plus,    asterisk        ],
+//                        [ asciitilde,   macron          ]       };
+//    key <AC10> {        [ odiaeresis,   Odiaeresis      ],
+//                        [ acute                         ]       };
+//    key <AC11> {        [ adiaeresis,   Adiaeresis      ],
+//                        [ asciicircum                   ]       };
+//    key <BKSL> {        [ numbersign,   acute           ],
+//                        [ grave                         ]       };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/it	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,130 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type4" {
+ 
+    key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft    ]        };
+    key <BRCR> { [ bracketright, braceright ], [ guillemotright ]       };
+    key <AE02> { [ 2, quotedbl          ], [ twosuperior        ]       };
+    key <AE03> { [ 3, sterling          ], [ threesuperior      ]       };
+    key <AE06> { [ 6, ampersand         ], [ notsign            ]       };
+    key <AE06> { [ 7, slash             ]                               };
+    key <AE06> { [ 8, parenleft         ]                               };
+    key <AE09> { [ 9, parenright        ], [ backslash          ]       };
+    key <AE10> { [ 0, equal             ], [ bar                ]       };
+    key <AE11> { [ quoteright, question ], [ quoteleft          ]       };
+    key <AE12> { [ igrave, asciicircum  ] };
+ 
+    key <AD11> { [ egrave, eacute       ]                               };
+    key <AD12> { [ plus, asterisk       ], [ asciitilde         ]       };
+ 
+    key <AC10> { [ ograve, ccedilla     ], [ at                 ]       };
+    key <AC11> { [ agrave, degree       ], [ numbersign         ]       };
+    key <TLDE> { [ ugrave, section      ]                               };
+ 
+    key <LSGT> { [ less, greater        ]                               };
+    key <AB08> { [ comma, semicolon     ]                               };
+    key <AB09> { [ period, colon        ]                               };
+    key <AB10> { [ minus, underscore    ]                               };
+     
+ 
+    key <LALT> { [ Alt_L                ]                               };
+    key <COMP> { [ SunCompose           ]                               };
+    key <RALT> { [ SunAltGraph          ]                               };
+    key <LCTL> { [ Caps_Lock            ]                               };
+    key <CAPS> { [ Control_L            ]                               };
+ 
+};
+ 
+xkb_symbols "type5" {
+    include "it"
+                                                                                
+    key <AE08> { [ 8, parenleft         ], [ braceleft                  ] };
+    key <AE09> { [ 9, parenright        ], [ braceright                 ] };
+ 
+    key <BKSL> { [ ugrave, section      ], [ asciitilde                 ] };
+};
+ 
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+
+    key <LSGT> {	[	     less,	   greater	]	};
+    key <TLDE> { 	[       backslash,             bar      ]       };
+    key <AE02> {	[               2,        quotedbl     	]	};
+    key <AE03> {	[               3,        sterling     	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash     	]	};
+    key <AE08> {	[               8,       parenleft     	],	
+                        [       braceleft			]       };
+    key <AE09> {	[               9,      parenright     	],	
+                        [      braceright			]       };
+    key <AE10> {	[               0,           equal     	]	};
+    key <AE11> {	[      apostrophe,        question      ],	
+			[	    grave			]	};
+    key <AE12> {	[          igrave,     asciicircum	]	};
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign			]       };
+    key <AD11> {	[	   egrave,          eacute     	],	
+			[     bracketleft,  dead_abovering	]	};
+    key <AD12> {	[            plus,        asterisk     	],	
+			[    bracketright			]      	};
+    key <BKSL> {	[          ugrave,         section	],
+			[	asciitilde			]	};
+    key	<AC10> {	[	   ograve,        ccedilla  	],	
+			[              at			]	};
+    key <AC11> {	[ 	   agrave, 	degree		],
+			[	numbersign			]	};
+    key <AB08> {        [           comma,       semicolon      ]       };
+    key <AB09> {        [          period,           colon      ]       };
+    key <AB10> {        [           minus,      underscore      ]       };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/jp	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,819 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "basic" {
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+//    key <BRCR> { [ Linefeed		]			};
+    key <EXEC> { [ Execute		]			};
+};
+xkb_symbols "type4" {
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    key <COMP> { [ Multi_key		]			};
+    key <EXEC> { [ Execute		]			};
+//    key <TLFD> { [ Linefeed		]			};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+    key <BRCR> { [ Linefeed		]			};
+
+    key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]			};
+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract		]			};
+
+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+    key  <KP8> { [ Up,	R8		], [ KP_8		] };
+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+    key <KPAD> { [ KP_Add		]			};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		] };
+    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+    key  <KP6> { [ Right, R12		], [ KP_6		] };
+
+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+    key  <KP2> { [ Down, R14		], [ KP_2		] };
+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+    key <KPEN> { [ KP_Enter		]			}; 
+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Num_Lock };
+    modifier_map Mod4		{ Alt_L };
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // Alphanumeric section
+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+//    key <RCTL> { [ Control_R		]			};
+    key <EXEC> { [ Execute		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+    key  <KP8> { [ Up, R8		], [ KP_8		]	};
+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		]	};
+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+    key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+    key  <KP2> { [ Down, R14		], [ KP_2		]	};
+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_R };
+    modifier_map Mod3	{ Num_Lock };
+    modifier_map Mod4	{ Alt_L };
+};
+
+xkb_symbols "type5hobo" {
+
+    // Alphanumeric section
+    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};
+    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};
+    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};
+    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};
+    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};
+    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};
+    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+    key <RTSH> { [ Shift_R		]	};
+
+    key <LCTL> { [ Control_L		]			};
+    key <EXEC> { [ Execute		]			};
+    key <SPCE> { [ space		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+     key <NMLK> { [ Num_Lock 		]				};
+//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+//     key  <KP8> { [ Up, R8		], [ KP_8		]	};
+//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+//     key <KPAD> { [ KP_Add		]				};
+
+//     key  <KP4> { [ Left, R10		], [ KP_4		]	};
+//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+//     key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+//     key  <KP2> { [ Down, R14		], [ KP_2		]	};
+//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+//     key <KPEN> { [ KP_Enter		]				};
+
+//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_R };
+    modifier_map Mod3	{ Num_Lock };
+    modifier_map Mod4	{ Alt_L };
+};
+
+// layout for a Japanese Type 6 Sun keyboard
+// Just shows differences from Type 6 US layout 
+partial
+xkb_symbols "type6" {
+
+    // Alphanumeric section
+    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.
+    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+    key <AB11> { [ backslash, underscore], [ kana_RO		]	};
+    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <EXEC> { [ Execute		]			};
+    key <KANJ> { [ Kanji		]			};
+    key <HENK> { [ Henkan_Mode		]			};
+    key <ALGR> { [ Kana_Lock, Mode_switch ]	};
+    // End alphanumeric section
+};
+
+xkb_symbols "x86" {
+    include "sun_vndr/us(pc101)"
+    include "sun_vndr/jp(basic)"
+    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
+
+    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};
+    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};
+
+    
+    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};
+
+    key <ALGR> { [ Mode_switch ]	       };
+    key <RALT> { [ Alt_R ]	       };
+
+};
+
+xkb_symbols "J3100" {
+    include "sun_vndr/us(pc101)"
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
+//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
+
+    key <SPCE> { [ space		]			};
+//    key <KANJ> { [ Kanji		]			};
+//    key <HENK> { [ Henkan_Mode		]			};
+//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <ESC>  { [ Escape		]			};
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
+//    key <BRCR> { [ Linefeed		]			};
+//    key <EXEC> { [ Execute		]			};
+
+    key <ESC>  { [ Escape, 3 ] };
+
+    key <AE02> { [ 2, at		], [ kana_FU			]};
+    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};
+    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};
+    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};
+    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};
+    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};
+    key <AE11> { [ minus, underscore	], [ kana_HO			]};
+    key <AE12> { [ equal, plus		], [ kana_HE			]};
+
+    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};
+    key <AE12> { [ equal, plus		], [ kana_HE			]};
+
+    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    
+    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    
+
+    key <AC10> { [ semicolon, colon	     ], [ kana_RE		]};    
+    key <AC11> { [ quoteright, quotedbl	     ], [ kana_KE		]};    
+
+    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};
+    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};
+//    key <ALGR> { [ Mode_switch ]	       };
+    key <RALT> { [ Henkan_Mode ]	       };
+    key <RCTL> { [ Mode_switch ]	       };
+
+};
+
+xkb_symbols "Muhenkan_x86" {
+    include "sun_vndr/jp(x86)"
+
+    key <EXEC> { [ Muhenkan ] };
+};
+
+
+
+partial
+xkb_symbols "type7" {
+    include "sun_vndr/jp(type6)"
+    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };
+    key <TLDE> { [ Henkan_Mode ] };
+    key <HENK> { [ Kana_Lock, Mode_switch ] };
+    key <ALGR> { [ Alt_R, Alt_R ] };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/kg	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,172 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys 
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+    name[Group1]= "Kyrgyzstan";
+    name[Group2]= "US/ASCII";
+
+
+    key <AE01> {        [               1,          exclam      ],
+                        [               1,          exclam      ]       };
+    key <AE02> {        [               2,        quotedbl      ],
+                        [               2,              at      ]       };
+    key <AE03> {        [               3,      numerosign      ],
+                        [               3,      numbersign      ]       };
+    key <AE04> {        [               4,       semicolon      ],
+                        [               4,          dollar      ]       };
+    key <AE05> {        [               5,         percent      ],
+                        [               5,         percent      ]       };
+    key <AE06> {        [               6,           colon      ],
+                        [               6,     asciicircum      ]       };
+    key <AE07> {        [               7,        question      ],
+                        [               7,       ampersand      ]       };
+    key <AE08> {        [               8,        asterisk      ],
+                        [               8,        asterisk      ]       };
+    key <AE09> {        [               9,       parenleft      ],
+                        [               9,       parenleft      ]       };
+    key <AB10> {        [          period,           comma      ],
+                        [           slash,        question      ]       };
+    key <AE11> {        [           minus,      underscore      ],
+                        [           minus,      underscore      ]       };
+    key <AE12> {        [           equal,            plus      ],
+                        [           equal,            plus      ]       };
+    key <BKSL> {        [       backslash,           slash      ],
+                        [       backslash,             bar      ]       };
+    key <AB10> {        [           slash,        question      ],
+                        [           slash,        question      ]       };
+    key <LSGT> {        [           slash,             bar      ]       };
+
+key.type[group2]="ALPHABETIC";
+
+    key <TLDE> {        [           grave,      asciitilde      ]       };
+    key <AD01> {        [ Cyrillic_shorti, Cyrillic_SHORTI      ],
+                        [               q,               Q      ]       };
+    key <AD02> {        [    Cyrillic_tse,    Cyrillic_TSE      ],
+                        [               w,               W      ]       };
+    key <AD03> { 	[      Cyrillic_u,      Cyrillic_U 	],
+                 	[ Cyrillic_u_straight, Cyrillic_U_straight ]    };
+    key <AD04> {        [     Cyrillic_ka,     Cyrillic_KA      ],
+                        [               r,               R      ]       };
+    key <AD05> {        [     Cyrillic_ie,     Cyrillic_IE      ],
+                        [               t,               T      ]       };
+    key <AD06> { 	[      Cyrillic_en,    Cyrillic_EN 	],  
+                 	[ Cyrillic_en_descender, Cyrillic_EN_descender ] };            
+    key <AD07> {        [    Cyrillic_ghe,    Cyrillic_GHE      ],
+                        [               u,               U      ]       };
+    key <AD08> {        [    Cyrillic_sha,    Cyrillic_SHA      ],
+                        [               i,               I      ]       };
+    key <AD09> {        [  Cyrillic_shcha,  Cyrillic_SHCHA      ],
+                        [               o,               O      ]       };
+    key <AD10> {        [     Cyrillic_ze,     Cyrillic_ZE      ],
+                        [               p,               P      ]       };
+    key <AD11> {        [     Cyrillic_ha,     Cyrillic_HA      ],
+                        [     bracketleft,       braceleft      ]       };
+    key <AD12> {        [Cyrillic_hardsign,Cyrillic_HARDSIGN    ],
+                        [    bracketright,      braceright      ]       };
+
+    key <AC01> {        [     Cyrillic_ef,     Cyrillic_EF      ],
+                        [               a,               A      ]       };
+    key <AC02> {        [   Cyrillic_yeru,   Cyrillic_YERU      ],
+                        [               s,               S      ]       };
+    key <AC03> {        [     Cyrillic_ve,     Cyrillic_VE      ],
+                        [               d,               D      ]       };
+    key <AC04> {        [      Cyrillic_a,      Cyrillic_A      ],
+                        [               f,               F      ]       };
+    key <AC05> {        [     Cyrillic_pe,     Cyrillic_PE      ],
+                        [               g,               G      ]       };
+    key <AC06> {        [     Cyrillic_er,     Cyrillic_ER      ],
+                        [               h,               H      ]       };
+    key <AC07> { 	[      Cyrillic_o,      Cyrillic_O      ],           
+                        [  Cyrillic_o_bar,  Cyrillic_O_bar      ]       };
+    key <AC08> {        [     Cyrillic_el,     Cyrillic_EL      ],
+                        [               k,               K      ]       };
+    key <AC09> {        [     Cyrillic_de,     Cyrillic_DE      ],
+                        [               l,               L      ]       };
+    key <AC10> {        [    Cyrillic_zhe,    Cyrillic_ZHE      ],
+                        [       semicolon,           colon      ]       };
+    key <AC11> {        [      Cyrillic_e,      Cyrillic_E      ],
+                        [      apostrophe,        quotedbl      ]       };
+
+    key <AB01> {        [     Cyrillic_ya,     Cyrillic_YA      ],
+                        [               z,               Z      ]       };
+    key <AB02> {        [    Cyrillic_che,    Cyrillic_CHE      ],
+                        [               x,               X      ]       };
+    key <AB03> {        [     Cyrillic_es,     Cyrillic_ES      ],
+                        [               c,               C      ]       };
+    key <AB04> {        [     Cyrillic_em,     Cyrillic_EM      ],
+                        [               v,               V      ]       };
+    key <AB06> {        [     Cyrillic_te,     Cyrillic_TE      ],
+                        [               n,               N      ]       };
+    key <AB05> {        [      Cyrillic_i,      Cyrillic_I      ],
+                        [               b,               B      ]       };
+    key <AB07> {        [Cyrillic_softsign,Cyrillic_SOFTSIGN    ],
+                        [               m,               M      ]       };
+    key <AB08> {        [     Cyrillic_be,     Cyrillic_BE      ],
+                        [           comma,            less      ]       };
+    key <AB09> {        [     Cyrillic_yu,     Cyrillic_YU      ],
+                        [          period,         greater      ]       };
+
+key.type[group2]="TWO_LEVEL";
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ko	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,85 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Korean layout for a Type 4 Sun keyboard
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
+
+    key <LNFD> { [ Hangul		]			};
+    key <RALT> { [ Linefeed		]			};
+    key <COMP> { [ Hangul_Hanja		]			};
+
+};
+
+// Korean layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+//    include "sun_vndr/us(type5basic)"
+
+    // A few keys are different
+    key <ALGR> { [ Hangul		]				  };
+    key <COMP> { [ Hangul_Hanja		]				  };
+    key <BKSL> { [ backslash, bar	], [ brokenbar			] };
+};
+
+// Korean layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+//    include "sun_vndr/us(type5basic)"
+
+    // A few keys are different
+    key <ALGR> { [ Hangul		]				  };
+    key <COMP> { [ Hangul_Hanja		]				  };
+    key <BKSL> { [ backslash, bar	], [ brokenbar			] };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/kz	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,157 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+// layout for a Sun Type 6 Kazakhstan keyboard
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+
+    name[Group1]= "US/ASCII";
+    name[Group2]= "Kazakhstan";
+
+    key <TLDE> {        [               parenleft,              parenright      ],
+                        [             Cyrillic_io,             Cyrillic_IO      ]       };
+    key <AE01> {        [                       1,                  exclam      ],
+                        [                quotedbl,                  exclam      ]       };
+    key <AE02> {        [                       2,                      at      ],
+                        [          Cyrillic_schwa,          Cyrillic_SCHWA      ]       };
+    key <AE03> {        [                       3,              numbersign      ],
+                        [             Ukrainian_i,             Ukrainian_I      ]       };
+    key <AE04> {        [                       4,                  dollar      ],
+                        [   Cyrillic_en_descender,   Cyrillic_EN_descender      ]       };
+    key <AE05> {        [                       5,                 percent      ],
+                        [        Cyrillic_ghe_bar,        Cyrillic_GHE_bar      ]       };
+    key <AE06> {        [                       6,             asciicircum      ],
+                        [                   comma,               semicolon      ]       };
+    key <AE07> {        [                       7,               ampersand      ],
+                        [                  period,                   colon      ]       };
+    key <AE08> {        [                       8,                asterisk      ],
+                        [     Cyrillic_u_straight,     Cyrillic_U_straight      ]       };
+    key <AE09> {        [                       9,               parenleft      ],
+                        [ Cyrillic_u_straight_bar, Cyrillic_U_straight_bar      ]       };
+    key <AE10> {        [                       0,              parenright      ],
+                        [   Cyrillic_ka_descender,   Cyrillic_KA_descender      ]       };
+    key <AE11> {        [                   minus,              underscore      ],
+                        [          Cyrillic_o_bar,          Cyrillic_O_bar      ]       };
+    key <AE12> {        [                   equal,                    plus      ],
+                        [           Cyrillic_shha,           Cyrillic_SHHA      ]       };
+    key <AD01> {        [                       q,                       Q      ],
+                        [         Cyrillic_shorti,         Cyrillic_SHORTI      ]       };
+    key <AD02> {        [                       w,                       W      ],
+                        [            Cyrillic_tse,            Cyrillic_TSE      ]       };
+    key <AD03> {        [                       e,                       E      ],
+                        [              Cyrillic_u,              Cyrillic_U      ]       };
+    key <AD04> {        [                       r,                       R      ],
+                        [             Cyrillic_ka,             Cyrillic_KA      ]       };
+    key <AD05> {        [                       t,                       T      ],
+                        [             Cyrillic_ie,             Cyrillic_IE      ]       };
+    key <AD06> {        [                       y,                       Y      ],
+                        [             Cyrillic_en,             Cyrillic_EN      ]       };
+    key <AD07> {        [                       u,                       U      ],
+                        [            Cyrillic_ghe,            Cyrillic_GHE      ]       };
+    key <AD08> {        [                       i,                       I      ],
+                        [            Cyrillic_sha,            Cyrillic_SHA      ]       };
+    key <AD09> {        [                       o,                       O      ],
+                        [          Cyrillic_shcha,          Cyrillic_SHCHA      ]       };
+    key <AD10> {        [                       p,                       P      ],
+                        [             Cyrillic_ze,             Cyrillic_ZE      ]       };
+    key <AD11> {        [             bracketleft,               braceleft      ],
+                        [             Cyrillic_ha,             Cyrillic_HA      ]       };
+    key <AD12> {        [            bracketright,              braceright      ],
+                        [       Cyrillic_hardsign,       Cyrillic_HARDSIGN      ]       };
+    key <BKSL> {        [               backslash,                     bar      ],
+                        [               backslash,                   slash      ]       };
+    key <AC01> {        [                       a,                       A      ],
+                        [             Cyrillic_ef,             Cyrillic_EF      ]       };
+    key <AC02> {        [                       s,                       S      ],
+                        [           Cyrillic_yeru,           Cyrillic_YERU      ]       };
+    key <AC03> {        [                       d,                       D      ],
+                        [             Cyrillic_ve,             Cyrillic_VE      ]       };
+    key <AC04> {        [                       f,                       F      ],
+                        [              Cyrillic_a,              Cyrillic_A      ]       };
+    key <AC05> {        [                       g,                       G      ],
+                        [             Cyrillic_pe,             Cyrillic_PE      ]       };
+    key <AC06> {        [                       h,                       H      ],
+                        [             Cyrillic_er,             Cyrillic_ER      ]       };
+    key <AC07> {        [                       j,                       J      ],
+                        [              Cyrillic_o,              Cyrillic_O      ]       };
+    key <AC08> {        [                       k,                       K      ],
+                        [             Cyrillic_el,             Cyrillic_EL      ]       };
+    key <AC09> {        [                       l,                       L      ],
+                        [             Cyrillic_de,             Cyrillic_DE      ]       };
+    key <AC10> {        [               semicolon,                   colon      ],
+                        [            Cyrillic_zhe,            Cyrillic_ZHE      ]       };
+    key <AC11> {        [              apostrophe,                quotedbl      ],
+                        [              Cyrillic_e,              Cyrillic_E      ]       };
+    key <AB01> {        [                       z,                       Z      ],
+                        [             Cyrillic_ya,             Cyrillic_YA      ]       };
+    key <AB02> {        [                       x,                       X      ],
+                        [            Cyrillic_che,            Cyrillic_CHE      ]       };
+    key <AB03> {        [                       c,                       C      ],
+                        [             Cyrillic_es,             Cyrillic_ES      ]       };
+    key <AB04> {        [                       v,                       V      ],
+                        [             Cyrillic_em,             Cyrillic_EM      ]       };
+    key <AB05> {        [                       b,                       B      ],
+                        [              Cyrillic_i,              Cyrillic_I      ]       };
+    key <AB06> {        [                       n,                       N      ],
+                        [             Cyrillic_te,             Cyrillic_TE      ]       };
+    key <AB07> {        [                       m,                       M      ],
+                        [       Cyrillic_softsign,       Cyrillic_SOFTSIGN      ]       };
+    key <AB08> {        [                   comma,                    less      ],
+                        [             Cyrillic_be,             Cyrillic_BE      ]       };
+    key <AB09> {        [                  period,                 greater      ],
+                        [             Cyrillic_yu,             Cyrillic_YU      ]       };
+    key <AB10> {        [                   slash,                question      ], 
+                        [              numerosign,                question      ]       };
+    key	<LSGT> {	[		     less,	           greater	],
+			[		      bar,		brokenbar	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/lt	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,221 @@
+// $XFree86$
+// Lithuanian keyboard map by Ričardas Čepas <[email protected]>
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Describes popular Lithuanian keymap 'Baltic' aka querty/numeric
+// Don't rename this file because it includes 'lt'
+// Extensions:  „ “ instead of 9 0 in Lithuanian mode, endash/Euro on 102nd key
+//  Usage:  setxkbmap -option grp:shift_toggle 'lt'
+//   # +lt(left_switch) turns key between left ctrl and shift on "German" keyboards into AltGr
+// Option	"XkbModel"	"pc105"
+// Option	"XkbLayout"	"lt+lt(left_switch)"
+//   # Double shift toggles between numbers and Lithuanian letters, you may choose other keys
+// Option	"XkbOptions"	"grp:shift_toggle"
+
+
+partial default alphanumeric_keys modifier_keys 
+xkb_symbols "basic" {
+
+include "us(basic)"
+
+    name[Group1]= "US/ASCII";
+    name[Group2]= "Lithuanian";
+    include "lt(us_group2)"
+
+    key	<AE01> {	[		1,	    exclam	],
+			[	  onequarter,	    1	]	};
+    key	<AE02> {	[		2,		at	],
+			[	   onehalf,	    doublequote]	};
+    key	<AE03> {	[		3,	numbersign	],
+			[	  threequarters,	   3	]	};
+    key	<AE04> {	[		4,	    dollar	],
+			[	currency,	 4	]	};
+    key	<AE05> {	[		5,	   percent	],
+			[	  cent,	   5	]	};
+    key	<AE06> {	[		6,     asciicircum	],
+			[	   degree,	    6	]	};
+    key	<AE07> {	[		7,	 ampersand	],
+			[	  section,	   7	]	};
+    key	<AE08> {	[		8,	  asterisk	],
+			[	  multiply,	   question	]	};
+    key	<AE09> {	[		9,	 parenleft	],
+			[ doublelowquotemark,    parenleft	]	};
+    key	<AE10> {	[		0,	parenright	],
+// this is actually right quote for Lithuanian
+			[ leftdoublequotemark,  parenright	]	};
+
+
+
+    key	<AE12> {	[	    equal,	      plus	],
+			[	   zcaron,	    Zcaron	]	};
+    key	<LSGT> {	[	   endash,	  EuroSign 	],
+			[	   endash,	  EuroSign 	]	};
+
+    key <AD01> {	[], [	  q,	Q 		],	 
+			    [	  onesuperior,    aogonek] 	};
+    key <AD02> {	[], [	  w,	W		],
+			    [	  twosuperior,	  zcaron]};
+    key <AD03> {	[], [	  e,	E		],
+			    [	  threesuperior]	};
+		
+    key <AD04> {	[], [	  r,	R		],
+			    [ 	  registered]			};
+    key <AD05> {	[], [	  t,	T		]	};
+    key <AD06> {	[], [	  y,	Y		]	};
+    key <AD07> {	[], [	  u,	U		]	};
+    key <AD08> {	[], [	  i,	I		]	};
+    key <AD09> {	[], [	  o,	O		]	};
+    key <AD10> {	[], [	  p,	P		]	};
+    key <AD11> {	[], [ bracketleft,	braceleft	],	
+			    [         iogonek,         Iogonek      ]        };
+    key <AD12> {	[], [ bracketright,	braceright	]	};
+
+    key <AC01> {	[], [	  a,	A 		]	};
+    key <AC02> {	[], [	  s,	S		],	
+			    [	  ssharp]	};
+    key <AC03> {	[], [	  d,	D		]	};
+    key <AC04> {	[], [	  f,	F		]	};
+    key <AC05> {	[], [	  g,	G		]	};
+    key <AC06> {	[], [	  h,	H		]	};
+    key <AC07> {	[], [	  j,	J		]	};
+    key <AC08> {	[], [	  k,	K		]	};
+    key <AC09> {	[], [	  l,	L		],	
+			    [	  sterling ]		};
+    key <AC10> {	[], [ semicolon,	colon		],	
+			    [ uogonek,		Uogonek]	};
+    key <AC11> {	[], [ quoteright,	quotedbl	],	
+			    [ eabovedot,	Eabovedot	] };
+    key <AC12>  {	[], [ slash,		bar	]	};
+
+    key <AB01> {	[], [	  onesuperior,	twosuperior		],	
+			    [	  threesuperior]	};
+    key <AB02> {	[], [	  z,	Z 		]	};
+    key <AB03> {	[], [	  x,	X		],
+			    [     umacron,	Umacron]	};
+    key <AB04> {	[], [	  c,	C		]	};
+    key <AB05> {	[], [	  v,	V		]	};
+    key <AB06> {	[], [	  b,	B		]	};
+    key <AB07> {	[], [	  n,	N		],
+		            [	  notsign	]	};
+    key <AB08> {	[], [	  m,	M		]	};
+    key <AB09> {	[], [     comma,	less		],
+			    [	  ccaron,	Ccaron	]	};
+    key <AB10> {	[], [    period,	greater		],	
+			    [    middledot,	scaron,		Scaron] };
+    key <AB11> {	[], [     slash,	question	]	};
+    key <BKSL> {	[], [ backslash,	question		],	
+			    [ division,		eogonek] };
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "us_group2" {
+
+    // Keyboard must work as usual when "Lithuanian" group is locked.
+    key <TLDE> {	[], [ quoteleft,	asciitilde	]	};
+    key <AE01> {	[], [	  1,	exclam 		]	};
+    key <AE02> {	[], [	  2,	at		]	};
+    key <AE03> {	[], [	  3,	numbersign	]	};
+    key <AE04> {	[], [	  4,	dollar		]	};
+    key <AE05> {	[], [	  5,	percent		]	};
+    key <AE06> {	[], [	  6,	asciicircum	]	};
+    key <AE07> {	[], [	  7,	ampersand	]	};
+    key <AE08> {	[], [	  8,	asterisk	]	};
+    key <AE09> {	[], [	  9,	parenleft	]	};
+    key <AE10> {	[], [	  0,	parenright	]	};
+    key <AE11> {	[], [     minus,	underscore	]	};
+    key <AE12> {	[], [     equal,	plus		]	};
+
+    key <AD01> {	[], [	  q,	Q 		]	};
+    key <AD02> {	[], [	  w,	W		]	};
+    key <AD03> {	[], [	  e,	E		]	};
+    key <AD04> {	[], [	  r,	R		]	};
+    key <AD05> {	[], [	  t,	T		]	};
+    key <AD06> {	[], [	  y,	Y		]	};
+    key <AD07> {	[], [	  u,	U		]	};
+    key <AD08> {	[], [	  i,	I		]	};
+    key <AD09> {	[], [	  o,	O		]	};
+    key <AD10> {	[], [	  p,	P		]	};
+    key <AD11> {	[], [ bracketleft,	braceleft	]	};
+    key <AD12> {	[], [ bracketright,	braceright	]	};
+
+    key <AC01> {	[], [	  a,	A 		]	};
+    key <AC02> {	[], [	  s,	S		]	};
+    key <AC03> {	[], [	  d,	D		]	};
+    key <AC04> {	[], [	  f,	F		]	};
+    key <AC05> {	[], [	  g,	G		]	};
+    key <AC06> {	[], [	  h,	H		]	};
+    key <AC07> {	[], [	  j,	J		]	};
+    key <AC08> {	[], [	  k,	K		]	};
+    key <AC09> {	[], [	  l,	L		]	};
+    key <AC10> {	[], [ semicolon,	colon		]	};
+    key <AC11> {	[], [ quoteright,	quotedbl	]	};
+
+    key <AB01> {	[], [	  z,	Z 		]	};
+    key <AB02> {	[], [	  x,	X		]	};
+    key <AB03> {	[], [	  c,	C		]	};
+    key <AB04> {	[], [	  v,	V		]	};
+    key <AB05> {	[], [	  b,	B		]	};
+    key <AB06> {	[], [	  n,	N		]	};
+    key <AB07> {	[], [	  m,	M		]	};
+    key <AB08> {	[], [     comma,	less		]	};
+    key <AB09> {	[], [    period,	greater		]	};
+    key <AB10> {	[], [     slash,	question	]	};
+    key <BKSL> {	[], [ backslash,	bar		]	};
+
+};
+
+
+
+partial alphanumeric_keys 
+xkb_symbols "Sundeadkeys" {
+    include "lt(basic)" // for consistent naming
+};
+
+partial alphanumeric_keys 
+xkb_symbols "sundeadkeys" {
+    include "lt(Sundeadkeys)" // for consistent naming
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "lt(basic)" // for consistent naming
+};
+
+// definition for the extra key on 102-key keyboards between left Control and Alt
+// in case you want use it as AltGr
+xkb_symbols "left_switch" {
+    key	<LSGT> {	[     Mode_switch,	 Multi_key 	],
+			[     Mode_switch,	 Multi_key 	]	};
+    // Begin modifier mappings 
+    modifier_map Mod3   { Mode_switch };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/lv	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,177 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+
+default partial alphanumeric_keys
+xkb_symbols "type5" {
+include "us(basic)"
+
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Latvian keyboard.
+
+    // Alphanumeric section
+
+    name[group1]="Latvian";
+
+    key <TLDE> {        [       dead_grave, asciitilde      ],
+                        [       question,       soft_hyphen        ]       };
+    key <AE01> {        [       1,      exclam          ],
+                        [       bar,      exclamdown      ]       };
+    key <AE02> {        [       2,        at      ],
+                        [       leftdoublequotemark,      2       ]    };
+    key <AE03> {        [       3,      numbersign      ],
+                        [       rightdoublequotemark,        3      ]     };
+    key <AE04> {        [       4,              dollar          ],
+                        [       section, 4              ]       };
+    key <AE05> {        [       5,              percent          ],
+                        [       EuroSign              ]       };
+    key <AE06> {        [       6,              dead_circumflex],
+                        [      slash,           6]       };
+    key <AE08> {        [       8,              asterisk        ],
+                        [       multiply,       8               ]       };
+    key <AE12> {        [       equal,plus            ],
+                        [       F,              f               ]       };
+    key <AD01> {        [       q,              Q               ],
+                        [       umacron,        Umacron         ]       };
+    key <AD02> {        [       w,              W               ],
+                        [       g,              G               ]       };
+    key <AD03> {        [       e,              E               ],
+                        [       j,              J       ]       };
+    key <AD04> {        [       r,              R               ],
+                        [       r,              R       ]       };
+    key <AD05> {          [       t,            T              ],
+                        [       m,              M       ]       };
+    key <AD06> {          [       y,            Y              ],
+                        [       v,              V       ]       };
+    key <AD07> {        [       u,              U               ],
+                        [       n,      N               ]       };
+    key <AD08> {        [       i,              I               ],
+                        [       z,              Z       ]       };
+    key <AD09> {        [       o,              O               ],
+                        [       emacron,        Emacron         ]       };
+    key <AD10> {        [       p,              P              ],
+                        [       emacron,    Emacron         ]};
+    key <AD11> {        [       bracketleft,    braceleft       ],
+                        [       zcaron,    Zcaron          ]       };
+    key <AD12> {        [       bracketright,    braceright       ],
+                        [       h,               h       ]};
+    key <AC01> {        [       a,              A               ],
+                        [       smacron,        Smacron         ]       };
+    key <AC02> {        [       s,              S               ],
+                        [       u,              U               ]       };
+    key <AC03> {        [       d,              D               ],
+                        [       s,              S       ]};
+    key <AC04> {        [       f,              F               ],
+                        [       i,              I       ]};
+    key <AC05> {        [       g,              G               ],
+                        [       l,             L       ]};
+    key <AC06> {        [       h,              H               ],
+                        [       d,              D       ]};
+    key <AC07> {        [       j,              J               ],
+                        [       a,              AD       ]};
+    key <AC08> {        [       k,              K               ],
+                        [       t,      T       ]       };
+    key <AC09> {        [       l,              L               ],
+                        [       e,      E       ]       };
+    key <AC10> {        [       semicolon,    colon               ],
+                        [       C,              c ]      };
+    key <AC11> {        [       apostrophe,quotedbl               ],
+                        [       degree,         apostrophe    ]  };
+    key <AC12> {        [       degree,         brokenbar         ],
+                        [        kcedilla,  Kcedilla        ]};
+    key <BKSL> {        [       degree,         bar             ]       };
+    key <LSGT> {        [       backslash,      bar             ]       };
+    key <AB01> {        [       backslash,      bar                     ],
+                        [       gcedilla,  Gcedilla        ]};
+    key <AB02> {        [       z,              Z                     ],
+                        [       ncedilla,       Ncedilla ]};
+    key <AB03> {        [       x,              X               ],
+                        [       b,              B               ]       };
+    key <AB04> {        [       c,              C               ],
+                        [       imacron,    Imacron         ]};
+    key <AB05> {        [       v,              V               ],
+                        [       k,           K         ]};
+    key <AB06> {        [       b,              B               ],
+                        [       p,      P       ]       };
+    key <AB07> {        [       n,              N               ],
+                        [       o,      O       ]       };
+    key <AB08> {        [       m,              M               ],
+                        [       amacron,        Amacron ]       };
+    key <AB09> {        [       comma,          less            ],
+                        [       semicolon,      comma   ]       };
+    key <AB10> {        [       period,         greater         ],
+                        [       colon,  period  ]       };
+    key <AB11> {        [       slash,          question                ],
+                        [       lcedilla,       Lcedilla        ]       };
+
+
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // For naming consistency
+
+    include "lv(basic)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    // For naming consistency
+
+    include "lv(Sundeadkeys)"
+
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/nl	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,146 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+
+    key <BKSL> { [ at, section		], [notsign ]		};
+    key <BRCR> { [ backslash, bar	]			};
+    key <AE01> { [ 1, exclam		], [onesuperior	]	};
+    key <AE02> { [ 2, quotedbl		], [twosuperior	]	};
+    key <AE03> { [ 3, numbersign	], [threesuperior]	};
+    key <AE04> { [ 4, dollar		], [onequarter	]	};
+    key <AE05> { [ 5, percent		], [onehalf	]	};
+    key <AE06> { [ 6, ampersand		], [threequarters]	};
+    key <AE07> { [ 7, underscore	], [sterling	]	};
+    key <AE08> { [ 8, parenleft		], [braceleft	]	};
+    key <AE09> { [ 9, parenright	], [braceright	]	};
+    key <AE10> { [ 0, quoteright	], [quoteleft	]	};
+    key <AE11> { [ slash, question	], [backslash  ]	};
+    key <AE12> { [ degree, SunFA_Tilde	], [SunFA_Cedilla]	};
+    key <AD03> { [ e, E			], [EuroSign, Eacute	]};
+    key <AD11> { [ SunFA_Diaeresis, SunFA_Circum ], [asciitilde, asciicircum]};
+    key <AD12> { [ asterisk, bar	], [asciitilde	]	};
+    key <AC02> { [ S, S		], [ssharp	]		};
+    key <AC10> { [ plus, plusminus	]			};
+    key <AC11> { [ SunFA_Acute, SunFA_Grave]			};
+    key <TLDE> { [ less, greater	], [asciicircum	]	};
+    key <LSGT> { [ bracketleft, bracketright], [brokenbar ]	};
+    key <AB01> { [ z, Z		], [guillemotleft]	};
+    key <AB02> { [ x, X		], [guillemotright]	};
+    key <AB03> { [ c, C		], [cent	]	};
+    key <AB07> { [ m, M		], [Greek_mu, masculine ]	};
+    key <AB08> { [ comma, semicolon	], [cedilla, guillemotleft]	};
+    key <AB09> { [ period, colon	], [periodcentered, guillemotright ] };
+    key <AB10> { [ minus, equal		], [hyphen ]		};
+    key <CAPS> { [ SunAltGraph		]			};
+//    key <COMP> { [ SunCompose		]			};
+    key <ALGR> { [ Caps_Lock		]			}; 
+};
+
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+
+    key <AE01> {	[         1,	exclam   	],
+			[ onesuperior			]	};
+    key <AE02> {	[         2,	quotedbl 	],
+			[ twosuperior			]	};
+    key <AE03> {	[         3,	numbersign	],
+			[ threesuperior			]	};
+    key <AE04> {	[         4,	dollar   	],
+			[ onequarter			]	};
+    key <AE05> {	[         5,	percent  	],
+			[ onehalf			]	};
+    key <AE06> {	[         6,	ampersand	],
+			[ threequarters			]	};
+    key <AE07> {	[         7,	underscore	],
+			[  sterling			]	};
+    key <AE08> {	[         8,	parenleft	],
+			[ braceleft			]	};
+    key <AE09> {	[         9,	parenright	],
+			[ braceright			]	};
+    key <AE10> {	[         0,	quoteright	],	
+			[ quoteleft                     ]       };              
+    key <AE11> {	[     slash,	question 	],
+			[ backslash			]	};
+    key <AE12> {	[    degree,	SunFA_Tilde	],
+			[ SunFA_Cedilla			]	};
+    key <AD03> {	[         e,	E        	],
+			[    EuroSign		   	]	};
+    key <AD11> {	[ SunFA_Diaeresis, SunFA_Circum ]	};
+    key <AD12> {	[  asterisk,	bar      	],
+                        [  asciitilde 			]	};
+    key <AC02> {	[         s,	S        	],
+			[    ssharp			]	};
+    key <AC10> {	[      plus,	plusminus	]	};
+    key <AC11> {	[ SunFA_Acute,   SunFA_Grave    ]	};
+    key <LSGT> {	[ bracketleft,	bracketright	],
+			[ brokenbar			]	};
+    key <TLDE> {	[      	at,	section  	],
+			[  notsign			]	};
+    key <BKSL> {	[      less,	greater  	],	
+                        [ asciicircum			]       };
+    key <AB01> {	[         z,	Z        	],
+			[ guillemotleft			]	};
+    key <AB02> {	[         x,	X        	],
+			[ guillemotright		]	};
+    key <AB03> {	[         c,	C        	],
+			[      cent			]	};
+    key <AB07> {	[ 	m,	M		],
+			[	mu			]	};
+    key <AB08> {        [     comma,	semicolon	]       };
+    key <AB09> {        [    period,	colon		]       };
+    key <AB10> {        [     minus,	equal           ]       };
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/no	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,138 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+
+    key <BKSL> { [ bar, section		]			};
+    key <BRCR> { [ asciitilde, asciicircum]			};
+    key <AE02> { [ 2, quotedbl		], [at		]	};
+    key <AE03> { [ 3, numbersign	], [sterling	]	};
+    key <AE04> { [ 4, currency		], [dollar	]	};
+    key <AE06> { [ 6, ampersand		]			};
+    key <AE07> { [ 7, slash		], [braceleft	]	};
+    key <AE08> { [ 8, parenleft		], [bracketleft	]	};
+    key <AE09> { [ 9, parenright	], [bracketright]	};
+    key <AE10> { [ 0, equal		], [braceright	]	};
+    key <AE11> { [ plus, question	]			};
+    key <AE12> { [ backslash, SunFA_Grave], [SunFA_Acute]	};
+    key <AD03> { [ e, E			], [EuroSign	]	};
+    key <AD11> { [ Aring		]			};
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Circum],[SunFA_Tilde] };
+    key <LCTL> { [ Caps_Lock		]			};
+    key <AC10> { [ Ooblique		]			};
+    key <AC11> { [ AE			]			};
+    key <TLDE> { [ quoteright, asterisk ], [quoteleft	]	};
+    key <LSGT> { [ less, greater	]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    key <CAPS> { [ Control_L		]			};
+
+};
+
+xkb_symbols "type5" {
+    include "no"
+
+    key <AE05> { [ 5, percent		], [asciitilde			]};
+    key <AE06> { [ 6, ampersand		], [asciicircum			]};
+    key <AE07> { [ 7, slash		], [ braceleft			]};
+    key <AE08> { [ 8, parenleft		], [ bracketright		]};
+    key <AE09> { [ 9, parenright	], [ bracketright		]};
+    key <AE10> { [ 0, equal		], [ braceright			]};
+
+    key <BKSL> { [ quoteright, asterisk	], [ quoteleft			]};
+    key <LSGT> { [ less, greater	]				};
+};
+
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+
+    key <TLDE> {	[             bar,         section      ]	};
+    key <LSGT> {	[	     less,	   greater	]	};
+    key <BKSL> {	[      apostrophe,      asterisk	],
+			[	grave				]	};
+    key <AE02> {	[               2,        quotedbl  	],
+			[	       at			]	};
+    key <AE03> {	[              	3,	numbersign	],
+			[	 sterling			]	};
+    key <AE04> {	[               4,        currency     	],
+			[	   dollar			]	};
+    key <AE05> {	[               5,         percent     	],
+			[        asciitilde			]	};
+    key <AE06> {	[               6,       ampersand     	],
+			[      asciicircum			]	};
+    key <AE07> {	[               7,           slash     	],
+			[       braceleft			]	};
+    key <AE08> {	[               8,       parenleft     	],
+			[     bracketleft			]	};
+    key <AE09> {	[               9,      parenright     	],
+			[    bracketright			]	};
+    key <AE10> {	[               0,           equal     	],
+                        [      braceright			]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AE12> {   	[       backslash,      SunFA_Grave     ],
+                 	[      SunFA_Acute          	        ]	};
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign		        ]	};
+    key <AD11> {	[	    aring,           Aring 	]	};
+    key <AD12> {   	[ SunFA_Diaeresis,    SunFA_Circum      ],
+                 	[      SunFA_Tilde			]	};
+    key	<AC10> {	[	   oslash,        Oslash 	]	}; 
+    key	<AC11> {	[	       ae,	        AE	]	};
+    key <AB08> {        [	    comma,	semicolon	]       };
+    key <AB09> {        [	    period,	colon		]       };
+    key <AB10> {        [	     minus,	underscore      ]       };
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/pl	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,78 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+    // A few keys are different
+    key <TLDE> { [ quoteleft, asciitilde], [ degree, degree ]	};
+    key <AE02> { [ 2, quotedbl		], [ at		]	};
+    key <AE03> { [ 3, colon		], [ numbersign	]	};
+    key <AE04> { [ 4, question		], [ dollar	]	};
+    key <AE06> { [ 6, plus		], [ asciicircum ]	};
+    key <AE07> { [ 7, underscore	], [ ampersand	]	};
+    key <AE08> { [ 8, parenleft		], [ asterisk	]	};
+    key <AE09> { [ 9, parenright	]			};
+    key <AE10> { [ 0, equal		]			};
+    key <AE11> { [ zabovedot, Zabovedot	]			};
+    key <AE12> { [ dead_ogonek, Aacute ]			};
+    key <AD11> { [ oacute, zacute	], [ bracketleft, braceleft ] };
+    key <AD12> { [ slash, section	], [ bracketright, braceright ] };
+    key <AC02> { [ s, S			], [ ssharp	]	};
+    key <AC08> { [ k, K			], [ ampersand	]	};
+    key <AC10> { [ lstroke, Lstroke	]			};
+    key <AC11> { [ aogonek, eogonek	], [ quoteright	]	};
+    key <BKSL> { [ backslash, semicolon	], [ currency, bar ]	};
+    key <LSGT> { [ less, greater	]			};
+    key <AB08> { [ comma, sacute	], [ less	]	};
+    key <AB09> { [ period, nacute	], [ greater	]	};
+    key <AB10> { [ minus, cacute	]			};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/pl_dev	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,97 @@
+// $Xorg: pl,v 1.3 2000/08/17 19:54:43 cpqbld Exp $
+
+// $XFree86: xc/programs/xkbcomp/symbols/pl,v 3.5 2001/01/17 23:45:59 dawes Exp $
+
+//  Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple QWERTY Polish keybaord
+    // Polish Developer version
+
+    name[Group1]= "Polish";
+
+    key <TLDE> { [ grave, 		asciitilde	]	};
+    key <AE01> { [ 1,			exclam		]	};
+    key <AE02> { [ 2,			at		]	};
+    key <AE03> { [ 3,			numbersign 	]	};
+    key <AE04> { [ 4,			dollar	 	]	};
+    key <AE05> { [ 5,			percent 	]	};
+    key <AE06> { [ 6,			asciicirum	]	};
+    key <AE07> { [ 7,			ampersand	]	};
+    key <AE08> { [ 8,			asterisk	]	};
+    key <AE09> { [ 9,			parenleft	]	};
+    key <AE10> { [ 0,			parenright	]	};
+    key <AE11> { [ minus,		underscore 	]	};
+    key <AE12> { [ equal,		plus	 	]	};
+    key <AD03> { [ e,			E		], 	
+		 [ eogonek,		Eogonek		]	};       
+    key <AD07> { [ u,			U		],
+                 [ EuroSign				]	};
+    key <AD09> { [ o,			O		],	
+		 [ oacute,		Oacute		]	};
+    key <AD11> { [ bracketleft, 	braceleft	]	};
+    key <AD12> { [ bracketright,	braceright	]	};
+    key <AC01> { [ a,			A		],
+		 [ aogonek,		Aogonek		]	};
+    key <AC02> { [ s,			S		],
+		 [ sacute,		Sacute		]	};
+    key <AC09> { [ l,			L		],
+		 [ lstroke,             Lstroke		]	};
+    key <AC10> { [ semicolon,		colon		]	};
+    key <AC11> { [ apostrophe,		quotedbl 	]	};
+    key <BKSL> { [ backslash,		bar		],
+		 [	brokenbar			]	};
+    key <AB01> { [ z, 			Z	 	],
+		 [ zabovedot,		Zabovedot	]	};
+    key <AB02> { [ x,			X	 	],
+		 [ zacute,		Zacute		]	};
+    key <AB03> { [ c,			C	 	],
+		 [ cacute,		Cacute		]	};
+    key <AB06> { [ n,			N	 	],
+		 [ nacute,		Nacute		]	};
+    key <AB08> { [ comma,		less 		]	};
+    key <AB09> { [ period,		greater	 	]	};
+    key <AB10> { [ slash,		question	]	};
+
+    key <LSGT> { [ less,		greater		],
+		 [ bar,			brokenbar	]	};
+
+    // End alphanumeric section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3	{ Mode_switch };
+};
+
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+  include "sun_vndr/pl_dev(basic)"
+
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/pt	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,137 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type4" {
+    //this is a Portugal4 keyboard
+
+    key <BKSL> { [ bracketleft, braceleft], [guillemotleft]	};
+    key <BRCR> { [ bracketright, braceright], [guillemotright]	};
+    key <AE02> { [ 2, quotedbl		], [at		]	};
+    key <AE03> { [ 3, numbersign	], [sterling	]	};
+    key <AE04> { [ 4, dollar		], [section	]	};
+    key <AE06> { [ 6, ampersand		], [notsign	]	};
+    key <AE07> { [ 7, slash		]			};
+    key <AE08> { [ 8, parenleft		]			};
+    key <AE09> { [ 9, parenright	], [backslash	]	};
+    key <AE10> { [ 0, equal		], [bar		]	};
+    key <AE11> { [ quoteright, question	], [quoteleft	]	};
+    key <AE12> { [ exclamdown, questiondown]			};
+    key <AD03> { [ e, E			], [EuroSign	]	};
+    key <AD11> { [ SunFA_Diaeresis, asterisk], [plus	]	};
+    key <AD12> { [ SunFA_Acute, SunFA_Grave], [asciitilde]	};
+    key <LCTL> { [ Caps_Lock		]			};
+    key <AC10> { [ Ccedilla		]			};
+    key <AC11> { [ masculine, ordfeminine]			};
+    key <TLDE> { [ SunFA_Tilde, SunFA_Circum], [asciicircum]	};
+    key <LSGT> { [ less, greater	]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    key <CAPS> { [ Control_L		]			};
+
+};
+
+xkb_symbols "type5" {
+    include "pt"
+
+    key <TLDE> { [ backslash, bar	]				};
+    key <AE05> { [ 5, percent		], [asciitilde			]};
+    key <AE06> { [ 6, ampersand		], [asciicircum			]};
+    key <AE07> { [ 7, slash		], [ braceleft			]};
+    key <AE08> { [ 8, parenleft		], [ bracketleft		]};
+    key <AE09> { [ 9, parenright	], [ bracketright		]};
+    key <AE10> { [ 0, equal		], [ braceright			]};
+    key <AE11> { [ quoteright, question	], [quoteleft			]};
+
+    key <AD11> { [ plus, asterisk	], [SunFA_Diaeresis		]};
+
+};
+
+ 
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+
+    key <LSGT> {	[	     less,	   greater	]	};
+    key <TLDE> { 	[       backslash,             bar      ]       };
+    key <AE02> {        [               2,        quotedbl      ],
+                        [              at			]       };
+    key <AE03> {        [               3,	numbersign	],
+                        [	sterling			]       };
+    key <AE04> {        [               4,	dollar		],
+                        [	section				]       };
+    key <AE05> { 	[ 		5,	percent		],
+			[	asciitilde			]	};
+    key <AE06> {	[		6,	ampersand	],
+			[	asciicircum			]	};
+    key <AE07> {	[		7,	slash		],
+			[	 braceleft			]	};
+    key <AE08> {	[		8,	parenleft	],
+			[ 	bracketleft			]	};
+    key <AE09> {	[		9,	parenright	],
+			[	bracketright			]	};
+    key <AE10> { 	[		0,	equal		],
+			[	 braceright			]	};
+    key <AE11> { 	[	quoteright,	question	],
+			[	quoteleft			]	};
+    key <AE12> {	[   guillemotleft,  guillemotright     	]	};
+    key <AD03> {        [               e,               E      ],
+                        [        EuroSign			]       };
+    key <AD11> {	[	     plus,        asterisk 	],
+			[ SunFA_Diaeresis			]	};
+    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
+    key <BKSL> {	[     SunFA_Tilde,    SunFA_Circum	]	};
+    key <AC10> {        [        ccedilla,        Ccedilla      ]       };
+    key <AC11> {	[       masculine,     ordfeminine      ]	};
+    key <AB08> {        [           comma,       semicolon      ]       };
+    key <AB09> {        [          period,           colon      ]       };
+    key <AB10> {        [           minus,      underscore      ]       };
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ru	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,140 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// layout for a Sun Type 6 Russian keyboard
+partial
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+
+    key <AE02> {        [               2,	quotedbl        	],
+                        [              at			]       };
+    key <AE03> {        [               3,	numerosign      ],
+                        [               3,	numbersign      ]       };
+    key	<AE04> {	[		4,	percent		],
+			[		4,	dollar		]	};
+    key	<AE05> {	[		5,	colon    	],
+			[		5,	percent		]	};
+    key	<AE07> {	[		7,	period		],
+			[		7,	ampersand	]	};
+    key	<AE08> {	[		8,	semicolon 	],
+			[		8,	asterisk  	]	};
+
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	],
+			[		q,		 Q	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	],
+			[		w,		 W	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	],
+			[		e,		 E	]	};
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	],
+			[		r,		 R	]	};
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	],
+			[		t,		 T	]	};
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	],
+			[		y,		 Y	]	};
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	],
+			[		u,		 U	]	};
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	],
+			[		i,		 I	]	};
+    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	],
+			[		o,		 O	]	};
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	],
+			[		p,		 P	]	};
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	],
+			[     bracketleft,	 braceleft	]	};
+    key	<AD12> {	[ Cyrillic_hardsign, Cyrillic_HARDSIGN	],
+			[    bracketright,	braceright	]	};
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	],
+			[		a,		 A	]	};
+    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	],
+			[		s,		 S	]	};
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	],
+			[		d,		 D	]	};
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	],
+			[		f,		 F	]	};
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	],
+			[		g,		 G	]	};
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	],
+			[		h,		 H	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	],
+			[		j,		 J	]	};
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	],
+			[		k,		 K	]	};
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	],
+			[		l,		 L	]	};
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	],
+			[	semicolon,	     colon	]	};
+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	],
+			[      apostrophe,	  quotedbl	]	};
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	],
+			[		z,		 Z	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	],
+			[		x,		 X	]	};
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	],
+			[		c,		 C	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	],
+			[		v,		 V	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	],
+			[		n,		 N	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	],
+			[		b,		 B	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	],
+			[		m,		 M	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	],
+			[	    comma,	      less	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	],
+			[	   period,	   greater	]	};
+    key	<BKSL> {	[	    slash,	  question	],
+			[       backslash,             bar	]	};
+    key	<AB10> {	[      ediaeresis,      Ediaeresis 	],
+			[	    slash,        question	]	};
+    key	<LSGT> {	[	backslash,	       bar	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/se	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,285 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Swedish layout for a Type 5/5c Sun keyboard
+xkb_symbols "sun5" {
+    include "en_US(basic)+se(basic)"
+
+    // Begin alphanumeric section
+    // These two are not supposed to be dead.
+    // A few others supposedly ARE dead, but don't care for now.
+    key <AC12> { [ apostrophe, asterisk	], 	[ 	grave ] };
+    key <AD12> { [			],	[  asciitilde ] };
+
+    key <RTSH> { [ 	Shift_R		]	};
+
+    key <LALT> { [	Alt_L		]	};
+    key <ALGR> { [	Mode_switch	]	};
+    key <LMTA> { [	Meta_L		]	};
+    key <RMTA> { [	Meta_R		]	};
+    key <COMP> { [	Multi_key	]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1		]			};
+    key <FK02> { [ F2		]			};
+    key <FK03> { [ F3		]			};
+    key <FK04> { [ F4		]			};
+    key <FK05> { [ F5		]			};
+    key <FK06> { [ F6		]			};
+    key <FK07> { [ F7		]			};
+    key <FK08> { [ F8		]			};
+    key <FK09> { [ F9		]			};
+    key <FK10> { [ F10		]			};
+    key <FK11> { [ F11		],	[ SunF36]	};
+    key <FK12> { [ F12		],	[ SunF37]	};
+    key <STOP> { [ Cancel 	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Print	],	[ Sys_Req, SunSys_Req ]	};
+    key <SCLK> { [ Scroll_Lock	]			};
+    key <PAUS> { [ Pause	],	[ Break	]	};
+    key <LEFT> { [ Left		]			};
+    key <RGHT> { [ Right	]			};
+    key <UP>   { [ Up		]			};
+    key <DOWN> { [ Down		]			};
+
+    key <DELE> { [ Delete	]			};
+    key <INS>  { [ Insert	]			};
+    key <PGUP> { [ Prior	]			};
+    key <PGDN> { [ Next		]			};
+    key <HOME> { [ Home		]			};
+    key <END>  { [ End		]			};
+    key <HELP> { [ Help		]			};
+    // End "Editing" section
+    
+    // Begin "Keypad" section
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ KP_Divide		],	[	F25	]	};
+    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
+    key <KPSU> { [ KP_Subtract		]				};
+
+    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
+    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
+    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
+    key <KPAD> { [  	KP_Add		]				};
+
+    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
+    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
+    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
+
+    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
+    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
+    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
+    key <KPEN> { [  	KP_Enter	]				};
+
+    key  <KP0> { [  KP_Insert,	KP_0	]				};
+    key <KPDL> { [  KP_Delete,	KP_Decimal ]				};
+    // End "Keypad" section, 
+
+    // Begin "four keys up on the right"
+    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
+    // End "four keys up on the right"
+
+    // Begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod3	{ Mode_switch };
+    modifier_map Mod4	{ Alt_L };
+    // End modifier mappings
+};
+
+// Swedish layout for a Type 4 Sun keyboard
+xkb_symbols "sun4" {
+    include "en_US(basic)+se(basic)"
+
+    // Begin alphanumeric section
+    // These two are not supposed to be dead.
+    // A few others supposedly ARE dead, but don't care for now.
+    key <AC12> { [ apostrophe, asterisk	], 	[ 	grave ] };
+    key <AD12> { [			],	[  asciitilde ] };
+
+    key <AF14> { [	asciitilde,	asciicircum	] };
+
+    key <RTSH> { [ 	Shift_R		]	};
+
+    key <LALT> { [	Alt_L		]	};
+    key <ALGR> { [	Mode_switch	]	};
+    key <LMTA> { [	Meta_L		]	};
+    key <RMTA> { [	Meta_R		]	};
+    key <COMP> { [	Multi_key	]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1		]			};
+    key <FK02> { [ F2		]			};
+    key <FK03> { [ F3		]			};
+    key <FK04> { [ F4		]			};
+    key <FK05> { [ F5		]			};
+    key <FK06> { [ F6		]			};
+    key <FK07> { [ F7		]			};
+    key <FK08> { [ F8		]			};
+    key <FK09> { [ F9		]			};
+    key <FK10> { [ F10		]			};
+    key <FK11> { [ F11		],	[ SunF36]	};
+    key <FK12> { [ F12		],	[ SunF37]	};
+    key <STOP> { [ Cancel 	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <LNFD> { [ Linefeed	]	};
+    key <DELE> { [ Delete	]			};
+    key <PRSC> { [ Print	],	[ Sys_Req, SunSys_Req ]	};
+    key <SCLK> { [ Scroll_Lock	]			};
+    key <PAUS> { [ Pause	],	[ Break	]	};
+    key <HELP> { [ Help		]			};
+    // End "Editing" section
+    
+    // Begin "Keypad" section
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPEQ> { [ KP_Equal		]				};
+    key <KPDV> { [ KP_Divide		],	[	F25	]	};
+    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
+    key <KPSU> { [ KP_Subtract		]				};
+
+    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
+    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
+    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
+    key <KPAD> { [  	KP_Add		]				};
+
+    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
+    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
+    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
+
+    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
+    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
+    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
+    key <KPEN> { [  	KP_Enter	]				};
+
+    key  <KP0> { [  KP_Insert,	KP_0	]				};
+    key <KPDL> { [  KP_Delete,	KP_Decimal ]				};
+    // End "Keypad" section, 
+
+    // Begin modifier mappings
+    modifier_map Shift	{ Shift_R };
+    modifier_map Mod1	{ Alt_L };
+    modifier_map Mod2	{ Num_Lock };
+    modifier_map Mod3	{ Mode_switch };
+    modifier_map Mod4	{ Meta_L };
+    modifier_map Mod5	{ Meta_R };
+    // End modifier mappings
+};
+
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Swedish keyboard
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+
+    key <TLDE> {	[         section,         onehalf    	]	};
+    key <LSGT> {	[	     less,	   greater      ],
+                 	[             bar			]	};
+    key <AE02> {	[               2,        quotedbl  	],
+			[	       at			]	};
+    key <AE03> {	[              	3,	numbersign	],
+			[	 sterling			]	};
+    key <AE04> {	[               4,        currency     	],
+			[	   dollar			]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash     	],
+			[       braceleft			]	};
+    key <AE08> {	[               8,       parenleft     	],
+			[     bracketleft			]	};
+    key <AE09> {	[               9,      parenright     	],
+			[    bracketright			]	};
+    key <AE10> {	[               0,           equal     	],
+                  	[      braceright 		    	]	};
+    key <AE11> {	[            plus,        question     	],
+			[       backslash			]	};
+    key <AE12> {  	[      SunFA_Acute,      SunFA_Grave   	]	};
+    key <AD03> {  	[               e,               E     	],
+                  	[        EuroSign		 	]	};
+    key <AD11> {	[	    aring,           Aring 	]	};
+    key <AD12> {  	[  SunFA_Diaeresis,    asciicircum     	],
+                 	[      asciitilde 		    	]	};
+    key <AC10> {	[      odiaeresis,      Odiaeresis	]	};
+    key <AC11> {	[      adiaeresis,      Adiaeresis	]	};
+    key <BKSL> {	[      apostrophe,        asterisk	],
+                 	[           grave 			]	};
+    key <AB08> {	[           comma,       semicolon 	]	};
+    key <AB09> {	[          period,           colon     	]	};
+    key <AB10> {	[           minus,      underscore     	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/sk	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,142 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    key <TLDE>  { 	[       semicolon,      dead_abovering  ],
+			[       quoteleft,          asciitilde  ]	};
+    key <AE01>  { 	[	     plus,         1		],
+		  	[          exclam,          asciitilde	]	};
+    key <AE02>  {	[	   lcaron,         2		],
+			[              at,          dead_caron  ]	};
+    key <AE03>  {	[	   scaron,         3		],
+			[      numbersign,        SunFA_Circum	]	};
+    key <AE04>  {	[          ccaron,         4		],
+			[          dollar,          dead_breve	]	};
+    key <AE05>  {	[	   tcaron,         5		],
+			[         percent,      dead_abovering  ]	};
+    key <AE06>  {	[	   zcaron,         6		],
+			[     asciicircum,         dead_ogonek  ]	};
+    key <AE07>  {	[	   yacute,         7		],
+			[       ampersand,               grave  ]	};
+    key <AE08>  {	[	   aacute,         8		],
+			[        asterisk,       dead_abovedot  ]	};
+    key <AE09>  {	[	   iacute,         9		],
+			[       parenleft,          apostrophe  ]	};
+    key <AE10>  {	[	   eacute,         0		],
+			[      parenright,    dead_doubleacute  ]	};
+    key <AE11>  {	[	    equal,             percent	],
+			[  dead_diaeresis,           backslash	]	};
+    key <AE12>  {	[     SunFA_Acute,          dead_caron	],
+			[    dead_cedilla,               minus 	]	};
+    key <AD01>  {	[ 		q,         Q		],
+			[       backslash		        ]	};
+    key <AD02>  {	[	        w,         W		],
+			[             bar	                ]	};
+    key <AD03>  {	[	        e,         E		],
+			[        EuroSign 			]	};
+    key <AD06>  {       [               z,         Z            ]       };
+    key <AD11>  {	[	   uacute,               slash	],
+			[        division		        ]	};
+    key <AD12>  {	[      adiaeresis,           parenleft	],
+			[        multiply      			]	};
+    key <AC02>  {	[	        s,         S		],
+			[         dstroke		        ]	};
+    key <AC03>  {	[	        d,         D		],
+			[         Dstroke			]	};
+    key <AC04>  {	[	        f,         F		],
+			[     bracketleft			]	};
+    key <AC05>  {	[	        g,         G		],
+			[    bracketright			]	};
+    key <AC08>  {	[		k,         K		],
+			[         lstroke 		        ]	};
+    key <AC09>  {	[	        l,         L		],
+			[         Lstroke		        ]	};
+    key <AC10>  {	[     ocircumflex,            quotedbl	],
+			[          dollar		        ]	};
+    key <AC11>  {	[         section,              exclam	],
+			[          ssharp   		        ]	};
+    key <AC12>  {	[          ncaron,          parenright	],
+			[        currency,            currency  ]	};
+    key <BKSL>  {	[          ncaron,          parenright	],
+			[       backslash,                 bar  ]	};
+    key <LSGT>  { 	[       backslash,                 bar  ], 
+                        [           slash,           brokenbar  ]       };
+    key <AB01>  {       [               y,        Y             ],
+			[            less  	                ]	};
+    key <AB02>  {	[	        x,        X		],
+			[         greater,          numbersign  ]	};
+    key <AB03>  {	[		c,        C		],
+			[	ampersand	 		]	};
+    key <AB04>  {	[	        v,        V		],
+			[              at 		        ]	};
+    key <AB05>  {	[	        b,        B		],
+			[       braceleft              		]	};
+    key <AB06>  {	[        	n,        N		],
+			[      braceright              		]	};
+    key <AB08>  {	[  	    comma,            question	],
+			[	     less 			]	};
+    key <AB09>  {	[	   period,               colon	],
+			[	  greater			]	};
+    key <AB10>  {	[ 	    minus,          underscore	],
+			[	 asterisk 			]	};
+
+
+};
+
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+  include "sun_vndr/sk(basic)"
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/solaris	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,214 @@
+//-------------------------------------------------------------------------
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//-------------------------------------------------------------------------
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Default map provides backwards compatibility with Sun keyboards from
+// long ago and the key mappings still used in Solaris Xsun today
+
+partial default
+xkb_symbols "defaults_common" {
+
+    // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards
+    // and the names have stuck (you can spot a longtime Sun admin when you
+    // hear them say to hit "L1-A" to enter the OpenBoot PROM)
+    // These names get mapped to the keysyms F11-F20
+    key <STOP> { [ L1,  L1              ], [ SunStop    ]       };
+    key <AGAI> { [ L2,  L2              ], [ SunAgain   ]       };
+    key <PROP> { [ L3,  L3              ], [ SunProps   ]       };
+    key <UNDO> { [ L4,  L4              ], [ SunUndo    ]       };
+    key <FRNT> { [ L5,  L5              ], [ SunFront   ]       };
+    key <COPY> { [ L6,  L6              ], [ SunCopy    ]       };
+    key <OPEN> { [ L7,  L7              ], [ SunOpen    ]       };
+    key <PAST> { [ L8,  L8              ], [ SunPaste   ]       };
+    key <FIND> { [ L9,  L9              ], [ SunFind    ]       };
+    key <CUT>  { [ L10, L10             ], [ SunCut     ]       };
+
+    // And on the right side, the function keys were labeled R1-R15,
+    // which get mapped to the keysyms F21-F35
+    // This includes the keys that became the numeric keypad
+    key <PAUS> { [ R1,  R1              ], [ Pause              ] };
+    key <PRSC> { [ R2,  R2              ], [ Print              ] };
+    key <SCLK> { [ R3,  R3              ], [ Scroll_Lock, Break ] };
+
+    key <KPEQ> { [ KP_Equal             ], [ R4, KP_Equal       ] };
+    key <KPDV> { [ KP_Divide            ], [ R5, KP_Divide      ] };
+    key <KPMU> { [ KP_Multiply          ], [ R6, KP_Multiply    ] };
+
+    key  <KP7> { [ KP_Home,  KP_7, R7   ], [ R7, KP_7, Home     ] };
+    key  <KP8> { [ KP_Up,    KP_8, R8   ], [ R8, KP_8, Up       ] };
+    key  <KP9> { [ KP_Prior, KP_9, R9   ], [ R9, KP_9, Prior    ] };
+
+    key  <KP4> { [ KP_Left,  KP_4, R10  ], [ R10, KP_4, Left    ] };
+    key  <KP5> { [ KP_Begin, KP_5, R11  ], [ R11, KP_5          ] };
+    key  <KP6> { [ KP_Right, KP_6, R12  ], [ R12, KP_6, Right   ] };
+
+    key  <KP1> { [ KP_End,   KP_1, R13  ], [ R13, KP_1, End     ] };
+    key  <KP2> { [ KP_Down,  KP_2, R14  ], [ R14, KP_2, Down    ] };
+    key  <KP3> { [ KP_Next,  KP_3, R15  ], [ R15, KP_3, Next    ] };
+
+    // F11 & F12 are mapped to SunF36 and SunF37 since they were added
+    // after F11-F35 were already assigned on Sun keyboards
+    key <FK11> { [ SunF36               ], [ F11                ] };
+    key <FK12> { [ SunF37               ], [ F12                ] };
+
+    // These were added to the keyboard much later and simply got mapped
+    // to their logical names
+    key <HELP> { [ Help                 ]                       };
+    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    key <LALT> { [ Alt_L                ]                       };
+//    key <RALT> { [ Mode_switch          ]                       };
+//    key <ALGR> { [ Mode_switch          ]                       };
+    key <LMTA> { [ Meta_L               ]                       };
+    key <RMTA> { [ Meta_R               ]                       };
+    key <COMP> { [ Multi_key            ]                       };
+};
+
+partial default
+xkb_symbols "defaults" {
+    include "sun_vndr/solaris(defaults_common)"
+    key <RALT> { [ Mode_switch          ]                       };
+    key <ALGR> { [ Mode_switch          ]                       };
+    // begin modifier mappings
+    modifier_map Shift          { Shift_R, Shift_L };
+    modifier_map Mod1           { Alt_L };
+    modifier_map Mod2           { Num_Lock };
+    modifier_map Mod3           { Alt_R, Mode_switch };
+    modifier_map Mod4           { Meta_L, Meta_R };
+};
+
+partial default
+xkb_symbols "defaults_type7jp" {
+    include "sun_vndr/solaris(defaults_common)"
+    // begin modifier mappings
+    modifier_map Shift          { Shift_R, Shift_L };
+    modifier_map Mod1           { Alt_L , Alt_R};
+    modifier_map Mod2           { Num_Lock };
+    modifier_map Mod3           { Mode_switch };
+    modifier_map Mod4           { Meta_L, Meta_R };
+};
+
+// Map the keys to the actual key names instead of the ancient Sun function
+// keys
+partial
+xkb_symbols "keynames" {
+    key <FK11> { [ F11          ],      [ SunF36   ]    };
+    key <FK12> { [ F12          ],      [ SunF37   ]    };
+
+    key <STOP> { [ Cancel	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+
+    key <HELP> { [ Help		]	                };
+
+    key <PAUS> {  [  Pause                      ]       };
+    key <PRSC> {  [  Print                      ]       };
+    key <SCLK> {  [  Scroll_Lock, Break         ]       };
+
+    key  <KP7> {        [  KP_Home,     KP_7    ]       };
+    key  <KP8> {        [  KP_Up,       KP_8    ]       };
+    key  <KP9> {        [  KP_Prior,    KP_9    ]       };
+
+    key  <KP4> {        [  KP_Left,     KP_4    ]       };
+    key  <KP5> {        [  KP_Begin,    KP_5    ]       };
+    key  <KP6> {        [  KP_Right,    KP_6    ]       };
+
+    key  <KP1> {        [  KP_End,      KP_1    ]       };
+    key  <KP2> {        [  KP_Down,     KP_2    ]       };
+    key  <KP3> {        [  KP_Next,     KP_3    ]       };
+
+    key <KPEN> {        [       KP_Enter        ]       };
+    key <KPEQ> {        [       KP_Equal        ]       };
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    key <LALT> { [ Alt_L                ]                       };
+    key <RALT> { [ Mode_switch          ]                       };
+    key <ALGR> { [ Mode_switch          ]                       };
+    key <LMTA> { [ Meta_L               ]                       };
+    key <RMTA> { [ Meta_R               ]                       };
+    key <COMP> { [ Multi_key            ]                       };
+
+};
+
+// Map the keys to the XFree86 key names instead of the Sun key names
+partial
+xkb_symbols "xf86keynames" {
+    key <STOP> { [ XF86Stop	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ XF86Copy	],	[ F16	]	};
+    key <OPEN> { [ XF86Open	],	[ F17	]	};
+    key <PAST> { [ XF86Paste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ XF86Cut	],	[ F20	]	};
+
+    key <MUTE> { [ XF86AudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [ XF86Sleep,		XF86PowerDown	]	};
+};
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/sw	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,195 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+xkb_symbols "type4de" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+    key <BKSL> { [ less, braceleft      ]                       };
+
+    key <BRCR> { [ greater, braceright  ]                       };
+    key <DELE> { [ Delete               ]                       };
+
+    key <AE01> { [ 1, plus              ], [exclam      ]       };
+    key <AE02> { [ 2, quotedbl          ], [at          ]       };
+    key <AE03> { [ 3, asterisk          ], [numbersign  ]       };
+    key <AE04> { [ 4, ccedilla          ], [cent        ]       };
+    key <AE05> { [ 5, percent           ], [asciitilde  ]       };
+    key <AE06> { [ 6, ampersand         ], [section     ]       };
+    key <AE07> { [ 7, slash             ], [bar         ]       };
+    key <AE08> { [ 8, parenleft         ], [degree      ]       };
+    key <AE09> { [ 9, parenright        ], [backslash   ]       };
+    key <AE10> { [ 0, equal             ], [asciicircum ]       };
+    Key <AE11> { [ quoteright, question ], [quoteleft   ]       };
+    key <AE12> { [ SunFA_Circum, SunFA_Grave    ]               };
+    key <AD03> { [ e, E                 ], [EuroSign    ]       };
+    key <AD06> { [ Z                    ]                       };
+    key <AD11> { [ udiaeresis, egrave   ]                       };
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ]               };
+    key <AC10> { [ odiaeresis, eacute   ]                       };
+    key <AC11> { [ adiaeresis, agrave   ]                       };
+    key <TLDE> { [ dollar, SunFA_Tilde  ], [sterling    ]       };
+    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
+    key <AB01> { [ Y                    ]                       };
+    key <AB07> { [ M, NoSymbol          ], [mu  ]               };
+    key <AB08> { [ comma, semicolon     ]                       };
+    key <AB09> { [ period, colon        ]                       };
+    key <AB10> { [ minus, underscore    ]                       };
+    key <COMP> { [ SunAltGraph          ]                       };
+    key <ALGR> { [ SunCompose           ]                       };
+
+};
+
+xkb_symbols "type4fr" {
+    include "sun_vndr/us(type4basic)"
+    // A few keys are different
+    key <BKSL> { [ less, braceleft	]			};
+
+    key <BRCR> { [ greater, braceright  ]                       };
+    key <DELE> { [ Delete               ]                       };
+
+    key <AE01> { [ 1, plus		], [exclam	]	};
+    key <AE02> { [ 2, quotedbl		], [at	 	]	};
+    key <AE03> { [ 3, asterisk		], [numbersign	]	};
+    key <AE04> { [ 4, ccedilla		], [cent	]	};
+    key <AE05> { [ 5, percent		], [asciitilde	]	};
+    key <AE06> { [ 6, ampersand		], [section	]	};
+    key <AE07> { [ 7, slash		], [bar		]	};
+    key <AE08> { [ 8, parenleft		], [degree	]	};
+    key <AE09> { [ 9, parenright	], [backslash	]	};
+    key <AE10> { [ 0, equal		], [asciicircum	]	};
+    Key <AE11> { [ quoteright, question ], [quoteleft	]	};
+    key <AE12> { [ SunFA_Circum, SunFA_Grave	]		};
+    key <AD03> { [ e, E			], [EuroSign	]	};
+    key <AD06> { [ Z			]			};
+    key <AD11> { [ egrave, udiaeresis	]			};
+    key <AD12> { [ SunFA_Diaeresis, SunFA_Acute	]		};
+    key <AC10> { [ eacute, odiaeresis	]			};
+    key <AC11> { [ agrave, adiaeresis	]			};
+    key <TLDE> { [ dollar, SunFA_Tilde	], [sterling	]	};
+    key <LSGT> { [ bracketright, bracketleft   ], [ backslash ] };
+    key <AB01> { [ Y			]			};
+    key <AB07> { [ M, NoSymbol		], [mu	]		};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    key <COMP> { [ SunAltGraph		]			};
+    key <ALGR> { [ SunCompose		]			}; 
+
+
+
+};
+
+xkb_symbols "type5fr" {
+
+    key <TLDE> { [ section, degree	]				};
+
+    key <AE01> { [ 1, plus		], [bar				]};
+    key <AE02> { [ 2, quotedbl		], [at	 	]		};
+    key <AE03> { [ 3, asterisk		], [numbersign	]		};
+    key <AE04> { [ 4, ccedilla		], [asciicircum	]		};
+    key <AE05> { [ 5, percent		], [asciitilde	]		};
+    key <AE06> { [ 6, ampersand		], [section	]		};
+    key <AE07> { [ 7, slash		], [bar		]		};
+    key <AE08> { [ 8, parenleft		], [degree	]		};
+    key <AE09> { [ 9, parenright	], [backslash	]		};
+    key <AE10> { [ 0, equal		], [quoteleft	]		};
+    Key <AE11> { [ quoteright, question ], [SunFA_Acute	]		};
+    key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde		]};
+    key <AD03> { [ e, E			], [EuroSign	]		};
+    key <AD06> { [ z, Z			]				};
+    key <AD11> { [ egrave, udiaeresis	], [ bracketleft		]};
+    key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright		]};
+
+    key <AC10> { [ eacute, odiaeresis	]				};
+    key <AC11> { [ agrave, adiaeresis	], [ braceleft			]};
+    key <BKSL> { [ dollar, sterling	], [ braceright			]};
+
+    key <LSGT> { [ less, greater	], [ backslash			]};
+    key <AB01> { [ y, Y			]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    
+};
+
+xkb_symbols "type5de" {
+
+    key <TLDE> { [ section, degree	]				};
+
+    key <AE01> { [ 1, plus		], [bar				]};
+    key <AE02> { [ 2, quotedbl		], [at	 	]		};
+    key <AE03> { [ 3, asterisk		], [numbersign	]		};
+    key <AE04> { [ 4, ccedilla		], [asciicircum	]		};
+    key <AE05> { [ 5, percent		], [asciitilde	]		};
+    key <AE06> { [ 6, ampersand		], [section	]		};
+    key <AE07> { [ 7, slash		], [bar		]		};
+    key <AE08> { [ 8, parenleft		], [degree	]		};
+    key <AE09> { [ 9, parenright	], [backslash	]		};
+    key <AE10> { [ 0, equal		], [quoteleft	]		};
+    Key <AE11> { [ quoteright, question ], [SunFA_Acute	]		};
+    key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde		]};
+    key <AD03> { [ e, E			], [EuroSign	]		};
+    key <AD06> { [ z, Z			]				};
+    key <AD11> { [ udiaeresis, egrave	], [ bracketleft		]};
+    key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright		]};
+
+    key <AC10> { [ odiaeresis, eacute	]				};
+    key <AC11> { [ adiaeresis, agrave	], [ braceleft			]};
+    key <BKSL> { [ dollar, sterling	], [ braceright			]};
+
+    key <LSGT> { [ less, greater	], [ backslash			]};
+    key <AB01> { [ y, Y			]			};
+    key <AB08> { [ comma, semicolon	]			};
+    key <AB09> { [ period, colon	]			};
+    key <AB10> { [ minus, underscore	]			};
+    
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/tj	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,128 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "type6" {
+    include "sun_vndr/us(type6)"
+    name[Group1]= "Tajikistan";
+
+    key <TLDE> {        [     Cyrillic_io,     Cyrillic_IO      ], [ quoteleft, asciitilde ]   };
+    key <LSGT> {        [             bar,       brokenbar      ], [ less, greater ]   };
+    key <AD01> {        [ Cyrillic_shorti, Cyrillic_SHORTI      ], [ q, Q ]   };
+    key <AE01> {        [               1,          exclam      ], [ 1, exclam ]   };
+    key <AB01> {        [     Cyrillic_ya,     Cyrillic_YA      ], [ z, Z ]   };
+    key <AC02> {        [   Cyrillic_yeru,   Cyrillic_YERU      ], [ s, S ]   };
+    key <AC01> {        [     Cyrillic_ef,     Cyrillic_EF      ], [ a, A ]   };
+    key <AD02> {        [    Cyrillic_tse,    Cyrillic_TSE      ], [ w, W ]   };
+    key <AE02> {        [               2,        quotedbl      ], [ 2, at ]   };
+    key <AB03> {        [     Cyrillic_es,     Cyrillic_ES      ], [ c, C ]   };
+    key <AB02> {        [    Cyrillic_che,    Cyrillic_CHE      ],
+                        [     0x010004b7,      0x010004b6       ]       };
+    key <AC03> {        [     Cyrillic_ve,     Cyrillic_VE      ], [ d, D ]   };
+    key <AD03> {        [      Cyrillic_u,      Cyrillic_U      ],
+                        [      0x010004ef,      0x010004ee      ]       };
+    key <AE04> {        [               4,        asterisk      ], [ 4, dollar ]   };
+    key <AE03> {        [               3,      apostrophe      ], [ 3, numbersign ]   };
+    key <AB04> {        [     Cyrillic_em,     Cyrillic_EM      ], [ v, V ]   };
+    key <AC04> {        [      Cyrillic_a,      Cyrillic_A      ], [ f, F ]   };
+    key <AD05> {        [     Cyrillic_ie,     Cyrillic_IE      ], [ t, T ]   };
+    key <AD04> {        [     Cyrillic_ka,     Cyrillic_KA      ],
+                        [      0x0100049b,      0x0100049a      ]       };
+
+    key <AE05> {        [               5,           colon      ], [ 5, percent ]   };
+    key <AB06> {        [     Cyrillic_te,     Cyrillic_TE      ], [ n, N ]   };
+    key <AB05> {        [      Cyrillic_i,      Cyrillic_I      ],
+                        [      0x010004e3,      0x010004e2      ]       };
+    key <AC06> {        [     Cyrillic_er,     Cyrillic_ER      ], [ h, H ]   };
+    key <AC05> {        [     Cyrillic_pe,     Cyrillic_PE      ], [ g, G ]   };
+    key <AD06> {        [     Cyrillic_en,     Cyrillic_EN      ], [ y, Y ]   };
+    key <AE06> {        [               6,           comma      ], [ 6, asciicircum ]   };
+    key <AB07> {        [Cyrillic_softsign,Cyrillic_SOFTSIGN    ], [ m, M ]   };
+    key <AC07> {        [      Cyrillic_o,      Cyrillic_O      ], [ j, J ]   };
+    key <AD07> {        [    Cyrillic_ghe,    Cyrillic_GHE      ],
+                        [      0x01000493,      0x01000492      ]       };
+    key <AE07> {        [               7,          period      ], [ 7, ampersand ]   };
+    key <AE08> {        [               8,       semicolon      ], [ 8, asterisk ]   };
+    key <AB08> {        [     Cyrillic_be,     Cyrillic_BE      ], [ comma, less ]   };
+    key <AC08> {        [     Cyrillic_el,     Cyrillic_EL      ], [ k, K ]   };
+    key <AD08> {        [    Cyrillic_sha,    Cyrillic_SHA      ],
+                        [  Cyrillic_shcha,  Cyrillic_SHCHA      ]       };
+    key <AD09> {        [    dead_cedilla,     dead_macron      ], [ o, O ]   };
+    key <AE10> {        [               0,      parenright      ], [ 0, parentright ]   };
+    key <AE09> {        [               9,       parenleft      ], [ 9, parentleft ]   };
+    key <AB09> {        [     Cyrillic_yu,     Cyrillic_YU      ], [ period, greater ]   };
+    key <AB10> {        [           slash,        question      ], [ slash, question ]   };
+    key <AC09> {        [     Cyrillic_de,     Cyrillic_DE      ], [ l, L ]   };
+    key <AC10> {        [    Cyrillic_zhe,    Cyrillic_ZHE      ],
+                        [      0x01000497,      0x01000496      ]       };
+    key <AD10> {        [     Cyrillic_ze,     Cyrillic_ZE      ], [ p, P ]   };
+    key <AE11> {        [           minus,      underscore      ], [ minus, underscore ]   };
+    key <AC11> {        [      Cyrillic_e,      Cyrillic_E      ], [ quoteright, quotedbl ]   };
+    key <AD11> {        [     Cyrillic_ha,     Cyrillic_HA      ],
+                        [      0x010004b3,      0x010004b2      ]       };
+    key <AE12> {        [           equal,            plus      ], [ equal, plus ]   };
+    key <AD12> {        [Cyrillic_hardsign,Cyrillic_HARDSIGN    ], [ bracketright, braceright ]   };
+
+    // End alphanumeric section
+
+key.type[group2]="TWO_LEVEL";
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/tr	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,120 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Turkish "Q" (computer modern) keybaord
+
+    // Alphanumeric section
+    name[Group1]= "Turkish \"Q\" (computer modern)";
+    key <LSGT> {	[      less,	greater  	],
+			[       bar			]	};
+    key <TLDE> {        [  quotedbl,    eacute          ]       };
+    key <AE02> {	[         2,	apostrophe	]	};
+    key <AE03> {	[         3,	asciicircum	],
+			[ numbersign			]	};
+    key <AE04> {	[         4,	plus     	],
+			[    dollar			]	};
+    key <AE06> {	[         6,	ampersand	]	};
+    key <AE07> {	[         7,	slash    	],
+			[ braceleft			]	};
+    key <AE08> {	[         8,	parenleft	],
+			[ bracketleft			]	};
+    key <AE09> {	[         9,	parenright	],
+			[ bracketright			]	};
+    key <AE10> {	[         0,	equal    	],
+			[ braceright			]	};
+    key <AE11> {	[  asterisk,	question 	],
+			[ backslash			]	};
+    key <AE12> {	[     minus,	underscore	]	};
+    key <AD01> {        [         q,    Q               ],
+			[ at				]	};
+    key <AD08> {	[  idotless,    I		]	};
+    key <AD11> {	[    gbreve,    Gbreve		]	};
+    key <AD12> {	[ udiaeresis,	Udiaeresis	],
+			[ asciitilde			]	};
+    key <AC10> {	[   scedilla,   Scedilla	],	
+			[     acute			]	};
+    key <AC11> {	[         i,    Iabovedot	]	};
+    key <BKSL> {	[     comma,	semicolon	],
+			[ quoteleft			]	};
+    key <AB08> {	[ odiaeresis,	Odiaeresis	],
+			[      less			]	};
+    key <AB09> {	[  ccedilla,	Ccedilla 	],
+			[   greater			]	};
+    key <AB10> {	[    period,	colon    	]	};
+
+
+    // End alphanumeric section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+};
+
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+  include "sun_vndr/tr(basic)"
+	//a few keys are different than in the basic layout
+    key <AD03> {        [               e,       E      ],
+                        [        EuroSign		]       };
+    key <AD11> {	[    gbreve,    Gbreve		],
+			[	diaeresis 		]	};
+    key <AB08> {	[ odiaeresis,	Odiaeresis	]	};
+    key <AB09> {	[  ccedilla,	Ccedilla 	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/tr_f	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,248 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+//  turkish "F" keyboard, copyed from LyX turkish keyboard description
+//  right Ctrl key switches to an almost US keyboard (number row is mangled
+//  us keyboard mode, this to allow simple access by AltGr while in turkish
+//  mode to all needed symbols)
+//  as the names of some chars in iso-8859-9 are not consistent whith
+//  the rest of latin iso-8859-* I declare them in hexa (ugly, but what else?)
+//
+//  Pablo Saratxaga <[email protected]>
+//  FIXME: I'm not sure about the ISO_* stuff, the original *.map uses
+//         AltGr_Lock as modifier.
+
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Turkish "F" (traditional) keyboard
+
+    // Alphanumeric section
+    name[Group1]= "Turkish \"F\" (traditional)";
+    #name[Group2]= "US/ASCII";
+
+    key <TLDE> {	[ plus,		asterisk	],
+			[     notsign			]	};
+    key <AE01> {	[	  1,	exclam 		],
+			[ onesuperior			]	};	
+    key <AE02> {	[         2,	quotedbl	],
+			[ twosuperior			]	};
+    key <AE03> {	[         3,	SunFA_Circum	],
+			[ numbersign			]	};
+    key <AE04> {	[         4,	dollar     	],
+			[ onequarter			]	};
+    key <AE05> {	[         5,	percent  	],
+			[ onehalf			]	};
+    key <AE06> {	[         6,	ampersand	],
+			[ threequarters			]	};
+    key <AE07> {	[         7,	quoteright    	],
+			[ braceleft			]	};
+    key <AE08> {	[         8,	parenleft	],
+			[ bracketleft			]	};
+    key <AE09> {	[         9,	parenright	],
+			[ bracketright			]	};
+    key <AE10> {	[         0,	equal    	],
+			[ braceright			]	};
+    key <AE11> {	[  slash,	question 	],
+			[ backslash 		   	]	};
+    key <AE12> {	[     minus,	underscore	],
+			[     bar,    brokenbar		]	};
+
+    key <AD01> {	[         f,	F        	],
+			[         at,	at        	]	};
+    key <AD02> {	[         g,    G		],
+			[         w,	W        	]	};
+    key <AD03> {	[    gbreve,	Gbreve		],
+			[         e,	E        	]	};
+    key <AD04> {	[  idotless,	I		],      
+			[ paragraph		      	]	};
+    key <AD05> {	[         o,	O        	],
+			[         t,	T        	]	};
+    key <AD06> {	[         d,	D        	],
+			[         yen	        	]	};
+    key <AD07> {	[         r,	R        	],
+			[         u,	U        	]	};
+    key <AD08> {	[         n,	N        	],
+			[         i,	I        	]	};
+    key <AD09> {	[         h,	H        	],
+			[    degree 		       	]	};
+    key <AD10> {	[         p,    P	 	],
+			[  sterling			]	};
+    key <AD11> {	[         q,	Q        	],
+			[ diaeresis, dead_diaeresis	]	};
+    key <AD12> {	[         w,	W        	],
+			[ dead_tilde,  asciitilde	]	};
+    key <AC01> {	[         u,	U        	],
+			[         ae,	AE        	]	};
+    key <AC02> {	[         i,	Iabovedot	],
+			[    ssharp 		       	]	};
+    key <AC03> {	[         e,	E        	],
+			[         d,	D        	]	};
+    key <AC04> {	[         a,	A        	],
+			[         f,	F        	]	};
+    key <AC05> {	[  udiaeresis,	Udiaeresis	],
+			[	  g,	G		]	};	
+    key <AC06> {	[         t,	T        	],
+			[         h,	H        	]	};
+    key <AC07> {	[         k,	K        	],
+			[         j,	J        	]	};
+    key <AC08> {	[         m,	M        	],
+			[         k,	K        	]	};
+    key <AC09> {	[         l,    L		]	};
+    key <AC10> {	[         y,	Y        	],
+			[ SunFA_Acute, quoteright   	]	};
+    key <AC11> {	[  scedilla,	Scedilla	],
+			[ numbersign		 	]	};
+
+    key <BKSL> {	[         x,	X        	],
+			[ SunFA_Grave, quoteleft      	]	};
+    key <AB01> {	[         j,	J        	],
+			[ guillemotleft	        	]	};
+    key <AB02> {	[ odiaeresis,	Odiaeresis	],
+			[ guillemotright               	]	};
+    key <AB03> {	[         v,	V        	],
+			[         cent 		       	]	};
+    key <AB04> {	[         c,	C        	],
+			[         v,	V        	]	};
+    key <AB05> {	[  ccedilla,	Ccedilla 	],
+			[         b,	B        	]	};
+    key <AB06> {	[         z,	Z        	],
+			[         n,	N        	]	};
+    key <AB07> {	[         s,	S        	],
+			[         mu 		       	]	};
+    key <AB08> {	[         b,	B        	],
+			[     multiply		     	]	};
+    key <AB09> {	[    period,	colon    	],
+			[    division 		 	]	};
+    key <AB10> {	[     comma,	semicolon	],
+			[ soft_hyphen			]	};
+    key <LSGT> {	[      less,	greater  	],
+			[      bar, 	brokenbar	]	};
+
+    // End alphanumeric section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+};
+
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+  include "sun_vndr/tr_f(basic)"
+	//a few keys are different than in the basic layout
+
+    key <TLDE> {	[ plus,		asterisk	],
+			[     plusminus			]	};
+    key <AE12> {	[     minus,	underscore	],
+			[     	brokenbar		]	};
+    key <AD01> {	[         f,	F        	],
+			[         at	        	]	};
+    key <AD02> {	[         g,    G		]	};
+
+    key <AD03> {	[    gbreve,	Gbreve		]	};
+    key <AD04> {	[  idotless,	I		],      
+			[ paragraph		      	]	};
+    key <AD05> {	[         o,	O        	]	};
+    key <AD06> {	[         d,	D        	],
+			[         yen	        	]	};
+    key <AD07> {	[         r,	R        	]	};
+    key <AD08> {	[         n,	N        	]	};
+    key <AD09> {	[         h,	H        	],
+			[    degree 		       	]	};
+    key <AD10> {	[         p,    P	 	],
+			[  sterling			]	};
+    key <AD11> {	[         q,	Q        	],
+			[ diaeresis			]	};
+    key <AD12> {	[         w,	W        	],
+			[ dead_tilde			]	};
+    key <AC01> {	[         u,	U        	],
+			[         ae,	AE        	]	};
+    key <AC02> {	[         i,	Iabovedot	],
+			[    ssharp 		       	]	};
+    key <AC03> {	[         e,	E        	]	};
+    key <AC04> {	[         a,	A        	]	};
+    key <AC05> {	[  udiaeresis,	Udiaeresis	]	};	
+    key <AC06> {	[         t,	T        	]	};
+    key <AC07> {	[         k,	K        	]	};
+    key <AC08> {	[         m,	M        	]	};
+    key <AC09> {	[         l,    L		]	};
+    key <AC10> {	[         y,	Y        	],
+			[ SunFA_Acute		   	]	};
+    key <AC11> {	[  scedilla,	Scedilla	],
+			[ numbersign		 	]	};
+
+    key <BKSL> {	[         x,	X        	],
+			[ SunFA_Grave		      	]	};
+    key <AB01> {	[         j,	J        	],
+			[ less	        	]	};
+    key <AB02> {	[ odiaeresis,	Odiaeresis	],
+			[ greater               	]	};
+    key <AB03> {	[         v,	V        	],
+			[         cent 		       	]	};
+    key <AB04> {	[         c,	C        	]	};
+    key <AB05> {	[  ccedilla,	Ccedilla 	]	};
+    key <AB06> {	[         z,	Z        	]	};
+    key <AB07> {	[         s,	S        	],
+			[         mu 		       	]	};
+    key <AB08> {	[         b,	B        	],
+			[     multiply		     	]	};
+    key <AB09> {	[    period,	colon    	],
+			[    division 		 	]	};
+    key <AB10> {	[     comma,	semicolon	]	};
+    key <LSGT> {	[      less,	greater  	],	
+			[      bar			]	}; //the same as in Turkish Q layout
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/tuv	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,264 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+xkb_symbols "type4basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <LNFD> { [ Linefeed		]			};
+    key <COMP> { [ Multi_key		]			};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1,	L1		], [ SunStop	]	};
+    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
+    key <PROP> { [ L3,	L3		], [ SunProps	]	};
+    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
+    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
+    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
+    key <FIND> { [ L9,	L9		], [ SunFind	]	};
+    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+    key <DELE> { [ Delete		]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]			};
+    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
+    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
+    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
+    key <KPSU> { [ KP_Subtract		]			};
+
+    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
+    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
+//    key  <KP8> { [ R8,	R8		], [ KP_8		] };
+    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
+    key <KPAD> { [ KP_Add		]			};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		] };
+    key  <KP5> { [ R11,	R11		], [ KP_5		] };
+    key  <KP6> { [ Right, R12		], [ KP_6		] };
+
+    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
+    key  <KP2> { [ Down, R14		], [ KP_2		] };
+    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
+    key <KPEN> { [ KP_Enter		]			}; 
+    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
+    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R, Shift_L };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2           { Num_Lock };
+    modifier_map Mod3   	{ Mode_switch };
+    modifier_map Mod4		{ Alt_L };
+};
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+    include "us(basic)"
+
+    key <RTSH> { [ Shift_R		]	};
+    key <LALT> { [ Alt_L		]	};
+    key <ALGR> { [ Mode_switch		]	};
+    key <LMTA> { [ Meta_L		]	};
+    key <RMTA> { [ Meta_R		]	};
+    key <COMP> { [ Multi_key		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1			]			};
+    key <FK02> { [ F2			]			};
+    key <FK03> { [ F3			]			};
+    key <FK04> { [ F4			]			};
+    key <FK05> { [ F5			]			};
+    key <FK06> { [ F6			]			};
+    key <FK07> { [ F7			]			};
+    key <FK08> { [ F8			]			};
+    key <FK09> { [ F9			]			};
+    key <FK10> { [ F10			]			};
+    key <FK11> { [ SunF36		]			};
+    key <FK12> { [ SunF37		]			};
+    key <STOP> { [ L1, L1		], [ SunStop	]	};
+    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
+    key <PROP> { [ L3, L3		], [ SunProps	]	};
+    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
+    key <FRNT> { [ L5, L5		], [ SunFront	]	};
+    key <COPY> { [ L6, L6		], [ SunCopy	]	};
+    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
+    key <PAST> { [ L8, L8		], [ SunPaste	]	};
+    key <FIND> { [ L9, L9		], [ SunFind	]	};
+    key <CUT>  { [ L10, L10		], [ SunCut	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    key <LEFT> { [ Left			]			};
+    key <RGHT> { [ Right		]			};
+    key <UP>   { [ Up			]			};
+    key <DOWN> { [ Down			]			};
+
+    key <DELE> { [ Delete		]			};
+    key <INS>  { [ Insert		]			};
+    key <PGUP> { [ Prior		]			};
+    key <PGDN> { [ Next			]			};
+    key <HOME> { [ Home			]			};
+    key <END>  { [ End			]			};
+    key <HELP> { [ Help			]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
+
+    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
+    key  <KP8> { [ Up, R8		], [ KP_8		]	};
+    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ Left, R10		], [ KP_4		]	};
+    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
+    key  <KP6> { [ Right, R12		], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
+    key  <KP2> { [ Down, R14		], [ KP_2		]	};
+    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
+    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
+    // End "Keypad" section, 
+    // begin "four keys up on the right"
+
+    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
+    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
+    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod3	{ Alt_R };
+    modifier_map Mod4	{ Alt_L };
+};
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/tw	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,81 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+// Taiwanese layout for a Type 4 Sun keyboard
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
+
+//    key <LNFD> { [ Hangul		]			};
+//    key <RALT> { [ Linefeed		]			};
+    key <COMP> { [ Henkan_Mode		]			};
+
+};
+
+// Taiwanese layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+    // A few keys are different
+    key <ALGR> { [ Henkan_Mode		]			};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
+
+};
+
+// Taiwanese layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+    // A few keys are different from US layout - only those are shown here
+    key <ALGR> { [ Henkan_Mode		]			};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]		};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ua	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,181 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+// ukrainian standard keyboard 
+// AEN <[email protected]> & Leon Kanter <[email protected]>
+// Last Changes 2003/09/03 by Andriy Rysin <[email protected]>
+// $XFree86: xc/programs/xkbcomp/symbols/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Ukrainian keyboard
+
+    name[Group1]= "US/ASCII";
+    name[Group2]= "Ukrainian";
+
+    key	<TLDE> {	[	    grave,	asciitilde	],
+			[      apostrophe,	asciitilde	]	};
+    key	<AE01> {	[		1,	    exclam	],
+			[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,		at	],
+			[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,	numbersign	],
+			[		3,      numbersign	]	};
+    key	<AE04> {	[		4,	    dollar	],
+			[		4,        asterisk	]	};
+    key	<AE05> {	[		5,	   percent	],
+			[		5,	     colon	]	};
+    key	<AE06> {	[		6,     asciicircum	],
+			[		6,	     comma	]	};
+    key	<AE07> {	[		7,	 ampersand	],
+			[		7,	    period	]	};
+    key	<AE08> {	[		8,	  asterisk	],
+			[		8,	 semicolon	]	};
+    key	<AE09> {	[		9,	 parenleft	],
+			[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	],
+			[		0,	parenright	]	};
+    key	<AE11> {	[	    minus,	underscore	],
+			[	    minus,	underscore	]	};
+    key	<AE12> {	[	    equal,	      plus	],
+			[	    equal,	      plus	]	};
+
+    key	<AD01> {	[		q,		 Q	],
+			[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[		w,		 W	],
+			[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[		e,		 E	],
+			[      Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[		r,		 R	],
+			[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[		t,		 T	],
+			[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[		y,		 Y	],
+			[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[		u,		 U	],
+			[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[		i,		 I	],
+			[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[		o,		 O	],
+			[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    key	<AD10> {	[		p,		 P	],
+			[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AD11> {	[     bracketleft,	 braceleft	],
+			[     Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<AD12> {	[    bracketright,	braceright	],
+			[    Ukrainian_yi,    Ukrainian_YI	]	};
+    key	<BKSL> {	[	backslash,	       bar	],
+			[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key	<AC01> {	[		a,		 A	],
+			[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[		s,		 S	],
+			[     Ukrainian_i,     Ukrainian_I	]	};
+    key	<AC03> {	[		d,		 D	],
+			[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[		f,		 F	],
+			[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[		g,		 G	],
+			[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[		h,		 H	],
+			[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[		j,		 J	],
+			[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[		k,		 K	],
+			[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[		l,		 L	],
+			[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[	semicolon,	     colon	],
+			[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[      apostrophe,	  quotedbl	],
+			[    Ukrainian_ie,    Ukrainian_IE	]	};
+
+    key	<AB01> {	[		z,		 Z	],
+			[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[		x,		 X	],
+			[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[		c,		 C	],
+			[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[		v,		 V	],
+			[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB06> {	[		n,		 N	],
+			[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[		b,		 B	],
+			[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB07> {	[		m,		 M	],
+			[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[	    comma,	      less	],
+			[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[	   period,	   greater	],
+			[     Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<AB10> {	[	    slash,	  question	],
+			[	    slash,	  question	]	};
+
+    key <LSGT> {        [            less,         greater      ],
+                        [           slash,             bar      ]       };
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+};
+
+
+xkb_symbols "type6" {
+  include "sun_vndr/us(type6)"
+  include "sun_vndr/ua(basic)"
+
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/us	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,386 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+//
+//Copyright 1996, 1998  The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+// Symbols shared by all Sun Keyboard layouts
+xkb_symbols "sunbasic" {
+    include "srvr_ctrl(xfree86)"
+
+    // Needed for left function keys and volume keys
+    // Need to include this before us(basic) otherwise tilde is mapped to 
+    // a jp key
+    include "inet(evdev)"
+
+    include "us(basic)"
+    include "pc(function)"
+    include "pc(editing)"
+    include "keypad(x11)"
+
+    key <RTSH> { [ Shift_R		]			};
+    key <LALT> { [ Alt_L		]			};
+    key <ALGR> { [ Mode_switch		]			};
+    key <LMTA> { [ Meta_L		]			};
+    key <RMTA> { [ Meta_R		]			};
+    key <RCTL> { [ Control_R		]			};
+    key <COMP> { [ Multi_key		]			};
+    // End alphanumeric section
+
+    include "sun_vndr/us(left_funkeys)"
+
+    include "capslock(capslock)"
+    //include "capslock(shiftlock)"
+
+    key <LFSH> { [ Shift_L              ]                       };
+    key <RTSH> { [ Shift_R              ]                       };
+    key <LALT> { [ Alt_L                ]                       };
+    key <ALGR> { [ Mode_switch          ]                       };
+    key <LMTA> { [ Meta_L               ]                       };
+    key <RMTA> { [ Meta_R               ]                       };
+    key <LCTL> { [ Control_L            ]                       };
+    key <RCTL> { [ Control_R            ]                       };
+    key <COMP> { [ Multi_key            ]                       };
+
+    key  <TAB> { [ Tab,  ISO_Left_Tab   ]                       };
+    key <RTRN> { [ Return               ]                       };
+
+    key <ESC>  { [ Escape               ]                       }; 
+
+    key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+    key <SPCE> { [ space                        ] };
+
+// This default section uses the same symbols as other XKB implementations
+// for greater compatibility & AccessX MouseKeys support, but it is
+// different than the traditional Sun key mappings that date back to the
+// Sun Type 2 keyboard, in which the right side numpad were "R" function
+// keys.  To restore the original behavior, comment out this section and
+// uncomment the section below that lists the R key mappings.
+    key <KPDV> {        [  KP_Divide            ]       };
+    key <KPMU> {        [  KP_Multiply          ]       };
+    key <KPSU> {        [  KP_Subtract          ]       };
+
+    key  <KP7> {        [  KP_Home,     KP_7    ]       };
+    key  <KP8> {        [  KP_Up,       KP_8    ]       };
+    key  <KP9> {        [  KP_Prior,    KP_9    ]       };
+    key <KPAD> {        [       KP_Add          ]       };
+
+    key  <KP4> {        [  KP_Left,     KP_4    ]       };
+    key  <KP5> {        [  KP_Begin,    KP_5    ]       };
+    key  <KP6> {        [  KP_Right,    KP_6    ]       };
+
+    key  <KP1> {        [  KP_End,      KP_1    ]       };
+    key  <KP2> {        [  KP_Down,     KP_2    ]       };
+    key  <KP3> {        [  KP_Next,     KP_3    ]       };
+    key <KPEN> {        [       KP_Enter        ]       };
+
+    key  <KP0> {        [  KP_Insert,   KP_0    ]       };
+    key <KPDL> {  	[  KP_Delete, KP_Decimal ]    	};
+
+// End New Keypad section - Begin Sun traditional Keypad section
+
+//    key  <KP7> { [ R7,        R7              ], [ KP_7, Home         ] };
+//    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
+//    key  <KP9> { [ R9,        R9              ], [ KP_9, Prior        ] };
+//    key <KPAD> { [ KP_Add             ]                       };
+//
+//    key  <KP4> { [ Left, R10          ], [ KP_4               ] };
+//    key  <KP5> { [ R11,       R11             ], [ KP_5               ] };
+//    key  <KP6> { [ Right, R12         ], [ KP_6               ] };
+//
+//    key  <KP1> { [ R13,       R13             ], [ KP_1,      End     ] };
+//    key  <KP2> { [ Down, R14          ], [ KP_2               ] };
+//    key  <KP3> { [ R15,       R15             ], [ KP_3,      Next    ] };
+//    key <KPEN> { [ KP_Enter           ]                       };
+//    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0              ]       };
+//    key <KPDL> { [ Delete, Delete     ], [ KP_Decimal ]       };
+
+// End "Keypad" section
+
+    modifier_map Control { Control_L, Control_R };
+    modifier_map Shift   { Shift_R, Shift_L };
+    modifier_map Mod1    { Meta_L, Meta_R };
+    modifier_map Mod2    { Mode_switch };
+    modifier_map Mod3    { Num_Lock };
+    modifier_map Mod4    { Alt_L };
+};
+
+
+xkb_symbols "left_funkeys" {
+    // Suppliment to inet(evdev) for added functionality of left-funkeys
+    //key <STOP> { [ NoSymbol ],      [ L1, L1   ]       };
+    //key <AGAI> { [ NoSymbol ],      [ L2, L2   ]       };
+    //key <PROP> { [ NoSymbol ],      [ L3, L3   ]       };
+    //key <UNDO> { [ NoSymbol ],      [ L4, L4   ]       };
+    //key <FRNT> { [ NoSymbol ],      [ L5, L5   ]       };
+    //key <COPY> { [ NoSymbol ],      [ L6, L6   ]       };
+    //key <OPEN> { [ NoSymbol ],      [ L7, L7   ]       };
+    //key <PAST> { [ NoSymbol ],      [ L8, L8   ]       };
+    //key <FIND> { [ NoSymbol ],      [ L9, L9   ]       };
+    //key <CUT>  { [ NoSymbol ],      [ L10, L10 ]       };
+
+    // The above symbols were chosen for better compatibility withother xkb
+    // mappings.  The old mappings are kepy below in case someone needs them
+    key <STOP> { [ L1,        L1              ], [ SunStop    ]       };
+    key <AGAI> { [ L2,        L2              ], [ SunAgain   ]       };
+    key <PROP> { [ L3,        L3              ], [ SunProps   ]       };
+    key <UNDO> { [ L4,        L4              ], [ SunUndo    ]       };
+    key <FRNT> { [ L5,        L5              ], [ SunFront   ]       };
+    key <COPY> { [ L6,        L6              ], [ SunCopy    ]       };
+    key <OPEN> { [ L7,        L7              ], [ SunOpen    ]       };
+    key <PAST> { [ L8,        L8              ], [ SunPaste   ]       };
+    key <FIND> { [ L9,        L9              ], [ SunFind    ]       };
+    key <CUT>  { [ L10,       L10             ], [ SunCut     ]       };
+};
+
+hidden
+xkb_symbols "volumekeys" {
+    // Suppliment to inet(evdev) for added functionality of audio keys
+    key <MUTE> { [ NoSymbol,    SunVideoDegauss         ]       };
+    key <VOL-> { [ NoSymbol,    XF86MonBrightnessDown   ]       };
+    key <VOL+> { [ NoSymbol,    XF86MonBrightnessUp     ]       };
+
+    // The above symbols were chosen for better compatibility withother xkb
+    // mappings.  The old mappings are kepy below in case someone needs them
+    //key <MUTE> { [ SunAudioMute,      SunVideoDegauss         ]       };
+    //key <VOL-> { [ SunAudioLowerVolume,       SunVideoLowerBrightness ]       };
+    //key <VOL+> { [ SunAudioRaiseVolume,       SunVideoRaiseBrightness ]       };
+    //key <POWR> { [ SunPowerSwitch,    SunPowerSwitchShift     ]       };
+};
+
+
+// US/ASCII layout for a Type 4 Sun keyboard
+xkb_symbols "type4basic" {
+    include "sun_vndr/us(sunbasic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+
+    key <LNFD> { [ Linefeed		]			};
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2,	R2		], [ Print		] };
+    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
+    key <PAUS> { [ R1,	R1		], [ Pause		] };
+
+    // End "Editing" section, begin "Keypad"
+    key <KPEQ> { [ R4,	KP_Equal	], [ KP_Equal		] };
+
+};
+
+xkb_symbols "type4" {
+    include "sun_vndr/us(type4basic)"
+
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+    include "sun_vndr/us(sunbasic)"
+    include "sun_vndr/us(volumekeys)"
+
+    // Begin "Editing" section
+    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
+    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
+    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
+    // End "Editing" section
+};
+
+xkb_symbols "type5" {
+    include "sun_vndr/us(type5basic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5hobobasic" {
+    include "sun_vndr/us(type5basic)"
+};
+
+xkb_symbols "type5hobo" {
+    include "sun_vndr/us(type5hobobasic)"
+
+    // A few alphanumeric keys are different
+    key <AE04> { [ 4, dollar            ], [ EuroSign   ]       };
+    key <AE05> { [ 5, percent           ], [ EuroSign   ]       };
+    key <AD03> { [ e, E                 ], [ EuroSign   ]       };
+    key <BKSL> { [ backslash, bar       ], [ brokenbar  ]       };
+
+    // Here is the hobo keypad:
+
+    key <AE07> { [ 7, ampersand ], [ NoSymbol, NoSymbol ], [ KP_7       ] };
+    key <AE08> { [ 8, asterisk  ], [ NoSymbol, NoSymbol ], [ KP_8       ] };
+    key <AE09> { [ 9, parenleft ], [ NoSymbol, NoSymbol ], [ KP_9       ] };
+    key <AE10> { [ 0, parenright], [ NoSymbol, NoSymbol ], [ KP_Multiply] };
+
+    key <AD07> { [ u, U         ], [ NoSymbol, NoSymbol ], [ KP_4       ] };
+    key <AD08> { [ i, I         ], [ NoSymbol, NoSymbol ], [ KP_5       ] };
+    key <AD09> { [ o, O         ], [ NoSymbol, NoSymbol ], [ KP_6       ] };
+    key <AD10> { [ p, P         ], [ NoSymbol, NoSymbol ], [ KP_Subtract]};
+
+    key <AC07> { [ j, J         ], [ NoSymbol, NoSymbol ], [ KP_1       ] };
+    key <AC08> { [ k, K         ], [ NoSymbol, NoSymbol ], [ KP_2       ] };
+    key <AC09> { [ l, L         ], [ NoSymbol, NoSymbol ], [ KP_3       ] };
+    key <AC10> { [ semicolon, colon], [ NoSymbol, NoSymbol], [ KP_Add   ] };
+
+    key <RTRN> { [ Return       ], [ NoSymbol, NoSymbol], [ KP_Enter    ] };
+
+    key <AB07> { [ m, M         ], [ NoSymbol, NoSymbol ], [ KP_0       ] };
+
+    key <AB09> { [ period, greater], [ NoSymbol, NoSymbol], [ KP_Decimal] };
+    key <AB10> { [ slash, question], [ NoSymbol, NoSymbol], [ KP_Divide ] };
+};
+
+
+xkb_symbols "type6" {
+    include "sun_vndr/us(sunbasic)"
+    include "sun_vndr/us(volumekeys)"
+    include "eurosign(4)"
+
+    key <SYRQ> { [ SunSys_Req                   ]};
+};
+
+
+
+xkb_symbols "pc101" {
+    include "us(pc101)"
+    key <RALT> { [ Mode_switch, Meta_R	] };
+};
+
+xkb_symbols "pc102" {
+    include "us(pc102)"
+    key <RALT> { [ Mode_switch, Meta_R	] };
+};
+
+xkb_symbols "pc104" {
+    include "us(pc104)"
+};
+
+xkb_symbols "pc101currency" {
+
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
+};
+
+xkb_symbols "US101A_Sun" {
+
+    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
+    key <AE05> { [ 5, percent		], [ EuroSign	]	};
+    key <AD03> { [ e, E			], [ EuroSign	]	};
+    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
+
+    // Begin "Editing" section
+    key <PRSC> { [ L5, L5		], [ Print, SunSys_Req 		]};
+    key <SCLK> { [ L7, L7		], [  Scroll_Lock		]};
+    key <PAUS> { [ L1, L1		], [ Pause, Break 		]};
+    key  <INS> { [ L8, L8		], [  Insert			]};
+    key <HOME> { [ L6, L6		], [  Home			]};
+    key <PGUP> { [ L3, L3		], [  Prior			]};
+
+
+    key <DELE> { [ L10, L10		], [ Delete			]};
+    key  <END> { [ L9, L9		], [  End			]};
+    key <PGDN> { [ L4, L4		], [  Next			]};
+
+    key   <UP> {	[  Up			]	};
+    key <LEFT> {	[  Left			]	};
+    key <DOWN> {	[  Down			]	};
+    key <RGHT> {	[  Right		]	};
+
+    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
+    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+
+    key  <KP7> { [ R7, KP_7		], [ KP_7, Home		]	};
+    key  <KP8> { [ KP_Up, KP_8		], [ KP_8		]	};
+    key  <KP9> { [ R9, KP_9		], [ KP_9, Prior	]	};
+    key <KPAD> { [ KP_Add		]				};
+
+    key  <KP4> { [ KP_Left, KP_4	], [ KP_4		]	};
+    key  <KP5> { [ R11,	KP_5		], [ KP_5		]	};
+    key  <KP6> { [ KP_Right, KP_6	], [ KP_6		]	};
+
+    key  <KP1> { [ R13,	KP_1		], [ KP_1, End		]	};
+    key  <KP2> { [ KP_Down, KP_2	], [ KP_2		]	};
+    key  <KP3> { [ R15,	KP_3		], [ KP_3, Next		]	};
+    key <KPEN> { [ KP_Enter		]				};
+
+    key <LALT> { [ Meta_L		]				};
+    key <RALT> { [ Alt_L		]				};
+    key <RCTL> { [ Multi_key		]				};
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/uz	Tue Mar 24 11:40:01 2009 +0100
@@ -0,0 +1,171 @@
+// $XdotOrg: $
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" { 
+    include "sun_vndr/us(type6)"
+    name[Group1]= "Uzbekistan";
+
+
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,      numerosign	]	};
+    key	<AE04> {	[		4,       semicolon 	]	};
+    key	<AE05> {	[		5,	   percent 	]	};
+    key	<AE06> {	[		6,	     colon	]	};
+    key	<AE07> {	[		7,	  question	]	};
+    key	<AE08> {	[		8,	  asterisk	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+    key	<BKSL> {	[	backslash,             bar	]	};
+    key	<AB10> {	[	   period,	     comma	]	};
+    key <LSGT> {        [           slash,             bar      ]       };
+
+key.type[group1]="ALPHABETIC";
+
+    key	<AE11> {	[Cyrillic_ghe_bar, Cyrillic_GHE_bar     ],	
+			[           minus,      underscore      ]       };	
+    key	<AE12> {	[Cyrillic_ha_descender, Cyrillic_HA_descender ],
+			[           equal,            plus      ]       }; 
+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	],
+			[           grave,      asciitilde      ]	};
+
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	],	
+			[               q,               Q      ]       };
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	],	
+			[               w,               W      ]       };
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	],	
+			[               e,               E      ]       };
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	],	
+			[               r,               R      ]       };
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	],	
+			[               t,               T      ]       };
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	],	
+			[               y,               Y      ]       };
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	],	
+			[               u,               U      ]       };
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	], 	
+			[               i,               I      ]       };
+    key	<AD09> {	[ Byelorussian_shortu, Byelorussian_SHORTU ],	
+			[               o,               O      ]       };
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE      ],
+			[               p,               P      ]       };	
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA      ],
+			[     bracketleft,       braceleft      ]       };	
+    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN ],
+			[    bracketright,      braceright      ]       };
+
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	],	
+			[               a,               A      ]       };
+    key	<AC02> {	[Cyrillic_ka_descender, Cyrillic_KA_descender ],	
+			[               s,               S      ]       };
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	],	
+			[               d,               D      ]       };
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	],	
+			[               f,               F      ]       };
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	],	
+			[               g,               G      ]       };
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	],	
+			[               h,               H      ]       };
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	],	
+			[               j,               J      ]       };
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	],	
+			[               k,               K      ]       };
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	],	
+			[               l,               L      ]       };
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	],	
+			[       semicolon,           colon      ]       };
+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	],	
+			[      apostrophe,        quotedbl      ]       };
+
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	],	
+			[               z,               Z      ]       };
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	],	
+			[               x,               X      ]       };
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	],	
+			[               c,               C      ]       };
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	],
+			[               v,               V      ]       };
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	],	
+			[               n,               N      ]       };
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	],	
+			[               b,               B      ]       };
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	],	
+			[               m,               M      ]       };
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	],	
+			[           comma,            less      ]       };
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	],
+			[          period,         greater      ]       };	
+
+    // End alphanumeric section
+
+key.type[group2]="TWO_LEVEL";
+
+    // End alphanumeric section
+    
+    // Begin modifier mappings 
+
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod3   { Mode_switch };
+
+
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "latin" {
+    include "sun_vndr/us(type6)"
+    name[Group1]= "Uzbekistan - Latin";
+    key <AC11>  { [0x010002BB, quotedbl] };
+};
+
--- a/src/xorg/keytables/sun-src/symbols/tr	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/symbols/tr,v 1.1 2000/12/06 20:18:08 eich Exp $
-// Converted keytable file to xkb/symbols/ file
-// with mk_xkb by [email protected] Tue Sep 30 01:21:59 MET DST 1997
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-//  turkish "Q" keyboard, copyed from LyX turkish keyboard description
-//  as the names of some chars in iso-8859-9 are not consistent whith
-//  the rest of latin iso-8859-* I declare them in hexa (ugly, but what else?)
-//
-//  Pablo Saratxaga <[email protected]>
-
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Turkish "Q" (computer modern) keybaord
-
-    // Alphanumeric section
-    name[Group1]= "Turkish \"Q\" (computer modern)";
-
-    key <TLDE> {        [  quotedbl,    eacute          ]       };
-    key <AE02> {	[         2,	apostrophe	]	};
-    key <AE03> {	[         3,	asciicircum	],
-			[ numbersign			]	};
-    key <AE04> {	[         4,	plus     	],
-			[    dollar			]	};
-    key <AE06> {	[         6,	ampersand	]	};
-    key <AE07> {	[         7,	slash    	],
-			[ braceleft			]	};
-    key <AE08> {	[         8,	parenleft	],
-			[ bracketleft			]	};
-    key <AE09> {	[         9,	parenright	],
-			[ bracketright			]	};
-    key <AE10> {	[         0,	equal    	],
-			[ braceright			]	};
-    key <AE11> {	[  asterisk,	question 	],
-			[ backslash			]	};
-    key <AE12> {	[     minus,	underscore	]	};
-    key <AD01> {        [         q,    Q               ],
-			[ at				]	};
-    key <AD08> {	[  idotless,    I		]	};
-    key <AD11> {	[    gbreve,    Gbreve		],
-			[ dead_diaeresis		]	};
-    key <AD12> {	[ udiaeresis,	Udiaeresis	],
-			[ dead_tilde			]	};
-    key <AC10> {	[   scedilla,   Scedilla	],	
-			[ dead_acute			]	};
-    key <AC11> {	[         i,    Iabovedot	]	};
-    key <BKSL> {	[     comma,	semicolon	],
-			[ dead_grave			]	};
-    key <AB08> {	[ odiaeresis,	Odiaeresis	],
-			[      less			]	};
-    key <AB09> {	[  ccedilla,	Ccedilla 	],
-			[   greater			]	};
-    key <AB10> {	[    period,	colon    	]	};
-    key <LSGT> {	[      less,	greater  	],
-			[       bar			]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "tr(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "tr(Sundeadkeys)"
-
-};
--- a/src/xorg/keytables/sun-src/symbols/tr_f	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-// Converted keytable file to xkb/symbols/ file
-// with mk_xkb by [email protected] Tue Sep 30 01:29:39 MET DST 1997
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-//  turkish "F" keyboard, copyed from LyX turkish keyboard description
-//  right Ctrl key switches to an almost US keyboard (number row is mangled
-//  us keyboard mode, this to allow simple access by AltGr while in turkish
-//  mode to all needed symbols)
-//  as the names of some chars in iso-8859-9 are not consistent whith
-//  the rest of latin iso-8859-* I declare them in hexa (ugly, but what else?)
-//
-//  Pablo Saratxaga <[email protected]>
-//  FIXME: I'm not sure about the ISO_* stuff, the original *.map uses
-//         AltGr_Lock as modifier.
-
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Turkish "F" (traditional) keyboard
-
-    // Alphanumeric section
-    name[Group1]= "Turkish \"F\" (traditional)";
-    #name[Group2]= "US/ASCII";
-
-    key <AE01> {	[	  1,	exclam 		],
-			[ onesuperior			]	};	
-    key <AE02> {	[         2,	quotedbl	],
-			[ twosuperior			]	};
-    key <AE03> {	[         3,	dead_circumflex	],
-			[ numbersign			]	};
-    key <AE04> {	[         4,	dollar     	],
-			[ onequarter			]	};
-    key <AE05> {	[         5,	percent  	],
-			[ onehalf			]	};
-    key <AE06> {	[         6,	ampersand	],
-			[ threequarters			]	};
-    key <AE07> {	[         7,	quoteright    	],
-			[ braceleft			]	};
-    key <AE08> {	[         8,	parenleft	],
-			[ bracketleft			]	};
-    key <AE09> {	[         9,	parenright	],
-			[ bracketright			]	};
-    key <AE10> {	[         0,	equal    	],
-			[ braceright			]	};
-    key <AE11> {	[  slash,	question 	],
-			[ backslash 		   	]	};
-    key <AE12> {	[     minus,	underscore	],
-			[     bar,    brokenbar		]	};
-    key <AD01> {	[         f,	F        	],
-			[         at,	at        	]	};
-    key <AD02> {	[         g,    G		],
-			[         w,	W        	]	};
-    key <AD03> {	[    gbreve,	Gbreve		],
-			[         e,	E        	]	};
-    key <AD04> {	[  idotless,	I		],      
-			[ paragraph		      	]	};
-    key <AD05> {	[         o,	O        	],
-			[         t,	T        	]	};
-    key <AD06> {	[         d,	D        	],
-			[         yen	        	]	};
-    key <AD07> {	[         r,	R        	],
-			[         u,	U        	]	};
-    key <AD08> {	[         n,	N        	],
-			[         i,	I        	]	};
-    key <AD09> {	[         h,	H        	],
-			[    degree 		       	]	};
-    key <AD10> {	[         p,    P	 	],
-			[  sterling			]	};
-    key <AD11> {	[         q,	Q        	],
-			[ diaeresis, dead_diaeresis	]	};
-    key <AD12> {	[         w,	W        	],
-			[ dead_tilde,  asciitilde	]	};
-    key <AC01> {	[         u,	U        	],
-			[         ae,	AE        	]	};
-    key <AC02> {	[         i,	Iabovedot	],
-			[    ssharp 		       	]	};
-    key <AC03> {	[         e,	E        	],
-			[         d,	D        	]	};
-    key <AC04> {	[         a,	A        	],
-			[         f,	F        	]	};
-    key <AC05> {	[  udiaeresis,	Udiaeresis	],
-			[	  g,	G		]	};	
-    key <AC06> {	[         t,	T        	],
-			[         h,	H        	]	};
-    key <AC07> {	[         k,	K        	],
-			[         j,	J        	]	};
-    key <AC08> {	[         m,	M        	],
-			[         k,	K        	]	};
-    key <AC09> {	[         l,    L		]	};
-    key <AC10> {	[         y,	Y        	],
-			[ dead_acute, quoteright   	]	};
-    key <AC11> {	[  scedilla,	Scedilla	],
-			[ numbersign		 	]	};
-    key <TLDE> {	[ plus,		asterisk	],
-			[     notsign			]	};
-    key <BKSL> {	[         x,	X        	],
-			[ dead_grave, quoteleft      	]	};
-    key <AB01> {	[         j,	J        	],
-			[ guillemotleft	        	]	};
-    key <AB02> {	[ odiaeresis,	Odiaeresis	],
-			[ guillemotright               	]	};
-    key <AB03> {	[         v,	V        	],
-			[         cent 		       	]	};
-    key <AB04> {	[         c,	C        	],
-			[         v,	V        	]	};
-    key <AB05> {	[  ccedilla,	Ccedilla 	],
-			[         b,	B        	]	};
-    key <AB06> {	[         z,	Z        	],
-			[         n,	N        	]	};
-    key <AB07> {	[         s,	S        	],
-			[         mu 		       	]	};
-    key <AB08> {	[         b,	B        	],
-			[     multiply		     	]	};
-    key <AB09> {	[    period,	colon    	],
-			[    division 		 	]	};
-    key <AB10> {	[     comma,	semicolon	],
-			[ soft_hyphen			]	};
-    key <LSGT> {	[      less,	greater  	],
-			[      bar, 	brokenbar	]	};
-
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "tr_f(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "tr_f(Sundeadkeys)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/ua	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,279 +0,0 @@
-// ukrainian standard keyboard 
-// AEN <[email protected]> & Leon Kanter <[email protected]>
-// Last Changes 2003/09/03 by Andriy Rysin <[email protected]>
-// $XFree86: xc/programs/xkbcomp/symbols/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Ukrainian keyboard
-
-    name[Group1]= "US/ASCII";
-    name[Group2]= "Ukrainian";
-
-    key	<TLDE> {	[	    grave,	asciitilde	],
-			[      apostrophe,	asciitilde	]	};
-    key	<AE01> {	[		1,	    exclam	],
-			[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,		at	],
-			[		2,        quotedbl	]	};
-    key	<AE03> {	[		3,	numbersign	],
-			[		3,      numbersign	]	};
-    key	<AE04> {	[		4,	    dollar	],
-			[		4,        asterisk	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[		5,	     colon	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[		6,	     comma	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[		7,	    period	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[		8,	 semicolon	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	],
-			[		0,	parenright	]	};
-    key	<AE11> {	[	    minus,	underscore	],
-			[	    minus,	underscore	]	};
-    key	<AE12> {	[	    equal,	      plus	],
-			[	    equal,	      plus	]	};
-
-    key	<AD01> {	[		q,		 Q	],
-			[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<AD02> {	[		w,		 W	],
-			[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<AD03> {	[		e,		 E	],
-			[      Cyrillic_u,	Cyrillic_U	]	};
-    key	<AD04> {	[		r,		 R	],
-			[     Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<AD05> {	[		t,		 T	],
-			[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<AD06> {	[		y,		 Y	],
-			[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<AD07> {	[		u,		 U	],
-			[    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<AD08> {	[		i,		 I	],
-			[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AD09> {	[		o,		 O	],
-			[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
-    key	<AD10> {	[		p,		 P	],
-			[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<AD11> {	[     bracketleft,	 braceleft	],
-			[     Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<AD12> {	[    bracketright,	braceright	],
-			[    Ukrainian_yi,    Ukrainian_YI	]	};
-    key	<BKSL> {	[	backslash,	       bar	],
-			[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
-
-    key	<AC01> {	[		a,		 A	],
-			[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<AC02> {	[		s,		 S	],
-			[     Ukrainian_i,     Ukrainian_I	]	};
-    key	<AC03> {	[		d,		 D	],
-			[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<AC04> {	[		f,		 F	],
-			[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<AC05> {	[		g,		 G	],
-			[     Cyrillic_pe,     Cyrillic_PE	]	};
-    key	<AC06> {	[		h,		 H	],
-			[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<AC07> {	[		j,		 J	],
-			[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<AC08> {	[		k,		 K	],
-			[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<AC09> {	[		l,		 L	],
-			[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<AC10> {	[	semicolon,	     colon	],
-			[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<AC11> {	[      apostrophe,	  quotedbl	],
-			[    Ukrainian_ie,    Ukrainian_IE	]	};
-
-    key	<AB01> {	[		z,		 Z	],
-			[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<AB02> {	[		x,		 X	],
-			[    Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AB03> {	[		c,		 C	],
-			[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<AB04> {	[		v,		 V	],
-			[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<AB06> {	[		n,		 N	],
-			[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<AB05> {	[		b,		 B	],
-			[      Cyrillic_i,	Cyrillic_I	]	};
-    key	<AB07> {	[		m,		 M	],
-			[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<AB08> {	[	    comma,	      less	],
-			[     Cyrillic_be,     Cyrillic_BE	]	};
-    key	<AB09> {	[	   period,	   greater	],
-			[     Cyrillic_yu,     Cyrillic_YU	]	};
-    key	<AB10> {	[	    slash,	  question	],
-			[	    slash,	  question	]	};
-
-    key <LSGT> {        [            less,         greater      ],
-                        [           slash,             bar      ]       };
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock, ISO_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-partial alphanumeric_keys
-xkb_symbols "winkeys" {
-    include "ua(basic)"
-    key <AE03> {        [               3,      numbersign      ],
-                        [               3,      numerosign      ]       };
-    key <AE04> {        [               4,          dollar      ],
-                        [               4,       semicolon      ]       };
-    key <AE05> {        [               5,         percent      ],
-                        [               5,         percent      ]       };
-    key <AE06> {        [               6,     asciicircum      ],
-                        [               6,           colon      ]       };
-    key <AE07> {        [               7,       ampersand      ],
-                        [               7,        question      ]       };
-    key <AE08> {        [               8,        asterisk      ],
-                        [               8,        asterisk      ]       };
-    key <AB10> {        [           slash,        question      ],
-                        [          period,           comma      ]       };
-
-//    key	<AC02> {	[		s,		 S	],
-//			[     Ukrainian_i,     Ukrainian_I	]	};
-
-//    key	<AB05> {	[		b,		 B	],
-//			[      Cyrillic_i,	Cyrillic_I	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "typewriter" {
-    include "ua(basic)"
-    key	<TLDE> {	[	    grave,	asciitilde	],
-			[      apostrophe,	  quotedbl	] 	};
-    key	<AE01> {	[		1,	    exclam	],
-			[	   exclam,		 1 	]	};
-    key	<AE02> {	[		2,		at	],
-			[      numerosign,		 2	]	};
-    key	<AE03> {	[		3,	numbersign	],
-			[	    slash,		 3	]	};
-    key	<AE04> {	[		4,	    dollar	],
-			[	semicolon,		 4	]	};
-    key	<AE05> {	[		5,	   percent	],
-			[	    colon,		 5	]	};
-    key	<AE06> {	[		6,     asciicircum	],
-			[	    comma,		 6	]	};
-    key	<AE07> {	[		7,	 ampersand	],
-			[	   period,		 7	]	};
-    key	<AE08> {	[		8,	  asterisk	],
-			[      underscore,		 8	]	};
-    key	<AE09> {	[		9,	 parenleft	],
-			[	 question,		 9	]	};
-    key	<AE10> {	[		0,	parenright	],
-			[	  percent,		 0	]	};
-
-    key	<AD12> {	[    bracketright,	braceright	],
-			[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
-
-    key	<AC02> {	[		s,		 S	],
-			[      Cyrillic_i,	Cyrillic_I	]	};
-
-    key	<AB05> {	[		b,		 B	],
-			[     Ukrainian_i,     Ukrainian_I	]	};
-
-    key	<AB10> {	[	    slash,	  question	],
-			[    Ukrainian_yi,    Ukrainian_YI	]	};
-
-    key	<BKSL> {	[	backslash,	       bar	],
-			[	parenleft,	parenright	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "phonetic" {
-  include "ua(basic)"
-  
-  key <AD01> {   [ q,                 Q                   ],
-                 [ Cyrillic_ya,       Cyrillic_YA         ]    };
-  key <AD02> {   [ w,                 W                   ],
-                 [ Cyrillic_ve,       Cyrillic_VE         ]    };
-  key <AD03> {   [ e,                 E                   ],
-                 [ Cyrillic_ie,       Cyrillic_IE         ]    };
-  key <AD04> {   [ r,                 R                   ],
-                 [ Cyrillic_er,       Cyrillic_ER         ]    };
-  key <AD05> {   [ t,                 T                   ],
-                 [ Cyrillic_te,       Cyrillic_TE         ]    };
-  key <AD06> {   [ y,                 Y                   ],
-                 [ Cyrillic_i,        Cyrillic_i          ]    };
-  key <AD07> {   [ u,                 U                   ],
-                 [ Cyrillic_u,        Cyrillic_U          ]    };
-  key <AD08> {   [ i,                 I                   ],
-                 [ Ukrainian_i,       Ukrainian_I         ]    };
-  key <AD09> {   [ o,                 O                   ],
-                 [ Cyrillic_o,        Cyrillic_O          ]    };
-  key <AD10> {   [ p,                 P                   ],
-                 [ Cyrillic_pe,       Cyrillic_PE         ]    };
-  key <AD11> {   [ bracketleft,       braceleft           ],
-                 [ Cyrillic_sha,      Cyrillic_SHA        ]    };
-  key <AD12> {   [ bracketright,      braceright          ],
-                 [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
-
-  key <AC01> {   [ a,                 A                   ],
-                 [ Cyrillic_a,        Cyrillic_A          ]    };
-  key <AC02> {   [ s,                 S                   ],
-                 [ Cyrillic_es,       Cyrillic_ES         ]    };
-  key <AC03> {   [ d,                 D                   ],
-                 [ Cyrillic_de,       Cyrillic_DE         ]    };
-  key <AC04> {   [ f,                 F                   ],
-                 [ Cyrillic_ef,       Cyrillic_EF         ]    };
-  key <AC05> {   [ g,                 G                   ],
-                 [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
-  key <AC06> {   [ h,                 H                   ],
-                 [ Cyrillic_ha,       Cyrillic_HA         ]    };
-  key <AC07> {   [ j,                 J                   ],
-                 [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
-  key <AC08> {   [ k,                 K                   ],
-                 [ Cyrillic_ka,       Cyrillic_KA         ]    };
-  key <AC09> {   [ l,                 L                   ],
-                 [ Cyrillic_el,       Cyrillic_EL         ]    };
-  key <AC10> {   [ semicolon,         colon               ],
- 		 [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
-  key <AC11> {   [ quoteright,        quotedbl            ],
-		 [ Cyrillic_che,      Cyrillic_CHE	  ]    };
-  key <BKSL> {   [ backslash,         bar                 ],
-                 [ Cyrillic_yu,       Cyrillic_YU         ]    };
-
-  key <AB01> {   [ z,                 Z                   ],
-                 [ Cyrillic_ze,       Cyrillic_ZE         ]    };
-  key <AB02> {   [ x,                 X                   ],
-                 [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
-  key <AB03> {   [ c,                 C                   ],
-                 [ Cyrillic_tse,      Cyrillic_TSE        ]    };
-  key <AB04> {   [ v,                 V                   ],
-                 [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
-  key <AB05> {   [ b,                 B                   ],
-                 [ Cyrillic_be,       Cyrillic_BE         ]    };
-  key <AB06> {   [ n,                 N                   ],
-                 [ Cyrillic_en,       Cyrillic_EN         ]    };
-  key <AB07> {   [ m,                 M                   ],
-                 [ Cyrillic_em,       Cyrillic_EM         ]    };
-  key <AB08> {   [ comma,             less                ],
-		 [ Ukrainian_yi,      Ukrainian_YI	  ]    };
-  key <AB09> {   [ period,            greater             ],
-		 [ Ukrainian_ie,      Ukrainian_IE	  ]    };
-  key <AB10> {   [ slash,             question            ],
-                 [ slash,             question            ]    };
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-include "ua(basic)" // for naming consistency
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-include "ua(Sundeadkeys)" // for naming consistency
-};
-
-
--- a/src/xorg/keytables/sun-src/symbols/us	Mon Mar 23 17:34:01 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,385 +0,0 @@
-// $Xorg: us,v 1.3 2000/08/17 19:54:44 cpqbld Exp $
-
-// symbols definition for a very simple US/ASCII layout.
-// It has basically the alphanumeric keys, punctuation, 
-// one shift key, one control key and caps lock. It 
-// uses the punctuation keys configurations common on PC 
-// keyboards (e.g. key <ABO9> is { [ period greater ] })
-
-// $XFree86: xc/programs/xkbcomp/symbols/us,v 3.14 2003/10/25 13:24:05 pascal Exp $
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial hidden alphanumeric_keys modifier_keys 
-xkb_symbols "basic" {
-
-    name[Group1]= "US/ASCII";
-    key <ESC>  {	[ Escape			]	};
-
-    // Alphanumeric section
-    key <TLDE> {	[ quoteleft,	asciitilde	]	};
-    key <AE01> {	[	  1,	exclam 		]	};
-    key <AE02> {	[	  2,	at		]	};
-    key <AE03> {	[	  3,	numbersign	]	};
-    key <AE04> {	[	  4,	dollar		]	};
-    key <AE05> {	[	  5,	percent		]	};
-    key <AE06> {	[	  6,	asciicircum	]	};
-    key <AE07> {	[	  7,	ampersand	]	};
-    key <AE08> {	[	  8,	asterisk	]	};
-    key <AE09> {	[	  9,	parenleft	]	};
-    key <AE10> {	[	  0,	parenright	]	};
-    key <AE11> {	[     minus,	underscore	]	};
-    key <AE12> {	[     equal,	plus		]	};
-    key <BKSP> {
-	type="CTRL+ALT",
-	symbols[Group1]= [ BackSpace,	Terminate_Server ]
-    };
-
-    key  <TAB> {	[ 	Tab,	ISO_Left_Tab	]	};
-    key <AD01> {	[	  q,	Q 		]	};
-    key <AD02> {	[	  w,	W		]	};
-    key <AD03> {	[	  e,	E		]	};
-    key <AD04> {	[	  r,	R		]	};
-    key <AD05> {	[	  t,	T		]	};
-    key <AD06> {	[	  y,	Y		]	};
-    key <AD07> {	[	  u,	U		]	};
-    key <AD08> {	[	  i,	I		]	};
-    key <AD09> {	[	  o,	O		]	};
-    key <AD10> {	[	  p,	P		]	};
-    key <AD11> {	[ bracketleft,	braceleft	]	};
-    key <AD12> {	[ bracketright,	braceright	]	};
-    key <RTRN> {	[ Return			]	};
-
-    key <CAPS> {	[	Caps_Lock		]	};
-    key <AC01> {	[	  a,	A 		]	};
-    key <AC02> {	[	  s,	S		]	};
-    key <AC03> {	[	  d,	D		]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G		]	};
-    key <AC06> {	[	  h,	H		]	};
-    key <AC07> {	[	  j,	J		]	};
-    key <AC08> {	[	  k,	K		]	};
-    key <AC09> {	[	  l,	L		]	};
-    key <AC10> {	[ semicolon,	colon		]	};
-    key <AC11> {	[ quoteright,	quotedbl	]	};
-
-    key <LFSH> {	[ 	 Shift_L		]	};
-    key <AB01> {	[	  z,	Z 		]	};
-    key <AB02> {	[	  x,	X		]	};
-    key <AB03> {	[	  c,	C		]	};
-    key <AB04> {	[	  v,	V		]	};
-    key <AB05> {	[	  b,	B		]	};
-    key <AB06> {	[	  n,	N		]	};
-    key <AB07> {	[	  m,	M		]	};
-    key <AB08> {	[     comma,	less		]	};
-    key <AB09> {	[    period,	greater		]	};
-    key <AB10> {	[     slash,	question	]	};
-    key <BKSL> {	[ backslash,	bar		]	};
-
-    key <LCTL> {	[ 	 Control_L		]	};
-    key <SPCE> {	[ 	 space			]	};
-    // End alphanumeric section
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L };
-    modifier_map Mod3   { Mode_switch };
-};
-
-// definition of a US/ASCII layout for a typical 101-key keyboard. 
-// Includes the basic alphanumeric and punctuation keys and then 
-// defines the "extra" (right) modifier keys, function keys, cursor,
-// edit, and keypad keys.
-xkb_symbols "generic101" {
-    include "srvr_ctrl(xfree86)"
-    include "us(basic)"
-    key <RTSH> {	[ 	Shift_R		]	};
-    key <LALT> {	[ 	Alt_L	 	]	};
-    key <RCTL> {	[ 	Control_R	]	};
-    key <RALT> {	[	Alt_R		]	};
-
-    // Begin "Function" section
-    key <FK01> {	[ 	 F1		]	};
-    key <FK02> {	[	 F2		]	};
-    key <FK03> {	[	 F3		]	};
-    key <FK04> {	[	 F4		]	};
-    key <FK05> {	[	 F5		]	};
-    key <FK06> {	[	 F6		]	};
-    key <FK07> {	[	 F7		]	};
-    key <FK08> {	[	 F8		]	};
-    key <FK09> {	[        F9		]	};
-    key <FK10> {	[        F10		]	};
-    key <FK11> {	[        F11		]	};
-    key <FK12> {	[ 	 F12		]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> {
-	type= "PC_SYSRQ",
-	symbols[Group1]= [ Print, Sys_Req ]
-    };
-    key <SCLK> {  [  Scroll_Lock	]	};
-    key <PAUS> {
-	type= "PC_BREAK",
-	symbols[Group1]= [ Pause, Break ]
-    };
-    key  <INS> {  [  Insert		]	};
-    key <HOME> {	[  Home			]	};
-    key <PGUP> {	[  Prior		]	};
-    key <DELE> { [ Delete		]			};
-    key  <END> {	[  End			]	};
-    key <PGDN> {	[  Next			]	};
-
-    key   <UP> {	[  Up			]	};
-    key <LEFT> {	[  Left			]	};
-    key <DOWN> {	[  Down			]	};
-    key <RGHT> {	[  Right		]	};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> {	[  Num_Lock, Pointer_EnableKeys		]	};
-    key <KPDV> {	[  KP_Divide		]	};
-    key <KPMU> {	[  KP_Multiply		]	};
-    key <KPSU> {	[  KP_Subtract		]	};
-
-    key  <KP7> {	[  KP_Home,	KP_7	]	};
-    key  <KP8> {	[  KP_Up,	KP_8	]	};
-    key  <KP9> {	[  KP_Prior,	KP_9	]	};
-    key <KPAD> {	[  	KP_Add		]	};
-
-    key  <KP4> {	[  KP_Left,	KP_4	]	};
-    key  <KP5> {	[  KP_Begin,	KP_5	]	};
-    key  <KP6> {	[  KP_Right,	KP_6	]	};
-
-    key  <KP1> {	[  KP_End,	KP_1	]	};
-    key  <KP2> {	[  KP_Down,	KP_2	]	};
-    key  <KP3> {	[  KP_Next,	KP_3	]	};
-    key <KPEN> {	[  	KP_Enter	]	};
-    key <KPEQ> {	[  	KP_Equal	]	};
-
-    key  <KP0> {	[  KP_Insert,	KP_0	]	};
-    key <KPDL> {  [  KP_Delete,	KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Control{ Control_R };
-    modifier_map Mod1   { Alt_L, Alt_R };
-    modifier_map Mod2   { Num_Lock };
-    modifier_map Mod5   { Scroll_Lock };
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "intl" {
-
-    name[Group1]= "US International";
-    include "us(pc105euro)"
-
-    // Alphanumeric section
-    key <TLDE> {	[dead_grave,	dead_tilde	],
-			[     grave,	asciitilde	]	};
-    key <AE01> {	[	  1,	exclam 		],
-			[exclamdown,	onesuperior	]	};
-    key <AE02> {	[	  2,	at		],
-			[twosuperior,   dead_doubleacute]	};
-    key <AE03> {	[	  3,	numbersign	],
-			[threesuperior, dead_macron	]	};
-    key <AE04> {	[	  4,	dollar		],
-			[  currency,	sterling	]	};
-    key <AE05> {	[	  5,	percent		],
-			[  EuroSign			]	};
-    key <AE06> {	[	  6,	dead_circumflex	],
-			[onequarter,	asciicircum	]	};
-    key <AE07> {	[	  7,	ampersand	],
-			[   onehalf,	dead_horn	]	};
-    key <AE08> {	[	  8,	asterisk	],
-			[threequarters, dead_ogonek	]	};
-    key <AE09> {	[	  9,	parenleft	],
-			[ leftsinglequotemark, dead_breve]	};
-    key <AE10> {	[	  0,	parenright	],
-			[ rightsinglequotemark, dead_abovering	] };
-    key <AE11> {	[     minus,	underscore	],
-			[       yen,	dead_belowdot	]	};
-    key <AE12> {	[     equal,	plus		],
-			[  multiply,	division	]	};
-
-    key <AD01> {	[	  q,	Q 		],
-			[adiaeresis,	Adiaeresis	]	};
-    key <AD02> {	[	  w,	W		],
-			[     aring,	Aring		]	};
-    key <AD03> {	[	  e,	E		],
-			[    eacute,	Eacute		]	};
-    key <AD04> {	[	  r,	R		],
-			[registered,	registered	]	};
-    key <AD05> {	[	  t,	T		],
-			[     thorn,	THORN		]	};
-    key <AD06> {	[	  y,	Y		],
-			[udiaeresis,	Udiaeresis	]	};
-    key <AD07> {	[	  u,	U		],
-			[    uacute,	Uacute		]	};
-    key <AD08> {	[	  i,	I		],
-			[    iacute,	Iacute		]	};
-    key <AD09> {	[	  o,	O		],
-			[    oacute,	Oacute		]	};
-    key <AD10> {	[	  p,	P		],
-			[odiaeresis,	Odiaeresis	]	};
-    key <AD11> {	[ bracketleft,	braceleft	],
-			[ guillemotleft			]	};
-    key <AD12> {	[ bracketright,	braceright	],
-			[ guillemotright		]	};
-
-    key <AC01> {	[	  a,	A 		],
-			[    aacute,	Aacute		]	};
-    key <AC02> {	[	  s,	S		],
-			[    ssharp,	section		]	};
-    key <AC03> {	[	  d,	D		],
-			[	eth,	ETH		]	};
-
-    key <AC09> {	[	  l,	L		],
-			[    oslash,	Ooblique	]	};
-    key <AC10> {	[ semicolon,	colon		],
-			[ paragraph,	degree		]	};
-    key <AC11> {	[ dead_acute,	dead_diaeresis	],
-			[ apostrophe,	quotedbl	]	};
-
-    key <AB01> {	[	  z,	Z 		],
-			[	 ae,	AE		]	};
-    key <AB03> {	[	  c,	C		],
-			[ copyright,	cent		]	};
-    key <AB06> {	[	  n,	N		],
-			[    ntilde,	Ntilde		]	};
-    key <AB07> {	[	  m,	M		],
-			[	 mu,	mu		]	};
-    key <AB08> {	[     comma,	less		],
-			[  ccedilla,	Ccedilla	]	};
-    key <AB09> {	[    period,	greater		],
-			[ dead_abovedot,dead_caron	]	};
-    key <AB10> {	[     slash,	question	],
-			[ questiondown,	dead_hook	]	};
-    key <BKSL> {	[ backslash,	bar		],
-			[   notsign,	brokenbar	]	};
-
-};
-
-// definition for the PC-AT type 101 key keyboard
-default 
-xkb_symbols "pc101" {
-    include "us(generic101)"
-    key <LALT> {	[ 	Alt_L,	Meta_L 		]	};
-    key <RALT> {	[	Alt_R,	Meta_R		]	};
-
-    // begin modifier mappings
-    modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
-};
-
-// definition for the extra key on 102-key keyboards
-xkb_symbols "pc102" {
-    include "us(pc101)"
-    key <LSGT> {	[      less,    greater		]	};
-};
-
-// definition of Euro-style, Alt_R == [Mode_switch, Multi_key]
-xkb_symbols "pc101euro" {
-    include "us(generic101)"
-    key <LALT> {	[ 	Alt_L,	Meta_L 		]	};
-    key <RALT> {	[ Mode_switch,	Multi_key	]	};
-
-    // begin modifier mappings
-    modifier_map Mod1   { Alt_L, Meta_L };
-};
-
-// definition of Alternate Euro-style, Alt_R == [Multi_key]
-xkb_symbols "pc101compose" {
-    include "us(generic101)"
-    key <LALT> {	[ 	Alt_L,	Meta_L 		]	};
-    key <RALT> {	[ 	Multi_key		]	};
-
-    // begin modifier mappings
-    modifier_map Mod1   { Alt_L, Meta_L };
-};
-
-xkb_symbols "pc102euro" {
-    include "us(pc101euro)"
-    key <LSGT> {	[      less,    greater		]	};
-};
-
-xkb_symbols "pc102compose" {
-    include "us(pc101compose)"
-    key <LSGT> {	[      less,    greater		]	};
-};
-
-// definition for the extra keys on 104-key "Windows95" keyboards
-xkb_symbols "pc104" {
-    include "us(generic101)"
-    key <LALT> {	[ 	Alt_L,	Meta_L		]	};
-    key <RALT> {	[	Alt_R,	Meta_R		]	};
-    key <LWIN> {	[	Super_L			]	};
-    key <RWIN> {	[	Super_R			]	};
-    key <MENU> {	[	Menu			]	};
-
-    // modifier mappings
-    modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
-    modifier_map Mod4   { Super_L, Super_R };
-};
-
-// definition of Euro-style, Right "logo" key == [Mode_switch, Multi_key]
-xkb_symbols "pc104euro" {
-    include "us(pc104)"
-    key <RALT> {        [       Mode_switch             ]       };
-    key <RWIN> {	[	Multi_key		]	};
-};
-
-// put the compose key on the right "logo" key
-xkb_symbols "pc104compose" {
-    include "us(pc104)"
-    key <RWIN> {	[	Multi_key	]	};
-};
-
-// defintion which includes both the Windows95 keyboards _and_
-// the extra key on most European keyboards.
-xkb_symbols "pc105" {
-    include "us(pc104)"
-    key <LSGT> {	[      less,    greater		]	};
-};
-xkb_symbols "pc105euro" {
-    include "us(pc104euro)"
-    key <LSGT> {	[      less,    greater		]	};
-};
-xkb_symbols "pc105compose" {
-    include "us(pc104compose)"
-    key <LSGT> {	[      less,    greater		]	};
-};
-// universal maps are identical to pc105; wish we had aliases for map names.
-xkb_symbols "pc_universal" {
-    include "us(pc104)"
-    key <LSGT> {	[      less,    greater		]	};
-};
-xkb_symbols "pc_universal_euro" {
-    include "us(pc104euro)"
-    key <LSGT> {	[      less,    greater		]	};
-};
-xkb_symbols "pc_universal_compose" {
-    include "us(pc104compose)"
-    key <LSGT> {	[      less,    greater		]	};
-};
--- a/src/xorg/keytables/sun-src/xkbtable.map	Mon Mar 23 17:34:01 2009 +0100
+++ b/src/xorg/keytables/sun-src/xkbtable.map	Tue Mar 24 11:40:01 2009 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -238,4 +238,5 @@
 6	24	-	sun_type6_euro_usb	sk	# Slovakian6_usb
 6	3	-	sun_type6_usb		ca_bi	# Canada_Bi6_usb
 6	272	-	sun_type6_usb		br	# Brazil6_usb
+6	273	-	sun_type6_usb		dvorak	# Dvorak6_usb