--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/ara	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ara	Thu Aug 19 14:45:54 2010 +0200
@@ -111,6 +111,48 @@
 
 
 partial alphanumeric_keys
+	xkb_symbols "qwerty" {
+	include "ara(qwerty)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "azerty" {
+	include "ara(azerty)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "digits" {
+	include "ara(digits)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty_digits" {
+	include "ara(qwerty_digits)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "azerty_digits" {
+	include "ara(azerty_digits)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "buckwalter" {
+	include "ara(buckwalter)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ara(olpc)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/ara(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/be	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/be	Thu Aug 19 14:45:54 2010 +0200
@@ -92,6 +92,66 @@
 
 
 partial alphanumeric_keys
+	xkb_symbols "oss" {
+	include "be(oss)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_frbe" {
+	include "be(oss_frbe)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_latin9" {
+	include "be(oss_latin9)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_Sundeadkeys" {
+	include "be(oss_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_sundeadkeys" {
+	include "be(oss_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "iso-alternate" {
+	include "be(iso-alternate)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "be(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "be(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "be(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "wang" {
+	include "be(wang)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/be(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/br	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/br	Thu Aug 19 14:45:54 2010 +0200
@@ -94,6 +94,47 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "abnt2" {
+	include "br(abnt2)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "br(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "thinkpad" {
+	include "br(thinkpad)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "br(olpc)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+        include "br(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nativo" {
+        include "br(nativo)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-us" {
+	include "br(nativo-us)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-epo" {
+	include "br(nativo-epo)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/br(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/ca	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ca	Thu Aug 19 14:45:54 2010 +0200
@@ -91,6 +91,62 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "fr" {
+	include "ca(fr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr-dvorak" {
+	include "ca(fr-dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr-legacy" {
+	include "ca(fr-legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multi" {
+	include "ca(multi)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multi-2gr" {
+	include "ca(multi-2gr)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "ike" {
+	include "ca(ike)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multix" {
+	include "ca(multix)"
+};
+
+partial alphanumeric_keys  
+	xkb_symbols "shs" {
+	include "ca(shs)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ca(olpc)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "kut" {
+	include "ca(kut)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "eng" {
+	include "ca(eng)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/ca(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/ch	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ch	Thu Aug 19 14:45:54 2010 +0200
@@ -126,6 +126,66 @@
 
 
 partial alphanumeric_keys
+	xkb_symbols "de" {
+	include "ch(de)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "de_Sundeadkeys" {
+	include "ch(de_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "de_sundeadkeys" {
+	include "ch(de_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "de_nodeadkeys" {
+	include "ch(de_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr" {
+	include "ch(fr)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr_Sundeadkeys" {
+	include "ch(fr_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr_sundeadkeys" {
+	include "ch(fr_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr_nodeadkeys" {
+	include "ch(fr_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "de_mac" {
+	include "ch(de_mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr_mac" {
+	include "ch(fr_mac)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/ch(de_type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/cz	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/cz	Thu Aug 19 14:45:54 2010 +0200
@@ -99,6 +99,27 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "bksl" {
+	include "cz(bksl)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "qwerty" {
+	include "cz(qwerty)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty_bksl" {
+	include "cz(qwerty_bksl)"
+};
+
+partial alphanumeric_keys alternate_group
+	xkb_symbols "ucw" {
+	include "cz(ucw)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/cz(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/de	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/de	Thu Aug 19 14:45:54 2010 +0200
@@ -133,6 +133,90 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "de(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "deadgraveacute" {
+	include "de(deadgraveacute)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "deadacute" {
+	include "de(deadacute)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ro" {
+	include "de(ro)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ro_nodeadkeys" {
+	include "de(ro_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "de(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "de(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "de(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "neo" {
+	include "de(neo)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "de(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "de(mac_nodeadkeys)"
+};
+
+
+//partial alphanumeric_keys
+//	xkb_symbols "dsb"
+//	include "de(dsb)"
+//};
+
+
+//partial alphanumeric_keys
+//	xkb_symbols "dsb_qwertz"
+//	include "de(dsb_qwertz)"
+//};
+
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty" {
+	include "de(qwerty)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/de(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/dk	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/dk	Thu Aug 19 14:45:54 2010 +0200
@@ -139,6 +139,30 @@
 
 
 partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "dk(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "dk(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "dk(mac_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "dk(dvorak)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/dk(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/es	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/es	Thu Aug 19 14:45:54 2010 +0200
@@ -134,6 +134,60 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "es(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "es(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "es(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "es(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "cat" {
+	include "es(cat)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ast" {
+	include "es(ast)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "es(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "es(olpc)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "deadtilde" {
+	include "es(deadtilde)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/es(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/fi	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/fi	Thu Aug 19 14:45:54 2010 +0200
@@ -81,6 +81,42 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "kotoistus" {
+	include "fi(kotoistus)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "classic" {
+	include "fi(classic)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fi" {
+	include "fi(fi)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "fi(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "smi" {
+	include "fi(smi)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "fi(mac)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/fi(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/fr	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/fr	Thu Aug 19 14:45:54 2010 +0200
@@ -88,6 +88,120 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "fr(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "fr(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "fr(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss" {
+	include "fr(oss)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_latin9" {
+	include "fr(oss_latin9)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_Sundeadkeys" {
+	include "fr(oss_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_sundeadkeys" {
+	include "fr(oss_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_nodeadkeys" {
+	include "fr(oss_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "latin9" {
+	include "fr(latin9)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_Sundeadkeys" {
+	include "fr(latin9_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_sundeadkeys" {
+	include "fr(latin9_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_nodeadkeys" {
+	include "fr(latin9_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "bepo" {
+	include "fr(bepo)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "bepo_latin9" {
+	include "fr(bepo_latin9)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "fr(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "bre" {
+	include "fr(bre)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oci" {
+	include "fr(oci)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "fr(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "geo" {
+	include "fr(geo)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/fr(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/gb	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/gb	Thu Aug 19 14:45:54 2010 +0200
@@ -90,6 +90,42 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "intl" {
+	include "gb(intlespacio)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "extd" {
+	include "gb(extd)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "colemak" {
+	include "gb(colemak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "gb(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorakukp" {
+	include "gb(dvorakukp)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "gb(mac)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/gb(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/gr	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/gr	Thu Aug 19 14:45:54 2010 +0200
@@ -108,7 +108,33 @@
 	include "level3(ralt_switch)"
 };
 
-partial alphanumeric_keys
+partial alphanumeric_keys alternate_group
+	xkb_symbols "simple" {
+	include "gr(simple)"
+};
+
+hidden partial alphanumeric_keys alternate_group
+	xkb_symbols "bare" {
+	include "gr(bare)"
+};
+
+partial alphanumeric_keys alternate_group
+	xkb_symbols "extended" {
+	include "gr(extended)"
+};
+
+partial alphanumeric_keys alternate_group
+	xkb_symbols "polytonic" {
+	include "gr(polytonic)"
+};
+
+partial alphanumeric_keys alternate_group
+	xkb_symbols "nodeadkeys" {
+	include "gr(nodeadkeys)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/gr(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/it	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/it	Thu Aug 19 14:45:54 2010 +0200
@@ -127,6 +127,30 @@
 };
  
 partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "it(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "it(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "geo" {
+	include "it(geo)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "it(olpc)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/it(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/kr	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/kr	Thu Aug 19 14:45:54 2010 +0200
@@ -84,6 +84,31 @@
 	include "level3(ralt_switch)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "kr106" {
+	include "kr(kr106)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "kr104" {
+	include "kr(kr104)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "koreankeys" {
+	include "kr(koreankeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "koreankeys_raltctl" {
+	include "kr(koreankeys_raltctl)"
+};
+
+
 partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/kr(type6)"

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/lt	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/lt	Thu Aug 19 14:45:54 2010 +0200
@@ -107,7 +107,38 @@
 	include "level3(ralt_switch)"
 };
 
-partial alphanumeric_keys
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "us" {
+	include "lt(us)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "std" {
+	include "lt(std)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "ibm" {
+	include "lt(ibm)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "lekp" {
+	include "lt(lekp)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "lekpa" {
+	include "lt(lekpa)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "balticplus" {
+	include "lt(balticplus)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/lt(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/lv	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/lv	Thu Aug 19 14:45:54 2010 +0200
@@ -108,7 +108,23 @@
 	include "level3(ralt_switch)"
 };
 
-partial alphanumeric_keys
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "apostrophe" {
+	include "lv(apostrophe)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "tilde" {
+	include "lv(tilde)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "fkey" {
+	include "lv(fkey)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/lv(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/nl	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/nl	Thu Aug 19 14:45:54 2010 +0200
@@ -138,6 +138,30 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "std" {
+	include "nl(std)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "nl(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "nl(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "nl(mac)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/nl(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/no	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/no	Thu Aug 19 14:45:54 2010 +0200
@@ -132,6 +132,43 @@
 	include "kpdl(comma)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "no(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "no(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "smi" {
+	include "no(smi)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "smi_nodeadkeys" {
+	include "no(smi_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "no(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "no(mac_nodeadkeys)"
+};
+
+
 partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/no(type6)"

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/pl	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/pl	Thu Aug 19 14:45:54 2010 +0200
@@ -92,6 +92,37 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "qwertz" {
+	include "pl(qwertz)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "dvorak" {
+	include "pl(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak_quotes" {
+	include "pl(dvorak_quotes)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak_altquotes" {
+	include "pl(dvorak_altquotes)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "csb" {
+	include "pl(csb)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ru_phonetic_dvorak" {
+	include "pl(ru_phonetic_dvorak)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/pl(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/pt	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/pt	Thu Aug 19 14:45:54 2010 +0200
@@ -131,6 +131,61 @@
 
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "pt(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "pt(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "pt(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "pt(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac_sundeadkeys" {
+	include "pt(mac_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "pt(mac_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nativo" {
+	include "pt(nativo)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-us" {
+	include "pt(nativo-us)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-epo" {
+	include "pt(nativo-epo)"
+};
+
+
 partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/pt(type6)"

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/ro	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ro	Thu Aug 19 14:45:54 2010 +0200
@@ -108,6 +108,47 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "cedilla" {
+	include "ro(cedilla)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "std" {
+	include "ro(std)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "std_cedilla" {
+	include "ro(std_cedilla)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ro(winkeys)"
+};
+
+partial
+	xkb_symbols "crh_f" {
+	include "ro(crh_f)"
+};
+
+partial
+	xkb_symbols "crh_alt" {
+	include "ro(crh_alt)"
+};
+
+partial
+	xkb_symbols "crh_dobruca1" {
+	include "ro(crh_dobruca1)"
+};
+
+partial
+	xkb_symbols "crh_dobruca2" {
+	include "ro(crh_dobruca2)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/ro(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/ru	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ru	Thu Aug 19 14:45:54 2010 +0200
@@ -54,7 +54,7 @@
 
      key.type[group1]="FOUR_LEVEL";
 
-    key	<AE01> { [		1,	    exclam 	] };
+    key	<AE01> { [		1,	    exclam, 1,          exclam 	] };
     key	<AE02> { [		2,        quotedbl, 2, at	] };
     key	<AE03> { [		3,      numerosign, 3,  numbersign	] };
     key	<AE04> { [		4,       percent, 4,      dollar 	] };
@@ -63,7 +63,7 @@
     key	<AE08> { [		8,	 semicolon, 8, asterisk 	] };
     key	<BKSL> { [           slash,        question, backslash,             bar	] };
     key	<AB10> { [      ediaeresis,      Ediaeresis,	    slash,	  question 	] };
-    key <LSGT> { [       backslash,             bar      ] };
+    key <LSGT> { [       backslash,             bar, backslash,             bar ] };
 
     key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q	] };
     key	<AD02> { [    Cyrillic_tse,    Cyrillic_TSE, w, W	] };
@@ -101,6 +101,109 @@
     include "level3(ralt_switch)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ru(winkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "common" {
+	include "ru(common)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "legacy" {
+	include "ru(legacy)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ru(olpc)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "typewriter" {
+	include "ru(typewriter)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic" {
+	include "ru(phonetic)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic_winkeys" {
+	include "ru(phonetic_winkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "tt" {
+	include "ru(tt)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "os_legacy" {
+	include "ru(os_legacy)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "os_winkeys" {
+	include "ru(os_winkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "cv" {
+	include "ru(cv)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "udm" {
+	include "ru(udm)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "cv_latin" {
+	include "ru(cv_latin)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "kom" {
+	include "ru(kom)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sah" {
+	include "ru(sah)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "xal" {
+	include "ru(xal)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dos" {
+	include "ru(dos)"
+};
+
+
 partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/ru(type6)"

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/se	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/se	Thu Aug 19 14:45:54 2010 +0200
@@ -270,6 +270,55 @@
     // End modifier mappings
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "se" {
+	include "se(se)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "se(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "se(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "rus" {
+	include "se(rus)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "rus_nodeadkeys" {
+	include "se(rus_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "smi" {
+	include "se(smi)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "se(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "svdvorak" {
+	include "se(svdvorak)"
+};
+
+
 partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/se(type6)"

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/sk	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/sk	Thu Aug 19 14:45:54 2010 +0200
@@ -101,6 +101,22 @@
 };
 
 partial alphanumeric_keys
+	xkb_symbols "bksl" {
+	include "sk(bksl)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "qwerty" {
+	include "sk(qwerty)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty_bksl" {
+	include "sk(qwerty_bksl)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/sk(type6)"
 };

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/tr	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/tr	Thu Aug 19 14:45:54 2010 +0200
@@ -83,6 +83,77 @@
 	include "level3(ralt_switch)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "f" {
+	include "tr(f)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "alt" {
+	include "tr(alt)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "tr(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "tr(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ku" {
+	include "tr(ku)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ku_f" {
+	include "tr(ku_f)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ku_alt" {
+	include "tr(ku_alt)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "intl" {
+	include "tr(intl)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "tr(olpc)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "crh" {
+	include "tr(crh)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "crh_f" {
+	include "tr(crh_f)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "crh_alt" {
+	include "tr(crh_alt)"
+};
+
 partial default alphanumeric_keys
         xkb_symbols "basic" {
         include "sun_vndr/tr(type6)"

--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/ua	Mon Aug 16 13:28:05 2010 +0200
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ua	Thu Aug 19 14:45:54 2010 +0200
@@ -107,7 +107,58 @@
 	include "level3(ralt_switch)"
 };
 
+partial alphanumeric_keys 
+	xkb_symbols "legacy" {
+	include "ua(legacy)"
+};
+
 partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ua(winkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "typewriter" {
+	include "ua(typewriter)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic" {
+	include "ua(phonetic)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "rstu" {
+	include "ua(rstu)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "rstu_ru" {
+	include "ua(rstu_ru)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "homophonic" {
+	include "ua(homophonic)"
+};
+
+partial
+	xkb_symbols "crh" {
+	include "ua(crh)"
+};
+
+partial
+	xkb_symbols "crh_f" {
+	include "ua(crh_f)"
+};
+
+partial
+	xkb_symbols "crh_alt" {
+	include "ua(crh_alt)"
+};
+
+
+partial default alphanumeric_keys
 	xkb_symbols "basic" {
 	include "sun_vndr/ua(type6)"
 };