--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/hu.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/hu.po
@@ -461,11 +461,15 @@
 
 #: ../rules/base.xml.in.h:111
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "A CapsLock Shiftként működik zárolással. A Shift szünetelteti a nagybetűsítést."
+msgstr ""
+"A CapsLock Shiftként működik zárolással. A Shift szünetelteti a "
+"nagybetűsítést."
 
 #: ../rules/base.xml.in.h:112
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "A CapsLock Shiftként működik zárolással. A Shift nem befolyásolja a nagybetűsítést."
+msgstr ""
+"A CapsLock Shiftként működik zárolással. A Shift nem befolyásolja a "
+"nagybetűsítést."
 
 #: ../rules/base.xml.in.h:113
 msgid "CapsLock just locks the Shift modifier."
@@ -489,11 +493,15 @@
 
 #: ../rules/base.xml.in.h:118
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "A CapsLock belső nagybetűkre váltást használ. A Shift szünetelteti a nagybetűsítést."
+msgstr ""
+"A CapsLock belső nagybetűkre váltást használ. A Shift szünetelteti a "
+"nagybetűsítést."
 
 #: ../rules/base.xml.in.h:119
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "A CapsLock belső nagybetűkre váltást használ. A Shift nem befolyásolja a nagybetűsítést."
+msgstr ""
+"A CapsLock belső nagybetűkre váltást használ. A Shift nem befolyásolja a "
+"nagybetűsítést."
 
 #: ../rules/base.xml.in.h:120
 msgid "Catalan variant with middle-dot L"
@@ -593,7 +601,9 @@
 
 #: ../rules/base.xml.in.h:144
 msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "A Control billentyű a Win billentyűkhöz van rendelve (és a szokásos Ctrl billentyűkhöz)."
+msgstr ""
+"A Control billentyű a Win billentyűkhöz van rendelve (és a szokásos Ctrl "
+"billentyűkhöz)."
 
 #: ../rules/base.xml.in.h:145
 msgid "Croatia"
@@ -1182,8 +1192,12 @@
 msgstr "Számbillentyűzet Unicode kiegészítésekkel (nyilak és műveleti jelek)"
 
 #: ../rules/base.xml.in.h:293
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Számbillentyűzet Unicode kiegészítésekkel (nyilak és műveleti jelek). A műveleti jelek bekapcsolva az alapértelmezett szinten."
+msgid ""
+"Keypad with unicode additions (arrows and math operators). Math operators on "
+"default level."
+msgstr ""
+"Számbillentyűzet Unicode kiegészítésekkel (nyilak és műveleti jelek). A "
+"műveleti jelek bekapcsolva az alapértelmezett szinten."
 
 #: ../rules/base.xml.in.h:294
 msgid "Keytronic FlexPro"
@@ -1747,8 +1761,11 @@
 msgstr "A Menü billentyűvel lehet a harmadik szintet választani."
 
 #: ../rules/base.xml.in.h:435
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "A jobb Alt billentyűvel lehet a harmadik szintet választani, a Shift+jobb Alt kombináció a Multi_Key."
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"A jobb Alt billentyűvel lehet a harmadik szintet választani, a Shift+jobb "
+"Alt kombináció a Multi_Key."
 
 #: ../rules/base.xml.in.h:436
 msgid "Press Right Alt key to choose 3rd level."
@@ -1959,8 +1976,12 @@
 msgstr "déli üzbég"
 
 #: ../rules/base.xml.in.h:488
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "A szóköz billentyű nem törhető szóközt ad a negyedik szinten, keskeny nem törhető szóközt a hatodik szinten"
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level"
+msgstr ""
+"A szóköz billentyű nem törhető szóközt ad a negyedik szinten, keskeny nem "
+"törhető szóközt a hatodik szinten"
 
 #: ../rules/base.xml.in.h:489
 msgid "Space key outputs non-breakable space character at fourth level."
@@ -1971,12 +1992,20 @@
 msgstr "A szóköz billenytű nem törhető szóközt ad a második szinten."
 
 #: ../rules/base.xml.in.h:491
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "A szóköz billenytű nem törhető szóközt ad a harmadik szinten és semmit nem ad a negyediken."
+msgid ""
+"Space key outputs non-breakable space character at third level, nothing at "
+"fourth level."
+msgstr ""
+"A szóköz billenytű nem törhető szóközt ad a harmadik szinten és semmit nem "
+"ad a negyediken."
 
 #: ../rules/base.xml.in.h:492
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "A szóköz billentyű nem törhető szóközt ad a harmadik szinten, keskeny nem törhető szóközt a negyedik szinten"
+msgid ""
+"Space key outputs non-breakable space character at third level, thin non-"
+"breakable space character at fourth level"
+msgstr ""
+"A szóköz billentyű nem törhető szóközt ad a harmadik szinten, keskeny nem "
+"törhető szóközt a negyedik szinten"
 
 #: ../rules/base.xml.in.h:493
 msgid "Space key outputs non-breakable space character at third level."
@@ -1992,7 +2021,8 @@
 
 #: ../rules/base.xml.in.h:496 ../rules/sun.xml.in.h:103
 msgid "Special keys (Ctrl+Alt+<key>) handled in a server."
-msgstr "A speciális billentyűket (Ctrl+Alt+<billentyű>) a kiszolgáló kezeli."
+msgstr ""
+"A speciális billentyűket (Ctrl+Alt+<billentyű>) a kiszolgáló kezeli."
 
 #: ../rules/base.xml.in.h:497
 msgid "SrL"
@@ -2050,7 +2080,9 @@
 
 #: ../rules/base.xml.in.h:512
 msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Két billentyű kódjának felcserélése, ha a kernel rosszul észleli a Mac billentyűzetet."
+msgstr ""
+"Két billentyű kódjának felcserélése, ha a kernel rosszul észleli a Mac "
+"billentyűzetet."
 
 #: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
 msgid "Swe"
@@ -2294,11 +2326,17 @@
 
 #: ../rules/base.xml.in.h:573
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 numerikus billentyűzet unicode bővítésekkel (nyilak és műveleti jelek)"
+msgstr ""
+"Wang 724 numerikus billentyűzet unicode bővítésekkel (nyilak és műveleti "
+"jelek)"
 
 #: ../rules/base.xml.in.h:574
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Wang 724 numerikus billentyűzet unicode bővítésekkel (nyilak és műveleti jelek). A műveleti jelek az alapértelmezett szinten."
+msgid ""
+"Wang 724 keypad with unicode additions (arrows and math operators). Math "
+"operators on default level."
+msgstr ""
+"Wang 724 numerikus billentyűzet unicode bővítésekkel (nyilak és műveleti "
+"jelek). A műveleti jelek az alapértelmezett szinten."
 
 #: ../rules/base.xml.in.h:575
 msgid "Wang model 724 azerty"
@@ -2390,7 +2428,8 @@
 
 #: ../rules/sun.xml.in.h:18
 msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
-msgstr "Működés Shiftként zárolással. A Shift nem befolyásolja a nagybetűsítést."
+msgstr ""
+"Működés Shiftként zárolással. A Shift nem befolyásolja a nagybetűsítést."
 
 #: ../rules/sun.xml.in.h:19
 msgid "Alt+Control changes group"
@@ -2549,8 +2588,11 @@
 msgstr "A jobb Win választja ki a harmadik szintet"
 
 #: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "A jobb Alt választja ki a harmadik szintet, a Shift+jobb Alt kombináció a Multi_Key"
+msgid ""
+"Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr ""
+"A jobb Alt választja ki a harmadik szintet, a Shift+jobb Alt kombináció a "
+"Multi_Key"
 
 #: ../rules/sun.xml.in.h:86
 msgid "Press Right Control to choose 3rd level"
@@ -2670,11 +2712,13 @@
 
 #: ../rules/sun.xml.in.h:129
 msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "Belső nagybetűkre váltást használ. A Shift szünetelteti a nagybetűsítést."
+msgstr ""
+"Belső nagybetűkre váltást használ. A Shift szünetelteti a nagybetűsítést."
 
 #: ../rules/sun.xml.in.h:130
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "Belső nagybetűkre váltást használ. A Shift nem befolyásolja a nagybetűsítést."
+msgstr ""
+"Belső nagybetűkre váltást használ. A Shift nem befolyásolja a nagybetűsítést."
 
 #: ../rules/sun.xml.in.h:131
 msgid "bksl"
@@ -2683,3 +2727,194 @@
 #: ../rules/sun.xml.in.h:133
 msgid "type4"
 msgstr "type4"
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer TravelMate 800"
+msgstr "Acer TravelMate 800"
+
+#: ../rules/base.xml.in.h:35
+msgid "Adding the nobreakspace keysym to space key"
+msgstr "Nem törhető szóköz szimbólum hozzáadása a szóköz billentyűhöz"
+
+#: ../rules/base.xml.in.h:42
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Az Alt és Meta az Alt billentyűkre (alapértelmezett)."
+
+#: ../rules/base.xml.in.h:44
+msgid "Alt+CapsLock changes group."
+msgstr "Az Alt+CapsLock megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:45
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Ctrl vált csoportot."
+
+#: ../rules/base.xml.in.h:46
+msgid "Alt+Shift changes group."
+msgstr "Az Alt+Shift kombináció megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:87
+msgid "Both Alt keys together change group."
+msgstr "A két Alt egyszerre történő lenyomásával lehet csoportot váltani."
+
+#: ../rules/base.xml.in.h:88
+msgid "Both Ctrl keys together change group."
+msgstr "A két Ctrl egyszerre történő lenyomásával lehet csoportot váltani."
+
+#: ../rules/base.xml.in.h:89
+msgid "Both Shift keys together change group."
+msgstr "A két Shift egyszerre történő lenyomásával lehet csoportot váltani."
+
+#: ../rules/base.xml.in.h:90
+msgid "Both Win-keys switch group while pressed."
+msgstr ""
+"A két Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+
+#: ../rules/base.xml.in.h:101
+msgid "CapsLock LED shows alternative group."
+msgstr "A CapsLock LED-je mutassa a másik csoportot."
+
+#: ../rules/base.xml.in.h:106
+msgid "CapsLock key changes group."
+msgstr "A CapsLock billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:132
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl+Shift vált csoportot."
+
+#: ../rules/base.xml.in.h:140
+msgid "Default numpad keys."
+msgstr "Alapértelmezett numerikus billentyűk."
+
+#: ../rules/base.xml.in.h:271
+msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+msgstr "Dell Inspiron 6xxx/8xxx noteszgép"
+
+#: ../rules/base.xml.in.h:281
+msgid "Left Alt key changes group."
+msgstr "A bal Alt billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:282
+msgid "Left Alt key switches group while pressed."
+msgstr ""
+"A bal Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+
+#: ../rules/base.xml.in.h:283
+msgid "Left Ctrl key changes group."
+msgstr "A bal Ctrl billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:284
+msgid "Left Shift key changes group."
+msgstr "A bal Shift billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:285
+msgid "Left Win-key changes group."
+msgstr "A bal Win billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:287
+msgid "Left Win-key switches group while pressed."
+msgstr ""
+"A bal Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+
+#: ../rules/base.xml.in.h:294
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
+
+#: ../rules/base.xml.in.h:295
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:296
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (másik lehetőség)"
+
+#: ../rules/base.xml.in.h:298
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
+
+#: ../rules/base.xml.in.h:327
+msgid "Menu key changes group."
+msgstr "A Menü billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:359
+msgid "NumLock LED shows alternative group."
+msgstr "A NumLock LED-je mutassa a másik csoportot."
+
+#: ../rules/base.xml.in.h:360
+msgid "Numpad keys work as with Mac."
+msgstr "A numerikus billentyűk úgy működjenek, mint Macen."
+
+#: ../rules/base.xml.in.h:363
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Oretec MCK-800 MM/Internet billentyűzet"
+
+#: ../rules/base.xml.in.h:377
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:393
+msgid "R-Alt switches group while pressed."
+msgstr ""
+"A jobb Alt billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+
+#: ../rules/base.xml.in.h:395
+msgid "Right Alt key changes group."
+msgstr "A jobb Alt billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:397
+msgid "Right Ctrl key changes group."
+msgstr "A jobb Ctrl billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:398
+msgid "Right Ctrl key switches group while pressed."
+msgstr ""
+"A jobb Ctrl billentyű lenyomva tartása mellett lehet a csoportok közt "
+"váltani."
+
+#: ../rules/base.xml.in.h:400
+msgid "Right Shift key changes group."
+msgstr "A jobb Shift billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:401
+msgid "Right Win-key changes group."
+msgstr "A jobb Win billentyű megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:403
+msgid "Right Win-key switches group while pressed."
+msgstr ""
+"A jobb Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+
+#: ../rules/base.xml.in.h:424
+msgid "ScrollLock LED shows alternative group."
+msgstr "A ScrollLock LED-je mutassa a másik csoportot."
+
+#: ../rules/base.xml.in.h:426
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "A Shift+numerikus billentyűk úgy működjenek, mint az MS Windowsban."
+
+#: ../rules/base.xml.in.h:427
+msgid "Shift+CapsLock changes group."
+msgstr "A Shift+CapsLock kombináció megváltoztatja a csoportot."
+
+#: ../rules/base.xml.in.h:432
+msgid "Space key output nobreakspace at fourth level."
+msgstr "A szóköz nem törhető szóközt ad a negyedik szinten."
+
+#: ../rules/base.xml.in.h:433
+msgid "Space key output nobreakspace at second level."
+msgstr "A szóköz nem törhető szóközt ad a második szinten."
+
+#: ../rules/base.xml.in.h:434
+msgid "Space key output nobreakspace at third level."
+msgstr "A szóköz nem törhető szóközt ad a harmadik szinten."
+
+#: ../rules/base.xml.in.h:435
+msgid "Space key output space at any level."
+msgstr "A szóköz nem törhető szóközt ad bármely szinten."
+
+#: ../rules/base.xml.in.h:447
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "A Super billentyű a Win billentyűkhöz van rendelve (alapértelmezett)."
+
+#: ../rules/base.xml.in.h:497
+msgid "Use keyboard LED to show alternative group."
+msgstr "A másik csoport mutatása a billentyűzet LED-jei használatával."
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/cs.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/cs.po
@@ -1463,3 +1463,1185 @@
 #: xfree86.xml.in.h:362
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/tečka"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:2
+#, fuzzy
+msgid "101/qwerty/comma/Dead keys"
+msgstr "l2/101/qwerty/čárka"
+
+#: ../rules/base.xml.in.h:3
+#, fuzzy
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:4
+#, fuzzy
+msgid "101/qwerty/dot/Dead keys"
+msgstr "l2/101/qwerty/tečka"
+
+#: ../rules/base.xml.in.h:5
+#, fuzzy
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:6
+#, fuzzy
+msgid "101/qwertz/comma/Dead keys"
+msgstr "l2/101/qwertz/čárka"
+
+#: ../rules/base.xml.in.h:7
+#, fuzzy
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:8
+#, fuzzy
+msgid "101/qwertz/dot/Dead keys"
+msgstr "l2/101/qwertz/tečka"
+
+#: ../rules/base.xml.in.h:9
+#, fuzzy
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:10
+#, fuzzy
+msgid "102/qwerty/comma/Dead keys"
+msgstr "l2/102/qwerty/čárka"
+
+#: ../rules/base.xml.in.h:11
+#, fuzzy
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:12
+#, fuzzy
+msgid "102/qwerty/dot/Dead keys"
+msgstr "l2/102/qwerty/tečka"
+
+#: ../rules/base.xml.in.h:13
+#, fuzzy
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:14
+#, fuzzy
+msgid "102/qwertz/comma/Dead keys"
+msgstr "l2/102/qwertz/čárka"
+
+#: ../rules/base.xml.in.h:15
+#, fuzzy
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:16
+#, fuzzy
+msgid "102/qwertz/dot/Dead keys"
+msgstr "l2/102/qwertz/tečka"
+
+#: ../rules/base.xml.in.h:17
+#, fuzzy
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr ""
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr ""
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30
+#, fuzzy
+msgid "Albania"
+msgstr "Albánské"
+
+#: ../rules/base.xml.in.h:31
+#, fuzzy
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt a Meta na klávesách Alt (výchozí)."
+
+#: ../rules/base.xml.in.h:32
+#, fuzzy
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Meta je mapována na levou klávesu Win."
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Control mění skupinu"
+
+#: ../rules/base.xml.in.h:34
+#, fuzzy
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift mění skupinu"
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:37
+#, fuzzy
+msgid "Alternative"
+msgstr "Alternativní"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative international (former us_intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:39
+#, fuzzy
+msgid "Alternative, Sun dead keys"
+msgstr "Mrtvé klávesy Sun"
+
+#: ../rules/base.xml.in.h:40
+#, fuzzy
+msgid "Alternative, eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:41
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:42
+#, fuzzy
+msgid "Ara"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:45
+#, fuzzy
+msgid "Armenia"
+msgstr "Arménské"
+
+#: ../rules/base.xml.in.h:47
+#, fuzzy
+msgid "Azerbaijan"
+msgstr "Azerbajdžánské"
+
+#: ../rules/base.xml.in.h:48
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:55
+#, fuzzy
+msgid "Ban"
+msgstr "Knn"
+
+#: ../rules/base.xml.in.h:56
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:58
+#, fuzzy
+msgid "Belarus"
+msgstr "Běloruské"
+
+#: ../rules/base.xml.in.h:59
+#, fuzzy
+msgid "Belgium"
+msgstr "Belgické"
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:63
+#, fuzzy
+msgid "Bhu"
+msgstr "Bos"
+
+#: ../rules/base.xml.in.h:64
+#, fuzzy
+msgid "Bhutan"
+msgstr "Knn"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../rules/base.xml.in.h:68
+#, fuzzy
+msgid "Both Alt keys together change group."
+msgstr "Obě klávesy Alt dohromady mění skupinu"
+
+#: ../rules/base.xml.in.h:69
+#, fuzzy
+msgid "Both Ctrl keys together change group."
+msgstr "Obě klávesy Ctrl dohromady mění skupinu"
+
+#: ../rules/base.xml.in.h:70
+#, fuzzy
+msgid "Both Shift keys together change group."
+msgstr "Obě klávesy Shift dohromady mění skupinu"
+
+#: ../rules/base.xml.in.h:71
+#, fuzzy
+msgid "Both Win-keys switch group while pressed."
+msgstr "Obě klávesy Win přepnou při stisku skupinu"
+
+#: ../rules/base.xml.in.h:73
+#, fuzzy
+msgid "Brazil"
+msgstr "Brazilské"
+
+#: ../rules/base.xml.in.h:76
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Bulharské"
+
+#: ../rules/base.xml.in.h:78
+#, fuzzy
+msgid "Canada"
+msgstr "Kanadské"
+
+#: ../rules/base.xml.in.h:79
+#, fuzzy
+msgid "CapsLock LED shows alternative group."
+msgstr "LED Caps_Lock zobrazuje alternativní skupinu"
+
+#: ../rules/base.xml.in.h:80
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Pracuje jako Shift s uzamčením. Shift ruší Caps."
+
+#: ../rules/base.xml.in.h:81
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Pracuje jako Shift s uzamčením. Shift neruší Caps."
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+
+#: ../rules/base.xml.in.h:84
+#, fuzzy
+msgid "CapsLock key changes group."
+msgstr "Klávesa CapsLock mění skupinu"
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+
+#: ../rules/base.xml.in.h:87
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "Používá interní převod na kapitálky. Shift ruší Caps."
+
+#: ../rules/base.xml.in.h:88
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "Používá interní převod na kapitálky. Shift neruší Caps."
+
+#: ../rules/base.xml.in.h:89
+#, fuzzy
+msgid "Che"
+msgstr "Čes"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:101
+#, fuzzy
+msgid "Compose key position"
+msgstr "Umístění klávesy Control"
+
+#: ../rules/base.xml.in.h:102
+#, fuzzy
+msgid "Croatia"
+msgstr "Chorvatské"
+
+#: ../rules/base.xml.in.h:103
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Klávesa Control vlevo dole"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Klávesa Control nalevo od 'A'"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Umístění klávesy Control"
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Control+Shift mění skupinu"
+
+#: ../rules/base.xml.in.h:109
+#, fuzzy
+msgid "Czechia"
+msgstr "České"
+
+#: ../rules/base.xml.in.h:110
+msgid "DTK2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:115
+#, fuzzy
+msgid "Denmark"
+msgstr "Dán"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+#, fuzzy
+msgid "Estonia"
+msgstr "Estonské"
+
+#: ../rules/base.xml.in.h:130
+#, fuzzy
+msgid "Extended Backslash"
+msgstr "Rozšířené"
+
+#: ../rules/base.xml.in.h:131
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:133
+#, fuzzy
+msgid "Faroe Islands"
+msgstr "Farské"
+
+#: ../rules/base.xml.in.h:135
+#, fuzzy
+msgid "Finland"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:137
+#, fuzzy
+msgid "France"
+msgstr "Francouzské"
+
+#: ../rules/base.xml.in.h:139
+#, fuzzy
+msgid "French (legacy)"
+msgstr "Francouzské (alternativní)"
+
+#: ../rules/base.xml.in.h:140
+#, fuzzy
+msgid "French Dvorak"
+msgstr "Francouzské"
+
+#: ../rules/base.xml.in.h:141
+#, fuzzy
+msgid "French, Sun dead keys"
+msgstr "Mrtvé klávesy Sun"
+
+#: ../rules/base.xml.in.h:142
+#, fuzzy
+msgid "French, eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:149
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: ../rules/base.xml.in.h:151
+#, fuzzy
+msgid "Georgia"
+msgstr "Německé"
+
+#: ../rules/base.xml.in.h:152
+#, fuzzy
+msgid "German, Sun dead keys"
+msgstr "Mrtvé klávesy Sun"
+
+#: ../rules/base.xml.in.h:153
+#, fuzzy
+msgid "German, eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:154
+#, fuzzy
+msgid "Germany"
+msgstr "Německé"
+
+#: ../rules/base.xml.in.h:155
+#, fuzzy
+msgid "Gre"
+msgstr "Řecké"
+
+#: ../rules/base.xml.in.h:156
+#, fuzzy
+msgid "Greece"
+msgstr "Řecké"
+
+#: ../rules/base.xml.in.h:160
+#, fuzzy
+msgid "Gyration"
+msgstr "Chorvatské"
+
+#: ../rules/base.xml.in.h:174
+#, fuzzy
+msgid "Hungary"
+msgstr "Maďarské"
+
+#: ../rules/base.xml.in.h:181
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandské"
+
+#: ../rules/base.xml.in.h:182
+#, fuzzy
+msgid "Ind"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:183
+#, fuzzy
+msgid "India"
+msgstr "Ukrajinské"
+
+#: ../rules/base.xml.in.h:184
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:186
+#, fuzzy
+msgid "Iran"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:187
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandské"
+
+#: ../rules/base.xml.in.h:192
+#, fuzzy
+msgid "Israel"
+msgstr "Izraelské"
+
+#: ../rules/base.xml.in.h:194
+#, fuzzy
+msgid "Italy"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:195
+#, fuzzy
+msgid "Japan"
+msgstr "Japonské"
+
+#: ../rules/base.xml.in.h:199
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:201
+#, fuzzy
+msgid "Kyr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:204
+#, fuzzy
+msgid "Lao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:205
+#, fuzzy
+msgid "Laos"
+msgstr "Laptop"
+
+#: ../rules/base.xml.in.h:210
+#, fuzzy
+msgid "Latin American"
+msgstr "Latinská Amerika"
+
+#: ../rules/base.xml.in.h:211
+#, fuzzy
+msgid "Latin Unicode"
+msgstr "Latinská Amerika"
+
+#: ../rules/base.xml.in.h:212
+#, fuzzy
+msgid "Latin Unicode qwerty"
+msgstr "Latinská Amerika"
+
+#: ../rules/base.xml.in.h:213
+#, fuzzy
+msgid "Latin qwerty"
+msgstr "Maďarské (qwerty)"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:215
+#, fuzzy
+msgid "Latvia"
+msgstr "Lotyšské"
+
+#: ../rules/base.xml.in.h:216
+#, fuzzy
+msgid "Left Alt key changes group."
+msgstr "Levá klávesa Alt mění skupinu"
+
+#: ../rules/base.xml.in.h:217
+#, fuzzy
+msgid "Left Alt key switches group while pressed."
+msgstr "Levá klávesa Win přepne při stisku skupinu"
+
+#: ../rules/base.xml.in.h:218
+#, fuzzy
+msgid "Left Ctrl key changes group."
+msgstr "Levá klávesa Ctrl mění skupinu"
+
+#: ../rules/base.xml.in.h:219
+#, fuzzy
+msgid "Left Shift key changes group."
+msgstr "Levá klávesa Shift mění skupinu"
+
+#: ../rules/base.xml.in.h:220
+#, fuzzy
+msgid "Left Win-key changes group."
+msgstr "Levá klávesa Win mění skupinu"
+
+#: ../rules/base.xml.in.h:221
+#, fuzzy
+msgid "Left Win-key switches group while pressed."
+msgstr "Levá klávesa Win přepne při stisku skupinu"
+
+#: ../rules/base.xml.in.h:222
+msgid "Lithuania"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: ../rules/base.xml.in.h:235
+#, fuzzy
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "Makedonské"
+
+#: ../rules/base.xml.in.h:244
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Vyrobit z CapsLock další Control"
+
+#: ../rules/base.xml.in.h:247
+#, fuzzy
+msgid "Maldives"
+msgstr "Maltézské"
+
+#: ../rules/base.xml.in.h:248
+#, fuzzy
+msgid "Malta"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:249
+#, fuzzy
+msgid "Mao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:250
+#, fuzzy
+msgid "Maori"
+msgstr "Farsi"
+
+#: ../rules/base.xml.in.h:254
+#, fuzzy
+msgid "Menu is Compose."
+msgstr "Menu je Compose"
+
+#: ../rules/base.xml.in.h:255
+#, fuzzy
+msgid "Menu key changes group."
+msgstr "Klávesa Menu mění skupinu"
+
+#: ../rules/base.xml.in.h:263
+#, fuzzy
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:265
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:271
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mongolské"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr ""
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274
+#, fuzzy
+msgid "Myanmar"
+msgstr "Dánské"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr ""
+
+#: ../rules/base.xml.in.h:278
+#, fuzzy
+msgid "Northern Saami"
+msgstr "Severní Saami (Norsko)"
+
+#: ../rules/base.xml.in.h:279
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:281
+#, fuzzy
+msgid "Norway"
+msgstr "Norské"
+
+#: ../rules/base.xml.in.h:282
+#, fuzzy
+msgid "NumLock LED shows alternative group."
+msgstr "LED Num_Lock zobrazuje alternativní skupinu"
+
+#: ../rules/base.xml.in.h:284
+#, fuzzy
+msgid "Ogham IS434"
+msgstr "IS434"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+#, fuzzy
+msgid "Pakistan"
+msgstr "Tádžikistánské"
+
+#: ../rules/base.xml.in.h:290
+#, fuzzy
+msgid "Pattachote"
+msgstr "Thajské (Pattachote)"
+
+#: ../rules/base.xml.in.h:293
+#, fuzzy
+msgid "Poland"
+msgstr "Pan"
+
+#: ../rules/base.xml.in.h:295
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugalské"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:298
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Stiskněte levou klávesu Win pro výběr 3. úrovně"
+
+#: ../rules/base.xml.in.h:299
+#, fuzzy
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Stiskněte levou klávesu Win pro výběr 3. úrovně"
+
+#: ../rules/base.xml.in.h:300
+#, fuzzy
+msgid "Press Menu key to choose 3rd level."
+msgstr "Stiskněte levou klávesu Menu pro výběr 3. úrovně"
+
+#: ../rules/base.xml.in.h:301
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Stiskněte pravou klávesu Win pro výběr 3. úrovně"
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Stiskněte pravou klávesu Control pro výběr 3. úrovně"
+
+#: ../rules/base.xml.in.h:303
+#, fuzzy
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Stiskněte pravou klávesu Win pro výběr 3. úrovně"
+
+#: ../rules/base.xml.in.h:304
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Stiskněte kteroukoli klávesu Win pro výběr 3. úrovně"
+
+#: ../rules/base.xml.in.h:305
+#, fuzzy
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Stiskněte kteroukoli klávesu Win pro výběr 3. úrovně"
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Pro"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:307
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+#, fuzzy
+msgid "Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:312
+#, fuzzy
+msgid "R-Alt switches group while pressed."
+msgstr "Pravý Alt přepne při stisku skupinu"
+
+#: ../rules/base.xml.in.h:313
+#, fuzzy
+msgid "Right Alt is Compose."
+msgstr "Pravý Alt je Compose"
+
+#: ../rules/base.xml.in.h:314
+#, fuzzy
+msgid "Right Alt key changes group."
+msgstr "Klávesa Pravý Alt mění skupinu"
+
+#: ../rules/base.xml.in.h:315
+#, fuzzy
+msgid "Right Ctrl is Compose."
+msgstr "Pravý Alt je Compose"
+
+#: ../rules/base.xml.in.h:316
+#, fuzzy
+msgid "Right Ctrl key changes group."
+msgstr "Klávesa Pravý Control mění skupinu"
+
+#: ../rules/base.xml.in.h:317
+#, fuzzy
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Klávesa Pravý Win přepne při stisku skupinu"
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Klávesa Pravý Control pracuje jako Pravý Alt"
+
+#: ../rules/base.xml.in.h:319
+#, fuzzy
+msgid "Right Shift key changes group."
+msgstr "Klávesa Pravý Shift mění skupinu"
+
+#: ../rules/base.xml.in.h:320
+#, fuzzy
+msgid "Right Win-key changes group."
+msgstr "Klávesa Pravý Win mění skupinu"
+
+#: ../rules/base.xml.in.h:321
+#, fuzzy
+msgid "Right Win-key is Compose."
+msgstr "Klávesa Pravý Win je Compose"
+
+#: ../rules/base.xml.in.h:322
+#, fuzzy
+msgid "Right Win-key switches group while pressed."
+msgstr "Klávesa Pravý Win přepne při stisku skupinu"
+
+#: ../rules/base.xml.in.h:323
+#, fuzzy
+msgid "Romania"
+msgstr "Rumunské"
+
+#: ../rules/base.xml.in.h:324
+#, fuzzy
+msgid "Romanian keyboard with German letters"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:325
+#, fuzzy
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:328
+#, fuzzy
+msgid "Russia"
+msgstr "Ruské"
+
+#: ../rules/base.xml.in.h:330
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Ruské"
+
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Eliminovat mrtvé klávesy"
+
+#: ../rules/base.xml.in.h:332
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:340
+#, fuzzy
+msgid "ScrollLock LED shows alternative group."
+msgstr "LED Scroll_Lock zobrazuje alternativní skupinu"
+
+#: ../rules/base.xml.in.h:341
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342
+#, fuzzy
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift s numerickými klávesami pracuje jako v MS Windows"
+
+#: ../rules/base.xml.in.h:343
+#, fuzzy
+msgid "Shift+CapsLock changes group."
+msgstr "Klávesa CapsLock mění skupinu"
+
+#: ../rules/base.xml.in.h:344
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovenské"
+
+#: ../rules/base.xml.in.h:345
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovinské"
+
+#: ../rules/base.xml.in.h:346
+#, fuzzy
+msgid "Spain"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "SrL"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "Srbské"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "Standardní"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:354
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:356
+#, fuzzy
+msgid "Super Power Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:360
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Zaměnit Control a CapsLock"
+
+#: ../rules/base.xml.in.h:362
+#, fuzzy
+msgid "Sweden"
+msgstr "Švé"
+
+#: ../rules/base.xml.in.h:363
+#, fuzzy
+msgid "Switzerland"
+msgstr "Švýcarské německé"
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Syria"
+msgstr "Syrské"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Ruské"
+
+#: ../rules/base.xml.in.h:369
+#, fuzzy
+msgid "TIS-820.2538"
+msgstr "Thajské (TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:370
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tádžikistánské"
+
+#: ../rules/base.xml.in.h:372
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "\"Psací stroj\""
+
+#: ../rules/base.xml.in.h:373
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+#, fuzzy
+msgid "Tamil Unicode"
+msgstr "Latinská Amerika"
+
+#: ../rules/base.xml.in.h:377
+#, fuzzy
+msgid "Thailand"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:379
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386
+#, fuzzy
+msgid "Typewriter"
+msgstr "\"Psací stroj\""
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:390
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:391
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:392
+#, fuzzy
+msgid "US keyboard with Lithuanian letters"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:393
+#, fuzzy
+msgid "US keyboard with Maltian letters"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:394
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "Americká klávesnice s rumunskými písmeny"
+
+#: ../rules/base.xml.in.h:398
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukrajinské"
+
+#: ../rules/base.xml.in.h:401
+msgid "Urdu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:402
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+#, fuzzy
+msgid "Use keyboard LED to show alternative group."
+msgstr "Použít LED klávesnice pro zobrazení alternativní skupiny"
+
+#: ../rules/base.xml.in.h:408
+#, fuzzy
+msgid "Uzbekistan"
+msgstr "Uzbecké"
+
+#: ../rules/base.xml.in.h:409
+#, fuzzy
+msgid "Vietnam"
+msgstr "Vietnamské"
+
+#: ../rules/base.xml.in.h:413
+msgid "With <\\|> key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:414
+msgid "With guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:416
+msgid "Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:422
+msgid "qwerty, extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:424
+#, fuzzy
+msgid "qwertz"
+msgstr "qwerty"
+
+#, fuzzy
+#~ msgid "\"Standard\""
+#~ msgstr "Standardní"
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "Americká klávesnice s rumunskými písmeny"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "Srbské"
+
+#, fuzzy
+#~ msgid "Srp"
+#~ msgstr "Syr"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Bengálské"
+
+#, fuzzy
+#~ msgid "Ogham IS434 laptop"
+#~ msgstr "IS434 laptop"
+
+#, fuzzy
+#~ msgid "Ogham laptop"
+#~ msgstr "laptop"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "Ruské"
+
+#, fuzzy
+#~ msgid "Malayalam with Malayalam digits"
+#~ msgstr "Malajské"
+
+#, fuzzy
+#~ msgid "Dzo"
+#~ msgstr "Dvo"
+
+#, fuzzy
+#~ msgid "Gurmukhi INSCRIPT"
+#~ msgstr "Gurmukhi"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "Kannadské"
+
+#, fuzzy
+#~ msgid "Smi"
+#~ msgstr "Sapmi"
+
+#, fuzzy
+#~ msgid "Deva"
+#~ msgstr "Dvorak"
+
+#, fuzzy
+#~ msgid "Ogam"
+#~ msgstr "Oghamské"
+
+#, fuzzy
+#~ msgid "Sin"
+#~ msgstr "Svn"
+
+#, fuzzy
+#~ msgid "Tam"
+#~ msgstr "Tamilské"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TAB encoding"
+#~ msgstr "Tamilská klávesová mapa ve stylu psacího stroje, kódování TAB"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "Tamilská klávesová mapa ve stylu psacího stroje, kódování TSCII"
+
+#, fuzzy
+#~ msgid "Urd"
+#~ msgstr "Ukr"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; Unicode encoding"
+#~ msgstr "Tamilská klávesová mapa ve stylu psacího stroje, kódování Unicode"
+
+#, fuzzy
+#~ msgid "Kedmanee"
+#~ msgstr "Thajské (Kedmanee)"
+
+#, fuzzy
+#~ msgid "Old standard"
+#~ msgstr "Standardní"
+
+#, fuzzy
+#~ msgid "Swiss"
+#~ msgstr "Švédské"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/af.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/af.po
@@ -1137,7 +1137,8 @@
 
 #: xfree86.xml.in.h:281
 msgid "Special keys (Ctrl+Alt+<key>) handled in a server."
-msgstr "Spesiale sleutels (Ctrl+Alt+<sleutel>) word hanteer in 'n bediener."
+msgstr ""
+"Spesiale sleutels (Ctrl+Alt+<sleutel>) word hanteer in 'n bediener."
 
 #: xfree86.xml.in.h:282
 msgid "Standard"
@@ -1462,3 +1463,1185 @@
 #: xfree86.xml.in.h:362
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/dot"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:2
+#, fuzzy
+msgid "101/qwerty/comma/Dead keys"
+msgstr "l2/101/qwerty/komma"
+
+#: ../rules/base.xml.in.h:3
+#, fuzzy
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:4
+#, fuzzy
+msgid "101/qwerty/dot/Dead keys"
+msgstr "l2/101/qwerty/dot"
+
+#: ../rules/base.xml.in.h:5
+#, fuzzy
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:6
+#, fuzzy
+msgid "101/qwertz/comma/Dead keys"
+msgstr "l2/101/qwertz/komma"
+
+#: ../rules/base.xml.in.h:7
+#, fuzzy
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:8
+#, fuzzy
+msgid "101/qwertz/dot/Dead keys"
+msgstr "l2/101/qwertz/dot"
+
+#: ../rules/base.xml.in.h:9
+#, fuzzy
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:10
+#, fuzzy
+msgid "102/qwerty/comma/Dead keys"
+msgstr "l2/102/qwerty/komma"
+
+#: ../rules/base.xml.in.h:11
+#, fuzzy
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:12
+#, fuzzy
+msgid "102/qwerty/dot/Dead keys"
+msgstr "l2/102/qwerty/dot"
+
+#: ../rules/base.xml.in.h:13
+#, fuzzy
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:14
+#, fuzzy
+msgid "102/qwertz/comma/Dead keys"
+msgstr "l2/102/qwertz/komma"
+
+#: ../rules/base.xml.in.h:15
+#, fuzzy
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:16
+#, fuzzy
+msgid "102/qwertz/dot/Dead keys"
+msgstr "l2/102/qwertz/dot"
+
+#: ../rules/base.xml.in.h:17
+#, fuzzy
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr ""
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr ""
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30
+#, fuzzy
+msgid "Albania"
+msgstr "Albanies"
+
+#: ../rules/base.xml.in.h:31
+#, fuzzy
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt en Meta op die Alt sleutels (verstek)."
+
+#: ../rules/base.xml.in.h:32
+#, fuzzy
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Meta is verbind aan die linkerkantste Win-sleutel."
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Kontrole verander groep"
+
+#: ../rules/base.xml.in.h:34
+#, fuzzy
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift verander groep"
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:37
+#, fuzzy
+msgid "Alternative"
+msgstr "Alterneer"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative international (former us_intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:39
+#, fuzzy
+msgid "Alternative, Sun dead keys"
+msgstr "Sun (dooie sleutels)"
+
+#: ../rules/base.xml.in.h:40
+#, fuzzy
+msgid "Alternative, eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:41
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:42
+#, fuzzy
+msgid "Ara"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:45
+#, fuzzy
+msgid "Armenia"
+msgstr "Armeens"
+
+#: ../rules/base.xml.in.h:47
+#, fuzzy
+msgid "Azerbaijan"
+msgstr "Azerbaijaans"
+
+#: ../rules/base.xml.in.h:48
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:55
+#, fuzzy
+msgid "Ban"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:56
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:58
+#, fuzzy
+msgid "Belarus"
+msgstr "Belarussies"
+
+#: ../rules/base.xml.in.h:59
+#, fuzzy
+msgid "Belgium"
+msgstr "Belgies"
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:63
+#, fuzzy
+msgid "Bhu"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:64
+#, fuzzy
+msgid "Bhutan"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../rules/base.xml.in.h:68
+#, fuzzy
+msgid "Both Alt keys together change group."
+msgstr "Beide Alt-sleutels tesame verander groep"
+
+#: ../rules/base.xml.in.h:69
+#, fuzzy
+msgid "Both Ctrl keys together change group."
+msgstr "Beide Ctrl-sleutels tesame verander groep"
+
+#: ../rules/base.xml.in.h:70
+#, fuzzy
+msgid "Both Shift keys together change group."
+msgstr "Beide Shift-sleutels tesame verander groep"
+
+#: ../rules/base.xml.in.h:71
+#, fuzzy
+msgid "Both Win-keys switch group while pressed."
+msgstr "Beide Win-sleutels wissel groep terwyl gedruk"
+
+#: ../rules/base.xml.in.h:73
+#, fuzzy
+msgid "Brazil"
+msgstr "Braziliaans"
+
+#: ../rules/base.xml.in.h:76
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Bulgaars"
+
+#: ../rules/base.xml.in.h:78
+#, fuzzy
+msgid "Canada"
+msgstr "Kanadees"
+
+#: ../rules/base.xml.in.h:79
+#, fuzzy
+msgid "CapsLock LED shows alternative group."
+msgstr "Caps_Lock LED vertoon alternatiewe groep"
+
+#: ../rules/base.xml.in.h:80
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Tree op as Shift met sluit-aksie. Shift kanseleer Caps."
+
+#: ../rules/base.xml.in.h:81
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Tree op as Shift met sluiting.  Shift kanseleer nie Caps nie."
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+
+#: ../rules/base.xml.in.h:84
+#, fuzzy
+msgid "CapsLock key changes group."
+msgstr "CapsLock-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+
+#: ../rules/base.xml.in.h:87
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "Gebruik interne bokas. Shift kanseleer Caps."
+
+#: ../rules/base.xml.in.h:88
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "Gebruik interne bokas.  Shift kanseleer nie Caps nie."
+
+#: ../rules/base.xml.in.h:89
+#, fuzzy
+msgid "Che"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:101
+#, fuzzy
+msgid "Compose key position"
+msgstr "Kontrolesleutel posisie"
+
+#: ../rules/base.xml.in.h:102
+#, fuzzy
+msgid "Croatia"
+msgstr "Kroaties"
+
+#: ../rules/base.xml.in.h:103
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Kontrolesleutel links onder"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Kontrolesleutel links van 'A'"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Kontrolesleutel posisie"
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl+Shift verander groep"
+
+#: ../rules/base.xml.in.h:109
+#, fuzzy
+msgid "Czechia"
+msgstr "Tsjeggies"
+
+#: ../rules/base.xml.in.h:110
+msgid "DTK2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:115
+#, fuzzy
+msgid "Denmark"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+#, fuzzy
+msgid "Estonia"
+msgstr "Estoniaans"
+
+#: ../rules/base.xml.in.h:130
+#, fuzzy
+msgid "Extended Backslash"
+msgstr "Uitgebreide"
+
+#: ../rules/base.xml.in.h:131
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:133
+#, fuzzy
+msgid "Faroe Islands"
+msgstr "Faroees"
+
+#: ../rules/base.xml.in.h:135
+#, fuzzy
+msgid "Finland"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:137
+#, fuzzy
+msgid "France"
+msgstr "Frans"
+
+#: ../rules/base.xml.in.h:139
+#, fuzzy
+msgid "French (legacy)"
+msgstr "Frans (alternatief)"
+
+#: ../rules/base.xml.in.h:140
+#, fuzzy
+msgid "French Dvorak"
+msgstr "Frans"
+
+#: ../rules/base.xml.in.h:141
+#, fuzzy
+msgid "French, Sun dead keys"
+msgstr "Sun (dooie sleutels)"
+
+#: ../rules/base.xml.in.h:142
+#, fuzzy
+msgid "French, eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:149
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: ../rules/base.xml.in.h:151
+#, fuzzy
+msgid "Georgia"
+msgstr "Duits"
+
+#: ../rules/base.xml.in.h:152
+#, fuzzy
+msgid "German, Sun dead keys"
+msgstr "Sun (dooie sleutels)"
+
+#: ../rules/base.xml.in.h:153
+#, fuzzy
+msgid "German, eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:154
+#, fuzzy
+msgid "Germany"
+msgstr "Duits"
+
+#: ../rules/base.xml.in.h:155
+#, fuzzy
+msgid "Gre"
+msgstr "Grieks"
+
+#: ../rules/base.xml.in.h:156
+#, fuzzy
+msgid "Greece"
+msgstr "Grieks"
+
+#: ../rules/base.xml.in.h:160
+#, fuzzy
+msgid "Gyration"
+msgstr "Kroaties"
+
+#: ../rules/base.xml.in.h:174
+#, fuzzy
+msgid "Hungary"
+msgstr "Hongaars"
+
+#: ../rules/base.xml.in.h:181
+#, fuzzy
+msgid "Iceland"
+msgstr "Yslandies"
+
+#: ../rules/base.xml.in.h:182
+#, fuzzy
+msgid "Ind"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:183
+#, fuzzy
+msgid "India"
+msgstr "Ukra�nies"
+
+#: ../rules/base.xml.in.h:184
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:186
+#, fuzzy
+msgid "Iran"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:187
+#, fuzzy
+msgid "Ireland"
+msgstr "Yslandies"
+
+#: ../rules/base.xml.in.h:192
+#, fuzzy
+msgid "Israel"
+msgstr "Israelies"
+
+#: ../rules/base.xml.in.h:194
+#, fuzzy
+msgid "Italy"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:195
+#, fuzzy
+msgid "Japan"
+msgstr "Japanees"
+
+#: ../rules/base.xml.in.h:199
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:201
+#, fuzzy
+msgid "Kyr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:204
+#, fuzzy
+msgid "Lao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:205
+#, fuzzy
+msgid "Laos"
+msgstr "Skootrekenaar"
+
+#: ../rules/base.xml.in.h:210
+#, fuzzy
+msgid "Latin American"
+msgstr "Latyns Amerika"
+
+#: ../rules/base.xml.in.h:211
+#, fuzzy
+msgid "Latin Unicode"
+msgstr "Latyns Amerika"
+
+#: ../rules/base.xml.in.h:212
+#, fuzzy
+msgid "Latin Unicode qwerty"
+msgstr "Latyns Amerika"
+
+#: ../rules/base.xml.in.h:213
+#, fuzzy
+msgid "Latin qwerty"
+msgstr "Hongaars (qwerty)"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:215
+#, fuzzy
+msgid "Latvia"
+msgstr "Latvies"
+
+#: ../rules/base.xml.in.h:216
+#, fuzzy
+msgid "Left Alt key changes group."
+msgstr "Linkerkant Alt-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:217
+#, fuzzy
+msgid "Left Alt key switches group while pressed."
+msgstr "Linkerkant Win-sleutel wissel groep terwyl gedruk"
+
+#: ../rules/base.xml.in.h:218
+#, fuzzy
+msgid "Left Ctrl key changes group."
+msgstr "Linkerkant Ctrl-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:219
+#, fuzzy
+msgid "Left Shift key changes group."
+msgstr "Linkerkant Shift-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:220
+#, fuzzy
+msgid "Left Win-key changes group."
+msgstr "Linkerkant Win-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:221
+#, fuzzy
+msgid "Left Win-key switches group while pressed."
+msgstr "Linkerkant Win-sleutel wissel groep terwyl gedruk"
+
+#: ../rules/base.xml.in.h:222
+msgid "Lithuania"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: ../rules/base.xml.in.h:235
+#, fuzzy
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "Masedonies"
+
+#: ../rules/base.xml.in.h:244
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Maak CapsLock 'n adisionele Kontrole"
+
+#: ../rules/base.xml.in.h:247
+#, fuzzy
+msgid "Maldives"
+msgstr "Maltees"
+
+#: ../rules/base.xml.in.h:248
+#, fuzzy
+msgid "Malta"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:249
+#, fuzzy
+msgid "Mao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:250
+#, fuzzy
+msgid "Maori"
+msgstr "Farsi"
+
+#: ../rules/base.xml.in.h:254
+#, fuzzy
+msgid "Menu is Compose."
+msgstr "Kieslys-sleutel is Komponeer"
+
+#: ../rules/base.xml.in.h:255
+#, fuzzy
+msgid "Menu key changes group."
+msgstr "Kieslyssleutel verander groep"
+
+#: ../rules/base.xml.in.h:263
+#, fuzzy
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:265
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Internetsleutelbord"
+
+#: ../rules/base.xml.in.h:271
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mongolees"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr ""
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274
+#, fuzzy
+msgid "Myanmar"
+msgstr "Deens"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr ""
+
+#: ../rules/base.xml.in.h:278
+#, fuzzy
+msgid "Northern Saami"
+msgstr "Noordelike Saami (Noorwe�)"
+
+#: ../rules/base.xml.in.h:279
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:281
+#, fuzzy
+msgid "Norway"
+msgstr "Noorweegs"
+
+#: ../rules/base.xml.in.h:282
+#, fuzzy
+msgid "NumLock LED shows alternative group."
+msgstr "Num_Lock LED vertoon alternatiewe groep"
+
+#: ../rules/base.xml.in.h:284
+#, fuzzy
+msgid "Ogham IS434"
+msgstr "IS434"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+#, fuzzy
+msgid "Pakistan"
+msgstr "Tajikees"
+
+#: ../rules/base.xml.in.h:290
+#, fuzzy
+msgid "Pattachote"
+msgstr "Thai (Pattachote)"
+
+#: ../rules/base.xml.in.h:293
+#, fuzzy
+msgid "Poland"
+msgstr "Pan"
+
+#: ../rules/base.xml.in.h:295
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugees"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:298
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Druk Linkerkantste Win-sleutel om die 3de vlak te kies"
+
+#: ../rules/base.xml.in.h:299
+#, fuzzy
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Druk Linkerkantste Win-sleutel om die 3de vlak te kies"
+
+#: ../rules/base.xml.in.h:300
+#, fuzzy
+msgid "Press Menu key to choose 3rd level."
+msgstr "Druk Kieslys-sleutel om die 3de vlak te kies"
+
+#: ../rules/base.xml.in.h:301
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Druk Regterkantste Win-sleutel om die 3de vlak te kies"
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Druk Regterkantste Ctrl-sleutel om die 3de vlak te kies"
+
+#: ../rules/base.xml.in.h:303
+#, fuzzy
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Druk Regterkantste Win-sleutel om die 3de vlak te kies"
+
+#: ../rules/base.xml.in.h:304
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Druk enige van die Win-sleutels om die 3de vlak te kies"
+
+#: ../rules/base.xml.in.h:305
+#, fuzzy
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Druk enige van die Win-sleutels om die 3de vlak te kies"
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Pro"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:307
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+#, fuzzy
+msgid "Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:312
+#, fuzzy
+msgid "R-Alt switches group while pressed."
+msgstr "R-Alt wissel die groep terwyl gedruk"
+
+#: ../rules/base.xml.in.h:313
+#, fuzzy
+msgid "Right Alt is Compose."
+msgstr "Regterkant Alt is Komponeer"
+
+#: ../rules/base.xml.in.h:314
+#, fuzzy
+msgid "Right Alt key changes group."
+msgstr "Regterkant Alt-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:315
+#, fuzzy
+msgid "Right Ctrl is Compose."
+msgstr "Regterkant Alt is Komponeer"
+
+#: ../rules/base.xml.in.h:316
+#, fuzzy
+msgid "Right Ctrl key changes group."
+msgstr "Regterkant Ctrl-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:317
+#, fuzzy
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Regterkant Win-sleutel skakel groep terwyl gedruk"
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Regterkant Ctrl-sleutel werk soos Regterkant Alt"
+
+#: ../rules/base.xml.in.h:319
+#, fuzzy
+msgid "Right Shift key changes group."
+msgstr "Regterkant Shift-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:320
+#, fuzzy
+msgid "Right Win-key changes group."
+msgstr "Regterkant Win-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:321
+#, fuzzy
+msgid "Right Win-key is Compose."
+msgstr "Regterkant Win-sleutel is Komponeer"
+
+#: ../rules/base.xml.in.h:322
+#, fuzzy
+msgid "Right Win-key switches group while pressed."
+msgstr "Regterkant Win-sleutel skakel groep terwyl gedruk"
+
+#: ../rules/base.xml.in.h:323
+#, fuzzy
+msgid "Romania"
+msgstr "Romeens"
+
+#: ../rules/base.xml.in.h:324
+#, fuzzy
+msgid "Romanian keyboard with German letters"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:325
+#, fuzzy
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:328
+#, fuzzy
+msgid "Russia"
+msgstr "Russies"
+
+#: ../rules/base.xml.in.h:330
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Russies"
+
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Elimineer dooie sleutels"
+
+#: ../rules/base.xml.in.h:332
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:340
+#, fuzzy
+msgid "ScrollLock LED shows alternative group."
+msgstr "Scroll_Lock LED wys alternatiewe groep"
+
+#: ../rules/base.xml.in.h:341
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342
+#, fuzzy
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift met numeriese sleutels werk soos in MS Windows"
+
+#: ../rules/base.xml.in.h:343
+#, fuzzy
+msgid "Shift+CapsLock changes group."
+msgstr "CapsLock-sleutel verander groep"
+
+#: ../rules/base.xml.in.h:344
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovaaks"
+
+#: ../rules/base.xml.in.h:345
+#, fuzzy
+msgid "Slovenia"
+msgstr "Sloveens"
+
+#: ../rules/base.xml.in.h:346
+#, fuzzy
+msgid "Spain"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "SrL"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "Serbies"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "Standaard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:354
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:356
+#, fuzzy
+msgid "Super Power Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:360
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Ruil Ctrl en CapsLock om"
+
+#: ../rules/base.xml.in.h:362
+#, fuzzy
+msgid "Sweden"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:363
+#, fuzzy
+msgid "Switzerland"
+msgstr "Switserse Duits"
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Syria"
+msgstr "Siries"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Russies"
+
+#: ../rules/base.xml.in.h:369
+#, fuzzy
+msgid "TIS-820.2538"
+msgstr "Thai (TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:370
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tajikees"
+
+#: ../rules/base.xml.in.h:372
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "\"Tikmasjien\""
+
+#: ../rules/base.xml.in.h:373
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+#, fuzzy
+msgid "Tamil Unicode"
+msgstr "Latyns Amerika"
+
+#: ../rules/base.xml.in.h:377
+#, fuzzy
+msgid "Thailand"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:379
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386
+#, fuzzy
+msgid "Typewriter"
+msgstr "\"Tikmasjien\""
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:390
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:391
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:392
+#, fuzzy
+msgid "US keyboard with Lithuanian letters"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:393
+#, fuzzy
+msgid "US keyboard with Maltian letters"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:394
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "VSA sleutelbord met Romeense letters"
+
+#: ../rules/base.xml.in.h:398
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukra�nies"
+
+#: ../rules/base.xml.in.h:401
+msgid "Urdu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:402
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+#, fuzzy
+msgid "Use keyboard LED to show alternative group."
+msgstr "Gebruik sleutelbord LED om alternatiewe groep te wys"
+
+#: ../rules/base.xml.in.h:408
+#, fuzzy
+msgid "Uzbekistan"
+msgstr "Uzbek"
+
+#: ../rules/base.xml.in.h:409
+#, fuzzy
+msgid "Vietnam"
+msgstr "Vi�tnamees"
+
+#: ../rules/base.xml.in.h:413
+msgid "With <\\|> key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:414
+msgid "With guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:416
+msgid "Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:422
+msgid "qwerty, extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:424
+#, fuzzy
+msgid "qwertz"
+msgstr "qwerty"
+
+#, fuzzy
+#~ msgid "\"Standard\""
+#~ msgstr "Standaard"
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "VSA sleutelbord met Romeense letters"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "Serbies"
+
+#, fuzzy
+#~ msgid "Srp"
+#~ msgstr "Syr"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Bengaals"
+
+#, fuzzy
+#~ msgid "Ogham IS434 laptop"
+#~ msgstr "IS434 laptop"
+
+#, fuzzy
+#~ msgid "Ogham laptop"
+#~ msgstr "skootrekenaar"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "Russies"
+
+#, fuzzy
+#~ msgid "Malayalam with Malayalam digits"
+#~ msgstr "Malayalam"
+
+#, fuzzy
+#~ msgid "Dzo"
+#~ msgstr "Dvo"
+
+#, fuzzy
+#~ msgid "Gurmukhi INSCRIPT"
+#~ msgstr "Gurmukhi"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "Kannada"
+
+#, fuzzy
+#~ msgid "Smi"
+#~ msgstr "Sapmi"
+
+#, fuzzy
+#~ msgid "Deva"
+#~ msgstr "Dvorak"
+
+#, fuzzy
+#~ msgid "Ogam"
+#~ msgstr "Ogham"
+
+#, fuzzy
+#~ msgid "Sin"
+#~ msgstr "Svn"
+
+#, fuzzy
+#~ msgid "Tam"
+#~ msgstr "Tamilees"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TAB encoding"
+#~ msgstr "'n Tamil tikmasjienstyl sleutelbinding; TAB-enkodering"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "'n Tamil tikmasjienstyl sleutelbinding; TSCII-enkodering"
+
+#, fuzzy
+#~ msgid "Urd"
+#~ msgstr "Ukr"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; Unicode encoding"
+#~ msgstr "'n Tamil tikmasjienstyl sleutelbinding; Unicode-enkodering"
+
+#, fuzzy
+#~ msgid "Kedmanee"
+#~ msgstr "Thai (Kedmanee)"
+
+#, fuzzy
+#~ msgid "Old standard"
+#~ msgstr "Standaard"
+
+#, fuzzy
+#~ msgid "Swiss"
+#~ msgstr "Sweeds"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/fi.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/fi.po
@@ -1181,8 +1181,12 @@
 msgstr "Sormio unicode-lisäosilla (nuolet ja matematiikkatoiminnot)"
 
 #: ../rules/base.xml.in.h:293
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Sormio unicode-lisäosilla (nuolet ja matematiikkatoiminnot). Matematiikkatoiminnot oletustasolla."
+msgid ""
+"Keypad with unicode additions (arrows and math operators). Math operators on "
+"default level."
+msgstr ""
+"Sormio unicode-lisäosilla (nuolet ja matematiikkatoiminnot). "
+"Matematiikkatoiminnot oletustasolla."
 
 #: ../rules/base.xml.in.h:294
 msgid "Keytronic FlexPro"
@@ -1543,7 +1547,8 @@
 
 #: ../rules/base.xml.in.h:384
 msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural-näppäimistö Pro USB / Microsoft-Internet-näppäimistö Pro"
+msgstr ""
+"Microsoft Natural-näppäimistö Pro USB / Microsoft-Internet-näppäimistö Pro"
 
 #: ../rules/base.xml.in.h:385
 msgid "Microsoft Office Keyboard"
@@ -1746,8 +1751,11 @@
 msgstr "Paina valikkonäppäintä valitaksesi kolmannen tason."
 
 #: ../rules/base.xml.in.h:435
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason, Shift-Oikea Alt on Multi_Key."
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason, Shift-Oikea Alt on "
+"Multi_Key."
 
 #: ../rules/base.xml.in.h:436
 msgid "Press Right Alt key to choose 3rd level."
@@ -1859,7 +1867,8 @@
 
 #: ../rules/base.xml.in.h:463
 msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Romanialainen näppäimistö saksalaisilla kirjaimilla, ei kuolleita näppäimiä"
+msgstr ""
+"Romanialainen näppäimistö saksalaisilla kirjaimilla, ei kuolleita näppäimiä"
 
 #: ../rules/base.xml.in.h:464
 msgid "Rou"
@@ -1958,8 +1967,12 @@
 msgstr "Eteläinen uzbeekki"
 
 #: ../rules/base.xml.in.h:488
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Välilyönnistä tulee sitova välilyöntimerkki 4. tasolla ja kapea sitova välilyöntimerkki 6. tasolla"
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level"
+msgstr ""
+"Välilyönnistä tulee sitova välilyöntimerkki 4. tasolla ja kapea sitova "
+"välilyöntimerkki 6. tasolla"
 
 #: ../rules/base.xml.in.h:489
 msgid "Space key outputs non-breakable space character at fourth level."
@@ -1970,12 +1983,20 @@
 msgstr "Välilyönnistä tulee sitova välilyöntimerkki 2. tasolla."
 
 #: ../rules/base.xml.in.h:491
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla eikä mitään 4. tasolla."
+msgid ""
+"Space key outputs non-breakable space character at third level, nothing at "
+"fourth level."
+msgstr ""
+"Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla eikä mitään 4. "
+"tasolla."
 
 #: ../rules/base.xml.in.h:492
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla ja kapea sitova välilyöntimerkki 4. tasolla."
+msgid ""
+"Space key outputs non-breakable space character at third level, thin non-"
+"breakable space character at fourth level"
+msgstr ""
+"Välilyönnistä tulee sitova välilyöntimerkki 3. tasolla ja kapea sitova "
+"välilyöntimerkki 4. tasolla."
 
 #: ../rules/base.xml.in.h:493
 msgid "Space key outputs non-breakable space character at third level."
@@ -2049,7 +2070,9 @@
 
 #: ../rules/base.xml.in.h:512
 msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Vaihda kahden näppäimen näppäinkoodin, jos ydin tunnistaa väärin Mac-näppäimistön."
+msgstr ""
+"Vaihda kahden näppäimen näppäinkoodin, jos ydin tunnistaa väärin Mac-"
+"näppäimistön."
 
 #: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
 msgid "Swe"
@@ -2293,11 +2316,16 @@
 
 #: ../rules/base.xml.in.h:573
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 -sormio Unicode-lisäyksin (nuolet sekä matematiikkaoperaatiot)"
+msgstr ""
+"Wang 724 -sormio Unicode-lisäyksin (nuolet sekä matematiikkaoperaatiot)"
 
 #: ../rules/base.xml.in.h:574
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Wang 724 -sormio Unicode-lisäyksin (nuolet sekä matematiikkaoperaatiot). Matematiikkaoperaatiot oletustasolla."
+msgid ""
+"Wang 724 keypad with unicode additions (arrows and math operators). Math "
+"operators on default level."
+msgstr ""
+"Wang 724 -sormio Unicode-lisäyksin (nuolet sekä matematiikkaoperaatiot). "
+"Matematiikkaoperaatiot oletustasolla."
 
 #: ../rules/base.xml.in.h:575
 msgid "Wang model 724 azerty"
@@ -2548,8 +2576,11 @@
 msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason"
 
 #: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason, Shift-Oikea Alt on Multi_Key"
+msgid ""
+"Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr ""
+"Paina oikeaa Alt-näppäintä valitaksesi kolmannen tason, Shift-Oikea Alt on "
+"Multi_Key"
 
 #: ../rules/sun.xml.in.h:86
 msgid "Press Right Control to choose 3rd level"
@@ -2714,7 +2745,8 @@
 #~ msgstr "Logitech Cordless Desktop iTouch"
 
 #~ msgid "Use keypad with unicode additions (arrows and math operators)"
-#~ msgstr "Käytä sormiota unicodelisäyksin (nuolet sekä matematiikkaoperaattorit)"
+#~ msgstr ""
+#~ "Käytä sormiota unicodelisäyksin (nuolet sekä matematiikkaoperaattorit)"
 
 #~ msgid "Adding the nobreakspace keysym to space key"
 #~ msgstr "Sitovan välilyönnin lisäys välilyöntinäppäimeen"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/rw.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/rw.po
@@ -1825,3 +1825,275 @@
 #: rules/base.xml.in.h:413
 msgid "si1452"
 msgstr ""
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Amahinduka Itsinda"
+
+#: ../rules/base.xml.in.h:55
+msgid "Ban"
+msgstr ""
+
+#: ../rules/base.xml.in.h:56
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Bengali"
+
+#: ../rules/base.xml.in.h:63
+msgid "Bhu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:64
+msgid "Bhutan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:101
+msgid "Compose key position"
+msgstr ""
+
+#: ../rules/base.xml.in.h:103
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Urufunguzo ku Hasi: Ibumoso:"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Urufunguzo ku Ibumoso: Bya"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Urufunguzo ku Hasi: Ibumoso:"
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Amahinduka Itsinda"
+
+#: ../rules/base.xml.in.h:182
+#, fuzzy
+msgid "Ind"
+msgstr "Irilande"
+
+#: ../rules/base.xml.in.h:183
+msgid "India"
+msgstr ""
+
+#: ../rules/base.xml.in.h:199
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:235
+msgid "Logitech Ultra-X Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "Nyamasedoniya"
+
+#: ../rules/base.xml.in.h:244
+msgid "Make CapsLock an additional Ctrl."
+msgstr ""
+
+#: ../rules/base.xml.in.h:247
+msgid "Maldives"
+msgstr ""
+
+#: ../rules/base.xml.in.h:279
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Utubuto"
+
+#: ../rules/base.xml.in.h:284
+#, fuzzy
+msgid "Ogham IS434"
+msgstr "Ogham"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+#, fuzzy
+msgid "Pakistan"
+msgstr "Tajikisitani"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "2."
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Kuri Guhitamo urwego"
+
+#: ../rules/base.xml.in.h:306
+msgid "Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:307
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Urufunguzo Nka"
+
+#: ../rules/base.xml.in.h:330
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Ikirusiya"
+
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Utubuto"
+
+#: ../rules/base.xml.in.h:332
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:341
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:348
+msgid "SrL"
+msgstr ""
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "Ikinyaseribiya"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "gisanzwe/kimenyerewe"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:354
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:360
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Na"
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Syria"
+msgstr "Syriac"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Ikirusiya"
+
+#: ../rules/base.xml.in.h:372
+msgid "Tamil TAB Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:373
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+msgid "Tamil Unicode"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386
+msgid "Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Mwandikisho Na:"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "Mwandikisho Na:"
+
+#: ../rules/base.xml.in.h:390
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "Mwandikisho Na:"
+
+#: ../rules/base.xml.in.h:394
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Mwandikisho Na:"
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "Mwandikisho Na:"
+
+#: ../rules/base.xml.in.h:402
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "Mwandikisho Na:"
+
+#, fuzzy
+#~ msgid "Romanian standard keyboard"
+#~ msgstr "Bisanzwe"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "Ikinyaseribiya"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Bengali"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "Ikirusiya"
+
+#, fuzzy
+#~ msgid "Devanagari INSCRIPT"
+#~ msgstr "Devanagari"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "Kannada"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "IMISUSIRE Imisobekere:"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/el.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/el.po
@@ -1585,7 +1585,8 @@
 
 #: rules/base.xml.in.h:393
 msgid "Use keyboard LED to show alternative group."
-msgstr "Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+msgstr ""
+"Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
 
 #: rules/base.xml.in.h:394
 msgid "Uzb"
@@ -1666,3 +1667,1371 @@
 #: rules/base.xml.in.h:413
 msgid "si1452"
 msgstr "si1452"
+
+#: ../rules/base.xml.in.h:2
+#, fuzzy
+msgid "(Legacy) Alternative"
+msgstr "Ενναλακτικό"
+
+#: ../rules/base.xml.in.h:3
+msgid "(Legacy) Alternative, Sun dead keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:4
+#, fuzzy
+msgid "(Legacy) Alternative, eliminate dead keys"
+msgstr "Χωρίς νεκρά πλήκτρα"
+
+#: ../rules/base.xml.in.h:5
+#, fuzzy
+msgid "(Legacy) Dvorak"
+msgstr "Γαλλικά Ντβόρακ"
+
+#: ../rules/base.xml.in.h:6
+msgid "101/104 key Compatible"
+msgstr ""
+
+#: ../rules/base.xml.in.h:25
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr ""
+
+#: ../rules/base.xml.in.h:27
+msgid "AZERTY Tskapo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:29
+msgid "Acer C300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30
+msgid "Acer Ferrari 4000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:31
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:38
+msgid "Afg"
+msgstr ""
+
+#: ../rules/base.xml.in.h:39
+msgid "Afghanistan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:40
+msgid "Akan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:43
+msgid "Alt and Meta are on the Alt keys."
+msgstr ""
+
+#: ../rules/base.xml.in.h:45
+#, fuzzy
+msgid "Alt+CapsLock changes layout."
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:46
+#, fuzzy
+msgid "Alt+Ctrl change layout."
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:47
+#, fuzzy
+msgid "Alt+Shift change layout."
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:51
+#, fuzzy
+msgid "Alternative Eastern"
+msgstr "Ενναλακτικό"
+
+#: ../rules/base.xml.in.h:52
+#, fuzzy
+msgid "Alternative Phonetic"
+msgstr "Ενναλακτικό"
+
+#: ../rules/base.xml.in.h:56
+#, fuzzy
+msgid "Alternative, latin-9 only"
+msgstr "Ενναλακτικό"
+
+#: ../rules/base.xml.in.h:57
+msgid "And"
+msgstr ""
+
+#: ../rules/base.xml.in.h:58
+#, fuzzy
+msgid "Andorra"
+msgstr "ΑΡΑ"
+
+#: ../rules/base.xml.in.h:60
+msgid "Apple"
+msgstr ""
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Apple Laptop"
+msgstr "Φορητός"
+
+#: ../rules/base.xml.in.h:75
+msgid "BTC 9019U"
+msgstr ""
+
+#: ../rules/base.xml.in.h:76
+#, fuzzy
+msgid "Ban"
+msgstr "ΒΕΝ"
+
+#: ../rules/base.xml.in.h:77
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:81
+msgid "BenQ X-Touch 730"
+msgstr ""
+
+#: ../rules/base.xml.in.h:82
+msgid "BenQ X-Touch 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:84
+msgid "Bengali Probhat"
+msgstr ""
+
+#: ../rules/base.xml.in.h:85
+msgid "Bepo, ergonomic, Dvorak way"
+msgstr ""
+
+#: ../rules/base.xml.in.h:86
+msgid "Bepo, ergonomic, Dvorak way, latin-9 only"
+msgstr ""
+
+#: ../rules/base.xml.in.h:88
+msgid "Bhu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:89
+msgid "Bhutan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:90
+msgid "Biblical Hebrew (Tiro)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:94
+msgid "Both Alt keys together change layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:95
+msgid "Both Ctrl keys together change layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:96
+msgid "Both Shift keys together change layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:97
+msgid "Both Win-keys switch layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:99
+#, fuzzy
+msgid "Braille"
+msgstr "ΒΡΑ"
+
+#: ../rules/base.xml.in.h:102
+#, fuzzy
+msgid "Brl"
+msgstr "ΒΕΛ"
+
+#: ../rules/base.xml.in.h:104
+msgid "Buckwalter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:106
+msgid "Cambodia"
+msgstr ""
+
+#: ../rules/base.xml.in.h:109
+msgid "Caps Lock is Compose."
+msgstr ""
+
+#: ../rules/base.xml.in.h:110
+#, fuzzy
+msgid "CapsLock LED shows alternative layout."
+msgstr ""
+"Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+
+#: ../rules/base.xml.in.h:111
+msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:112
+msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:115
+#, fuzzy
+msgid "CapsLock key changes layout."
+msgstr "Συμπεριφορά πλήκτρου Κλείδωμα Κεφαλαίων"
+
+#: ../rules/base.xml.in.h:118
+msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:119
+msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:120
+msgid "Catalan variant with middle-dot L"
+msgstr ""
+
+#: ../rules/base.xml.in.h:124
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr ""
+
+#: ../rules/base.xml.in.h:125
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:126
+msgid "Cherry CyMotion Master XPress"
+msgstr ""
+
+#: ../rules/base.xml.in.h:129
+msgid "Chuvash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:130
+msgid "Chuvash Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:131
+msgid "Classic Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:138
+#, fuzzy
+msgid "Compose key position"
+msgstr "Θέση Πλήκτρου Control"
+
+#: ../rules/base.xml.in.h:139
+msgid "Congo, Democratic Republic of the"
+msgstr ""
+
+#: ../rules/base.xml.in.h:140
+msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
+msgstr ""
+
+#: ../rules/base.xml.in.h:142
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Πλήκτρο Control κάτω αριστερά"
+
+#: ../rules/base.xml.in.h:143
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Πλήκτρο Control στα αριστερά του 'Α'"
+
+#: ../rules/base.xml.in.h:144
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Θέση Πλήκτρου Control"
+
+#: ../rules/base.xml.in.h:145
+#, fuzzy
+msgid "Ctrl+Shift change layout."
+msgstr "Το Control+Shift αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:149
+msgid "DRC"
+msgstr ""
+
+#: ../rules/base.xml.in.h:153
+msgid "Default numeric keypad keys."
+msgstr ""
+
+#: ../rules/base.xml.in.h:156
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:157
+msgid "Dell Laptop/notebook Precision M series"
+msgstr ""
+
+#: ../rules/base.xml.in.h:158
+msgid "Dell Latitude series laptop"
+msgstr ""
+
+#: ../rules/base.xml.in.h:159
+msgid "Dell SK-8125 USB Multimedia Keybard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:160
+msgid "Dell SK-8135 USB Multimedia Keybard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:161
+msgid "Dell USB Multimedia Keybard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:170
+#, fuzzy
+msgid "Eastern"
+msgstr "ΕΣΘ"
+
+#: ../rules/base.xml.in.h:173
+#, fuzzy
+msgid "Epo"
+msgstr "ΙΣΠ"
+
+#: ../rules/base.xml.in.h:174
+msgid "Ergonomic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:176
+msgid "Esperanto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:179
+#, fuzzy
+msgid "Eth"
+msgstr "ΕΣΘ"
+
+#: ../rules/base.xml.in.h:180
+#, fuzzy
+msgid "Ethiopia"
+msgstr "Εσθονία"
+
+#: ../rules/base.xml.in.h:181
+msgid "Evdev-managed keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:183
+#, fuzzy
+msgid "Ewe"
+msgstr "ΣΟΥ"
+
+#: ../rules/base.xml.in.h:191
+msgid "Force standard legacy keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:195
+msgid "French (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:200
+msgid "Fula"
+msgstr ""
+
+#: ../rules/base.xml.in.h:202
+msgid "Ga"
+msgstr ""
+
+#: ../rules/base.xml.in.h:207
+msgid "Genius Comfy KB-12e"
+msgstr ""
+
+#: ../rules/base.xml.in.h:210
+msgid "Genius KB-19e NB"
+msgstr ""
+
+#: ../rules/base.xml.in.h:213
+msgid "German (Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:217
+#, fuzzy
+msgid "Gha"
+msgstr "ΤΑΥ"
+
+#: ../rules/base.xml.in.h:218
+msgid "Ghana"
+msgstr ""
+
+#: ../rules/base.xml.in.h:224
+msgid "Hausa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:235
+msgid "Hindi Bolnagri"
+msgstr ""
+
+#: ../rules/base.xml.in.h:241
+msgid "IBM (LST 1205-92)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:246
+msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:249
+msgid "Igbo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:250
+#, fuzzy
+msgid "Ind"
+msgstr "ΙΡΝ"
+
+#: ../rules/base.xml.in.h:251
+msgid "India"
+msgstr ""
+
+#: ../rules/base.xml.in.h:255
+#, fuzzy
+msgid "Iraq"
+msgstr "Ιράν"
+
+#: ../rules/base.xml.in.h:259
+#, fuzzy
+msgid "Irq"
+msgstr "ΙΡΛ"
+
+#: ../rules/base.xml.in.h:266
+msgid "Japan (PC-98xx Series)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:268
+msgid "Japanese keyboard options"
+msgstr ""
+
+#: ../rules/base.xml.in.h:270
+#, fuzzy
+msgid "Kana"
+msgstr "ΚΑΝ"
+
+#: ../rules/base.xml.in.h:271
+msgid "Kana Lock key is locking"
+msgstr ""
+
+#: ../rules/base.xml.in.h:273
+msgid "Kashubian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274
+#, fuzzy
+msgid "Kaz"
+msgstr "ΚΑΝ"
+
+#: ../rules/base.xml.in.h:275
+msgid "Kazakh with Russian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:276
+#, fuzzy
+msgid "Kazakhstan"
+msgstr "Κυργιστάν"
+
+#: ../rules/base.xml.in.h:277
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:279
+msgid "Khm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:280
+#, fuzzy
+msgid "Kor"
+msgstr "ΚΥΡ"
+
+#: ../rules/base.xml.in.h:281
+msgid "Korea, Republic of"
+msgstr ""
+
+#: ../rules/base.xml.in.h:282
+msgid "Korean 106-key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:283
+msgid "Kotoistus"
+msgstr ""
+
+#: ../rules/base.xml.in.h:284
+msgid "Kurdish, (F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:285
+msgid "Kurdish, Arabic-Latin"
+msgstr ""
+
+#: ../rules/base.xml.in.h:286
+msgid "Kurdish, Latin Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:287
+msgid "Kurdish, Latin Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:291
+#, fuzzy
+msgid "LCtrl+LShift change layout."
+msgstr "Το Control+Shift αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:296
+msgid "Laptop/notebook eMachines m68xx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:302
+msgid "Latin with guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:304
+msgid "Layout switching"
+msgstr ""
+
+#: ../rules/base.xml.in.h:305
+msgid "Left Alt is swapped with left Win-key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:306
+msgid "Left Alt key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:307
+msgid "Left Alt key switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+#, fuzzy
+msgid "Left Ctrl key changes layout."
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:309
+#, fuzzy
+msgid "Left Shift key changes layout."
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:310
+msgid "Left Win-key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:311
+msgid "Left Win-key is Compose."
+msgstr ""
+
+#: ../rules/base.xml.in.h:312
+msgid "Left Win-key switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:313
+#, fuzzy
+msgid "Left hand"
+msgstr "Ολλανδία"
+
+#: ../rules/base.xml.in.h:314
+msgid "Left handed Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:318
+msgid "Logitech Cordless Desktop LX-300"
+msgstr ""
+
+#: ../rules/base.xml.in.h:326
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr ""
+
+#: ../rules/base.xml.in.h:329
+msgid "Logitech Ultra-X Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:330
+msgid "Logitech diNovo Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:333
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr ""
+
+#: ../rules/base.xml.in.h:334
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:337
+msgid "MESS"
+msgstr ""
+
+#: ../rules/base.xml.in.h:338
+msgid "MacBook/MacBook Pro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:339
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:340
+#, fuzzy
+msgid "Macedonia"
+msgstr "Φυρομιακά"
+
+#: ../rules/base.xml.in.h:343
+#, fuzzy
+msgid "Macintosh, Sun dead keys"
+msgstr "Χωρίς νεκρά πλήκτρα"
+
+#: ../rules/base.xml.in.h:344
+#, fuzzy
+msgid "Macintosh, eliminate dead keys"
+msgstr "Χωρίς νεκρά πλήκτρα"
+
+#: ../rules/base.xml.in.h:345
+msgid "Make CapsLock an additional Ctrl."
+msgstr ""
+
+#: ../rules/base.xml.in.h:348
+msgid "Maldives"
+msgstr ""
+
+#: ../rules/base.xml.in.h:350
+msgid "Maltese keyboard with US layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:357
+msgid "Menu key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+msgid "Morocco"
+msgstr ""
+
+#: ../rules/base.xml.in.h:376
+#, fuzzy
+msgid "Multilingual, first part"
+msgstr "Πολύγλωσσο"
+
+#: ../rules/base.xml.in.h:379
+msgid "NICOLA-F style Backspace"
+msgstr ""
+
+#: ../rules/base.xml.in.h:380
+msgid "Neostyle"
+msgstr ""
+
+#: ../rules/base.xml.in.h:381
+msgid "Nep"
+msgstr ""
+
+#: ../rules/base.xml.in.h:382
+msgid "Nepal"
+msgstr ""
+
+#: ../rules/base.xml.in.h:384
+msgid "Nig"
+msgstr ""
+
+#: ../rules/base.xml.in.h:385
+msgid "Nigeria"
+msgstr ""
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Χωρίς νεκρά πλήκτρα"
+
+#: ../rules/base.xml.in.h:392
+#, fuzzy
+msgid "NumLock LED shows alternative layout."
+msgstr ""
+"Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+
+#: ../rules/base.xml.in.h:393
+msgid "Numeric keypad keys work as with Mac."
+msgstr ""
+
+#: ../rules/base.xml.in.h:394
+msgid "Numeric keypad layout selection"
+msgstr ""
+
+#: ../rules/base.xml.in.h:395
+msgid "OADG 109A"
+msgstr ""
+
+#: ../rules/base.xml.in.h:397
+msgid "Ogham IS434"
+msgstr ""
+
+#: ../rules/base.xml.in.h:399
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:400
+#, fuzzy
+msgid "Ossetian"
+msgstr "Ρωσσικά"
+
+#: ../rules/base.xml.in.h:401
+msgid "Ossetian, Winkeys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+#, fuzzy
+msgid "Pakistan"
+msgstr "Τατζικιστάν"
+
+#: ../rules/base.xml.in.h:405
+msgid "Pashto"
+msgstr ""
+
+#: ../rules/base.xml.in.h:415
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:417
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:421
+#, fuzzy
+msgid "Pro"
+msgstr "ΠΟΛ"
+
+#: ../rules/base.xml.in.h:422
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:427
+msgid "R-Alt switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:429
+msgid "Right Alt key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:430 ../rules/sun.xml.in.h:90
+msgid "Right Alt key never chooses 3rd level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:432
+#, fuzzy
+msgid "Right Ctrl key changes layout."
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:433
+msgid "Right Ctrl key switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:434
+msgid "Right Ctrl key works as Right Alt."
+msgstr ""
+
+#: ../rules/base.xml.in.h:435
+#, fuzzy
+msgid "Right Shift key changes layout."
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:436
+msgid "Right Win-key changes layout."
+msgstr ""
+
+#: ../rules/base.xml.in.h:438
+msgid "Right Win-key switches layout while pressed."
+msgstr ""
+
+#: ../rules/base.xml.in.h:439
+msgid "Right hand"
+msgstr ""
+
+#: ../rules/base.xml.in.h:440
+msgid "Right handed Dvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:448
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Ρωσσικά"
+
+#: ../rules/base.xml.in.h:449
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Χωρίς νεκρά πλήκτρα"
+
+#: ../rules/base.xml.in.h:450
+msgid "Russian with Kazakh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:451
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:452
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr ""
+
+#: ../rules/base.xml.in.h:460
+#, fuzzy
+msgid "ScrollLock LED shows alternative layout."
+msgstr ""
+"Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+
+#: ../rules/base.xml.in.h:461
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:462
+msgid "Shift with numeric keypad keys works as in MS Windows."
+msgstr ""
+
+#: ../rules/base.xml.in.h:463
+#, fuzzy
+msgid "Shift+CapsLock changes layout."
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/base.xml.in.h:466
+msgid "South Africa"
+msgstr ""
+
+#: ../rules/base.xml.in.h:467
+msgid "Southern Uzbek"
+msgstr ""
+
+#: ../rules/base.xml.in.h:468
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:469
+msgid "Space key outputs non-breakable space character at fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:470
+msgid "Space key outputs non-breakable space character at second level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:471
+msgid ""
+"Space key outputs non-breakable space character at third level, nothing at "
+"fourth level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:472
+msgid ""
+"Space key outputs non-breakable space character at third level, thin non-"
+"breakable space character at fourth level"
+msgstr ""
+
+#: ../rules/base.xml.in.h:473
+msgid "Space key outputs non-breakable space character at third level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:474
+msgid "Space key outputs usual space at any level."
+msgstr ""
+
+#: ../rules/base.xml.in.h:477
+#, fuzzy
+msgid "SrL"
+msgstr "ΣΥΡ"
+
+#: ../rules/base.xml.in.h:478
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "Σερβικά"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:481
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "Τυπικό"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:483
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:486
+msgid "Super is mapped to the Win-keys."
+msgstr ""
+
+#: ../rules/base.xml.in.h:487
+msgid "Svdvorak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:490
+msgid "Swap Ctrl and CapsLock."
+msgstr ""
+
+#: ../rules/base.xml.in.h:491
+msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+msgstr ""
+
+#: ../rules/base.xml.in.h:497
+#, fuzzy
+msgid "Syria"
+msgstr "Συριακά"
+
+#: ../rules/base.xml.in.h:499
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Φωνητικά"
+
+#: ../rules/base.xml.in.h:503
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "\"Γραφομηχανή\""
+
+#: ../rules/base.xml.in.h:504
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:505
+msgid "Tamil Unicode"
+msgstr ""
+
+#: ../rules/base.xml.in.h:506
+#, fuzzy
+msgid "Tatar"
+msgstr "Μάλτα"
+
+#: ../rules/base.xml.in.h:511
+msgid "Tifinagh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:512
+#, fuzzy
+msgid "Tifinagh Alternative"
+msgstr "Ενναλακτικό"
+
+#: ../rules/base.xml.in.h:513
+msgid "Tifinagh Alternative Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:514
+msgid "Tifinagh Extended"
+msgstr ""
+
+#: ../rules/base.xml.in.h:515
+msgid "Tifinagh Extended Phonetic"
+msgstr ""
+
+#: ../rules/base.xml.in.h:516
+#, fuzzy
+msgid "Tifinagh Phonetic"
+msgstr "Φωνητικά"
+
+#: ../rules/base.xml.in.h:523
+#, fuzzy
+msgid "Turkey"
+msgstr "ΤΟΥ"
+
+#: ../rules/base.xml.in.h:524
+#, fuzzy
+msgid "Typewriter"
+msgstr "\"Γραφομηχανή\""
+
+#: ../rules/base.xml.in.h:526
+msgid "US keyboard with Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:527
+msgid "US keyboard with Bosnian letters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:528
+msgid "US keyboard with Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:531
+msgid "US keyboard with Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:532
+msgid "US keyboard with Slovenian letters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:534
+#, fuzzy
+msgid "Udmurt"
+msgstr "Ούρντου"
+
+#: ../rules/base.xml.in.h:540
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:541
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:542
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:543
+msgid "Use guillemets for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:544
+#, fuzzy
+msgid "Use keyboard LED to show alternative layout."
+msgstr ""
+"Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+
+#: ../rules/base.xml.in.h:545
+msgid "Use keypad with unicode additions (arrows and math operators)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:546
+msgid "Using space key to input non-breakable space character"
+msgstr ""
+
+#: ../rules/base.xml.in.h:551
+msgid "Wang model 724 azerty"
+msgstr ""
+
+#: ../rules/base.xml.in.h:552
+msgid "Western"
+msgstr ""
+
+#: ../rules/base.xml.in.h:556
+#, fuzzy
+msgid "With EuroSign on 5"
+msgstr "Προσθήκη του συμβόλου Ευρώ στο πλήκτρο 5."
+
+#: ../rules/base.xml.in.h:557
+msgid "With guillemets"
+msgstr ""
+
+#: ../rules/base.xml.in.h:559
+msgid "Yoruba"
+msgstr ""
+
+#: ../rules/base.xml.in.h:561
+msgid "Zar"
+msgstr ""
+
+#: ../rules/base.xml.in.h:565
+msgid "displaced semicolon and quote (obsolete)"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:17
+msgid "Acts as Shift with locking. Shift cancels Caps."
+msgstr ""
+
+#: ../rules/sun.xml.in.h:18
+msgid "Acts as Shift with locking. Shift doesn't cancel Caps."
+msgstr ""
+
+#: ../rules/sun.xml.in.h:19
+#, fuzzy
+msgid "Alt+Control changes group"
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:20
+#, fuzzy
+msgid "Alt+Shift changes group"
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:21
+msgid "Basic"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:23
+#, fuzzy
+msgid "Belgian"
+msgstr "Βέλγιο"
+
+#: ../rules/sun.xml.in.h:25
+#, fuzzy
+msgid "Both Alt keys together change group"
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:26
+msgid "Both Ctrl keys together change group"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:27
+#, fuzzy
+msgid "Both Shift keys together change group"
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:28
+#, fuzzy
+msgid "Bulgarian"
+msgstr "Βουλγαρία"
+
+#: ../rules/sun.xml.in.h:30
+#, fuzzy
+msgid "Canadian"
+msgstr "Καναδάς"
+
+#: ../rules/sun.xml.in.h:31
+msgid "Caps Lock is Compose"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:32
+#, fuzzy
+msgid "Caps Lock key changes group"
+msgstr "Συμπεριφορά πλήκτρου Κλείδωμα Κεφαλαίων"
+
+#: ../rules/sun.xml.in.h:34
+#, fuzzy
+msgid "Caps_Lock LED shows alternative group"
+msgstr ""
+"Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+
+#: ../rules/sun.xml.in.h:38
+#, fuzzy
+msgid "Control+Shift changes group"
+msgstr "Το Control+Shift αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:40
+#, fuzzy
+msgid "Czech"
+msgstr "Τσεχία"
+
+#: ../rules/sun.xml.in.h:41
+msgid "Danish"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:45
+msgid "DeuCH"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:47
+#, fuzzy
+msgid "Dvo"
+msgstr "ΤΖΟ"
+
+#: ../rules/sun.xml.in.h:52
+#, fuzzy
+msgid "Finnish"
+msgstr "ΦΙΝ"
+
+#: ../rules/sun.xml.in.h:54
+#, fuzzy
+msgid "FraCH"
+msgstr "ΓΑΛ"
+
+#: ../rules/sun.xml.in.h:57
+#, fuzzy
+msgid "German"
+msgstr "Γερμανία"
+
+#: ../rules/sun.xml.in.h:60
+#, fuzzy
+msgid "Hungarian"
+msgstr "Βουλγαρία"
+
+#: ../rules/sun.xml.in.h:64
+#, fuzzy
+msgid "Italian"
+msgstr "Ιταλία"
+
+#: ../rules/sun.xml.in.h:65
+#, fuzzy
+msgid "Japanese"
+msgstr "Ιαπωνία"
+
+#: ../rules/sun.xml.in.h:67
+#, fuzzy
+msgid "Left Alt key changes group"
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:68
+msgid "Left Alt key switches group while pressed"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:69
+#, fuzzy
+msgid "Left Ctrl key changes group"
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:70
+#, fuzzy
+msgid "Left Shift key changes group"
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:71
+msgid "Make CapsLock an additional Control"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:76
+#, fuzzy
+msgid "Norwegian"
+msgstr "Νορβηγία"
+
+#: ../rules/sun.xml.in.h:77
+#, fuzzy
+msgid "Num_Lock LED shows alternative group"
+msgstr ""
+"Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+
+#: ../rules/sun.xml.in.h:80
+#, fuzzy
+msgid "Polish"
+msgstr "ΠΟΛ"
+
+#: ../rules/sun.xml.in.h:81
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/sun.xml.in.h:82
+#, fuzzy
+msgid "Portuguese"
+msgstr "Πορτογαλία"
+
+#: ../rules/sun.xml.in.h:83
+msgid "Press Left Alt key to choose 3rd level"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:84
+msgid "Press Right Alt key to choose 3rd level"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:85
+msgid ""
+"Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:86
+msgid "Press Right Control to choose 3rd level"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:87
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:89
+#, fuzzy
+msgid "Right Alt key changes group"
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:91
+msgid "Right Alt switches group while pressed"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:92
+msgid "Right Control key works as Right Alt"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:93
+#, fuzzy
+msgid "Right Ctrl key changes group"
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:94
+#, fuzzy
+msgid "Right Shift key changes group"
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:97
+#, fuzzy
+msgid "Scroll Lock changes group"
+msgstr "Το Alt+Control αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:98
+#, fuzzy
+msgid "Scroll_Lock LED shows alternative group"
+msgstr ""
+"Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+
+#: ../rules/sun.xml.in.h:99
+msgid "Shift with numpad keys works as in MS Windows"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:100
+#, fuzzy
+msgid "Shift+CapsLock changes group"
+msgstr "Το Alt+Shift αλλάζει ομάδα."
+
+#: ../rules/sun.xml.in.h:101
+#, fuzzy
+msgid "Slovak"
+msgstr "Σλοβακία"
+
+#: ../rules/sun.xml.in.h:102
+#, fuzzy
+msgid "Spanish"
+msgstr "Ισπανία"
+
+#: ../rules/sun.xml.in.h:105
+msgid "Sun Type 4"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:106
+msgid "Sun Type 5"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:107
+msgid "Sun Type 5 European"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:108
+msgid "Sun Type 5 Unix"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:109
+msgid "Sun Type 6"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:110
+msgid "Sun Type 6 Unix"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:111
+msgid "Sun Type 6 with Euro key"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:114
+msgid "Swap Control and Caps Lock"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:116
+#, fuzzy
+msgid "Swedish"
+msgstr "Σουηδία"
+
+#: ../rules/sun.xml.in.h:117
+#, fuzzy
+msgid "Swiss French"
+msgstr "Γαλλικά"
+
+#: ../rules/sun.xml.in.h:118
+#, fuzzy
+msgid "Swiss German"
+msgstr "Γερμανία"
+
+#: ../rules/sun.xml.in.h:122
+#, fuzzy
+msgid "Turkish (F)"
+msgstr "Τουρκικά"
+
+#: ../rules/sun.xml.in.h:123
+msgid "Turkish Alt-Q Layout"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:125
+#, fuzzy
+msgid "U.S. English w/ ISO9995-3"
+msgstr "Αγγλικά ΗΠΑ"
+
+#: ../rules/sun.xml.in.h:128
+#, fuzzy
+msgid "Use keyboard LED to show alternative group"
+msgstr ""
+"Χρήση του LED του πληκτρολογίου για την υπόδειξη της εναλλακτικής ομάδας."
+
+#: ../rules/sun.xml.in.h:129
+msgid "Uses internal capitalization. Shift cancels Caps."
+msgstr ""
+
+#: ../rules/sun.xml.in.h:130
+msgid "Uses internal capitalization. Shift doesn't cancel Caps."
+msgstr ""
+
+#: ../rules/sun.xml.in.h:131
+msgid "bksl"
+msgstr ""
+
+#: ../rules/sun.xml.in.h:133
+msgid "type4"
+msgstr ""
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/POTFILES
+++ xkeyboard-config-1.1~cvs.20080104.1/po/POTFILES
@@ -0,0 +1,2 @@
+	../rules/base.xml.in \
+	../rules/sun.xml.in
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/Makefile.am
+++ xkeyboard-config-1.1~cvs.20080104.1/po/Makefile.am
@@ -0,0 +1,9 @@
+EXTRA_DIST=$(wildcard *.po) POTFILES POTFILES.in
+
+DISTCLEANFILES=.intltool-merge-cache POTFILES stamp-it
+
+update-pot:
+	$(INTLTOOL_UPDATE) -p -g $(PACKAGE)
+
+update-po:
+	for i in *.po; do echo Updating $$i; $(INTLTOOL_UPDATE) `basename $$i .po` -g $(PACKAGE); done
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/bg.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/bg.po
@@ -289,7 +289,8 @@
 
 #: ../rules/base.xml.in.h:69
 msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 wireless Internet Keyboard (безжична клавиатура за Интернет)"
+msgstr ""
+"Azona RF2300 wireless Internet Keyboard (безжична клавиатура за Интернет)"
 
 #: ../rules/base.xml.in.h:70
 msgid "BTC 5090"
@@ -457,7 +458,8 @@
 
 #: ../rules/base.xml.in.h:111
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "CapsLock работи като Shift със заключване. Shift отменя временно CapsLock"
+msgstr ""
+"CapsLock работи като Shift със заключване. Shift отменя временно CapsLock"
 
 #: ../rules/base.xml.in.h:112
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
@@ -485,11 +487,14 @@
 
 #: ../rules/base.xml.in.h:118
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock използва вътрешна промяна на регистъра. Shift временно отменя CapsLock"
+msgstr ""
+"CapsLock използва вътрешна промяна на регистъра. Shift временно отменя "
+"CapsLock"
 
 #: ../rules/base.xml.in.h:119
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock използва вътрешна промяна на регистъра. Shift не влияе на CapsLock"
+msgstr ""
+"CapsLock използва вътрешна промяна на регистъра. Shift не влияе на CapsLock"
 
 #: ../rules/base.xml.in.h:120
 msgid "Catalan variant with middle-dot L"
@@ -1175,11 +1180,17 @@
 
 #: ../rules/base.xml.in.h:292
 msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Цифрова клавиатура с допълненията от Уникод (стрелки и математически операции)"
+msgstr ""
+"Цифрова клавиатура с допълненията от Уникод (стрелки и математически "
+"операции)"
 
 #: ../rules/base.xml.in.h:293
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Цифрова клавиатура с допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
+msgid ""
+"Keypad with unicode additions (arrows and math operators). Math operators on "
+"default level."
+msgstr ""
+"Цифрова клавиатура с допълненията от Уникод (стрелки и математически "
+"операции). Операциите са на стандартното ниво"
 
 #: ../rules/base.xml.in.h:294
 msgid "Keytronic FlexPro"
@@ -1247,11 +1258,14 @@
 
 #: ../rules/base.xml.in.h:310
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard (за мобилен компютър)"
+msgstr ""
+"Laptop/notebook Compaq (eg. Armada) Laptop Keyboard (за мобилен компютър)"
 
 #: ../rules/base.xml.in.h:311
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard (за мобилен компютър и Интернет)"
+msgstr ""
+"Laptop/notebook Compaq (eg. Presario) Internet Keyboard (за мобилен компютър "
+"и Интернет)"
 
 #: ../rules/base.xml.in.h:312
 msgid "Laptop/notebook eMachines m68xx"
@@ -1540,7 +1554,9 @@
 
 #: ../rules/base.xml.in.h:384
 msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB/Microsoft Internet Keyboard Pro (за Интернет)"
+msgstr ""
+"Microsoft Natural Keyboard Pro USB/Microsoft Internet Keyboard Pro (за "
+"Интернет)"
 
 #: ../rules/base.xml.in.h:385
 msgid "Microsoft Office Keyboard"
@@ -1743,8 +1759,11 @@
 msgstr "Menu избира третото ниво"
 
 #: ../rules/base.xml.in.h:435
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Десният Alt избира третото ниво, Shift+десният Alt функционират като клавиша Multi"
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"Десният Alt избира третото ниво, Shift+десният Alt функционират като клавиша "
+"Multi"
 
 #: ../rules/base.xml.in.h:436
 msgid "Press Right Alt key to choose 3rd level."
@@ -1955,8 +1974,12 @@
 msgstr "южно узбекска"
 
 #: ../rules/base.xml.in.h:488
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Клавишът за интервал генерира неделим интервал на четвърто ниво и тесен неделим интервал на шесто ниво"
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level"
+msgstr ""
+"Клавишът за интервал генерира неделим интервал на четвърто ниво и тесен "
+"неделим интервал на шесто ниво"
 
 #: ../rules/base.xml.in.h:489
 msgid "Space key outputs non-breakable space character at fourth level."
@@ -1967,12 +1990,20 @@
 msgstr "Клавишът за интервал генерира неделим интервал на второ ниво"
 
 #: ../rules/base.xml.in.h:491
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Клавишът за интервал генерира интервал без разделяне на трето ниво и нищо на четвърто ниво"
+msgid ""
+"Space key outputs non-breakable space character at third level, nothing at "
+"fourth level."
+msgstr ""
+"Клавишът за интервал генерира интервал без разделяне на трето ниво и нищо на "
+"четвърто ниво"
 
 #: ../rules/base.xml.in.h:492
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Клавишът за интервал генерира интервал без разделяне на трето ниво и тесен интервал без пренасяне на четвърто ниво"
+msgid ""
+"Space key outputs non-breakable space character at third level, thin non-"
+"breakable space character at fourth level"
+msgstr ""
+"Клавишът за интервал генерира интервал без разделяне на трето ниво и тесен "
+"интервал без пренасяне на четвърто ниво"
 
 #: ../rules/base.xml.in.h:493
 msgid "Space key outputs non-breakable space character at third level."
@@ -1988,7 +2019,8 @@
 
 #: ../rules/base.xml.in.h:496 ../rules/sun.xml.in.h:103
 msgid "Special keys (Ctrl+Alt+<key>) handled in a server."
-msgstr "Специалните комбинации (Ctrl+Alt+<клавиш>) се обработват от сървъра"
+msgstr ""
+"Специалните комбинации (Ctrl+Alt+<клавиш>) се обработват от сървъра"
 
 #: ../rules/base.xml.in.h:497
 msgid "SrL"
@@ -2046,7 +2078,9 @@
 
 #: ../rules/base.xml.in.h:512
 msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Размяна на кодовете на два клавиша, когато клавиатурите за Macintosh са разпознати неправилно от ядрото"
+msgstr ""
+"Размяна на кодовете на два клавиша, когато клавиатурите за Macintosh са "
+"разпознати неправилно от ядрото"
 
 #: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
 msgid "Swe"
@@ -2290,11 +2324,17 @@
 
 #: ../rules/base.xml.in.h:573
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Цифрова клавиатура - Wang 724, с допълненията от Уникод (стрелки и математически операции)"
+msgstr ""
+"Цифрова клавиатура - Wang 724, с допълненията от Уникод (стрелки и "
+"математически операции)"
 
 #: ../rules/base.xml.in.h:574
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Цифрова клавиатура - Wang 724, с допълненията от Уникод (стрелки и математически операции). Операциите са на стандартното ниво"
+msgid ""
+"Wang 724 keypad with unicode additions (arrows and math operators). Math "
+"operators on default level."
+msgstr ""
+"Цифрова клавиатура - Wang 724, с допълненията от Уникод (стрелки и "
+"математически операции). Операциите са на стандартното ниво"
 
 #: ../rules/base.xml.in.h:575
 msgid "Wang model 724 azerty"
@@ -2545,8 +2585,11 @@
 msgstr "Десният Alt избира третото ниво"
 
 #: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "Десният Alt избира третото ниво, Shift+десният Alt функционират като клавиша Multi"
+msgid ""
+"Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr ""
+"Десният Alt избира третото ниво, Shift+десният Alt функционират като клавиша "
+"Multi"
 
 #: ../rules/sun.xml.in.h:86
 msgid "Press Right Control to choose 3rd level"
@@ -2679,3 +2722,228 @@
 #: ../rules/sun.xml.in.h:133
 msgid "type4"
 msgstr "вид 4"
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:31
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt-овете отговарят на Meta и на Alt (по подразбиране)."
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Заедно Alt+Control сменят групата"
+
+#: ../rules/base.xml.in.h:34
+msgid "Alt+Shift changes group."
+msgstr "Заедно Alt+Shift сменят групата"
+
+#: ../rules/base.xml.in.h:68
+msgid "Both Alt keys together change group."
+msgstr "Двата Alt-а заедно сменят групата."
+
+#: ../rules/base.xml.in.h:69
+msgid "Both Ctrl keys together change group."
+msgstr "Двата Ctrl-а заедно сменят групата."
+
+#: ../rules/base.xml.in.h:70
+msgid "Both Shift keys together change group."
+msgstr "Двата Shift-а заедно сменят групата."
+
+#: ../rules/base.xml.in.h:71
+msgid "Both Win-keys switch group while pressed."
+msgstr "Двата Win-а заедно сменят групата докато са натиснати."
+
+#: ../rules/base.xml.in.h:79
+msgid "CapsLock LED shows alternative group."
+msgstr "Индикаторът на CapsLock показва сменяне на групата."
+
+#: ../rules/base.xml.in.h:80
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "CapsLock работи като Shift със заключване. Shift отменя CapsLock."
+
+#: ../rules/base.xml.in.h:81
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "CapsLock работи като Shift със заключване. Shift не отменя CapsLock."
+
+#: ../rules/base.xml.in.h:84
+msgid "CapsLock key changes group."
+msgstr "CapsLock сменя групата."
+
+#: ../rules/base.xml.in.h:87
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr ""
+"CapsLock използва вътрешна вътрешна промяна на регистъра. Shift отменя "
+"CapsLock."
+
+#: ../rules/base.xml.in.h:88
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr ""
+"CapsLock използва вътрешна вътрешна промяна на регистъра. Shift не отменя "
+"CapsLock."
+
+#: ../rules/base.xml.in.h:106
+msgid "Ctrl+Shift changes group."
+msgstr "Заедно Control+Shift сменят групата"
+
+#: ../rules/base.xml.in.h:208
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr ""
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:216
+msgid "Left Alt key changes group."
+msgstr "Десният Alt сменя групата."
+
+#: ../rules/base.xml.in.h:217
+msgid "Left Alt key switches group while pressed."
+msgstr "Левият Win сменя групата докато е натиснат."
+
+#: ../rules/base.xml.in.h:218
+msgid "Left Ctrl key changes group."
+msgstr "Левият Control сменя групата."
+
+#: ../rules/base.xml.in.h:219
+msgid "Left Shift key changes group."
+msgstr "Левият Shift клавиш сменя групата."
+
+#: ../rules/base.xml.in.h:220
+msgid "Left Win-key changes group."
+msgstr "Левият Win клавиш сменя групата."
+
+#: ../rules/base.xml.in.h:221
+msgid "Left Win-key switches group while pressed."
+msgstr "Левият Win сменя групата докато е натиснат."
+
+#: ../rules/base.xml.in.h:226
+#, fuzzy
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:227
+msgid "Logitech Cordless Desktop Pro"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:228
+#, fuzzy
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:230
+#, fuzzy
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop Pro"
+
+#: ../rules/base.xml.in.h:232
+#, fuzzy
+msgid "Logitech Deluxe Access Keyboard"
+msgstr "Logitech Интернет клавиатура"
+
+#: ../rules/base.xml.in.h:238
+#, fuzzy
+msgid "Logitech iTouch keyboard Internet Navigator"
+msgstr "Logitech клавиатура за Интернет навигация"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "македонска"
+
+#: ../rules/base.xml.in.h:255
+msgid "Menu key changes group."
+msgstr "Menu сменя групата."
+
+#: ../rules/base.xml.in.h:282
+msgid "NumLock LED shows alternative group."
+msgstr "Индикаторът на NumLock указва сменяне на групата."
+
+#: ../rules/base.xml.in.h:285
+#, fuzzy
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Logitech Интернет клавиатура"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:297
+msgid "PowerPC PS/2"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:312
+msgid "R-Alt switches group while pressed."
+msgstr "Десният Alt сменя групата докато е натиснат."
+
+#: ../rules/base.xml.in.h:314
+msgid "Right Alt key changes group."
+msgstr "Десният Alt сменя групата."
+
+#: ../rules/base.xml.in.h:316
+msgid "Right Ctrl key changes group."
+msgstr "Десният Alt сменя групата."
+
+#: ../rules/base.xml.in.h:317
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Десният Control групата докато е натиснат."
+
+#: ../rules/base.xml.in.h:319
+msgid "Right Shift key changes group."
+msgstr "Десният Shift сменя групата."
+
+#: ../rules/base.xml.in.h:320
+msgid "Right Win-key changes group."
+msgstr "Десният Win сменя групата."
+
+#: ../rules/base.xml.in.h:322
+msgid "Right Win-key switches group while pressed."
+msgstr "Десният Win сменя групата докато е натиснат."
+
+#: ../rules/base.xml.in.h:340
+msgid "ScrollLock LED shows alternative group."
+msgstr "Индикаторът на ScrollLock указва сменяне на групата."
+
+#: ../rules/base.xml.in.h:342
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift функционира с цифровата клавиатура както в MS Windows."
+
+#: ../rules/base.xml.in.h:343
+msgid "Shift+CapsLock changes group."
+msgstr "Заедно Shift+CapsLock сменят групата."
+
+#: ../rules/base.xml.in.h:357
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "И двата Win-а функционират като Super (по подразбиране)."
+
+#: ../rules/base.xml.in.h:393
+msgid "US keyboard with Maltian letters"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+msgid "Use keyboard LED to show alternative group."
+msgstr "Индикация чрез клавиатурен светодиод за сменяне на групата."
+
+#: ../rules/base.xml.in.h:414
+#, fuzzy
+msgid "With guillemots"
+msgstr "С чавки"
+
+#: ../rules/base.xml.in.h:425
+msgid "si1452"
+msgstr "si1452"
+
+#~ msgid "Serbian"
+#~ msgstr "сръбска"
+
+#, fuzzy
+#~ msgid "Srp"
+#~ msgstr "сръбска"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/nl.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/nl.po
@@ -471,7 +471,8 @@
 
 #: ../rules/base.xml.in.h:111
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "CapsLock werkt als Shift met blokkering, Shift heft CapsLock tijdelijk op."
+msgstr ""
+"CapsLock werkt als Shift met blokkering, Shift heft CapsLock tijdelijk op."
 
 #: ../rules/base.xml.in.h:112
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
@@ -499,11 +500,15 @@
 
 #: ../rules/base.xml.in.h:118
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock gebruikt interne conversie naar hoofdletters. Shift heft CapsLock op."
+msgstr ""
+"CapsLock gebruikt interne conversie naar hoofdletters. Shift heft CapsLock "
+"op."
 
 #: ../rules/base.xml.in.h:119
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock gebruikt interne conversie naar hoofdletters. Shift heft CapsLock niet op."
+msgstr ""
+"CapsLock gebruikt interne conversie naar hoofdletters. Shift heft CapsLock "
+"niet op."
 
 #: ../rules/base.xml.in.h:120
 msgid "Catalan variant with middle-dot L"
@@ -603,7 +608,8 @@
 
 #: ../rules/base.xml.in.h:144
 msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Ctrl wordt afgebeeld op de Win-toetsen (en de gebruikelijke Ctrl-toetsen)."
+msgstr ""
+"Ctrl wordt afgebeeld op de Win-toetsen (en de gebruikelijke Ctrl-toetsen)."
 
 #: ../rules/base.xml.in.h:145
 msgid "Croatia"
@@ -1197,8 +1203,12 @@
 msgstr "Cijferblok met unicode-aanvullingen (pijlen en wiskundige operatoren)"
 
 #: ../rules/base.xml.in.h:293
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Cijferblok met unicode-aanvullingen (pijlen en wiskundige operatoren). Wiskundige operatoren op het standaard niveau."
+msgid ""
+"Keypad with unicode additions (arrows and math operators). Math operators on "
+"default level."
+msgstr ""
+"Cijferblok met unicode-aanvullingen (pijlen en wiskundige operatoren). "
+"Wiskundige operatoren op het standaard niveau."
 
 #: ../rules/base.xml.in.h:294
 msgid "Keytronic FlexPro"
@@ -1767,8 +1777,11 @@
 msgstr "De Menu-toets geeft het 3e niveau."
 
 #: ../rules/base.xml.in.h:435
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "De rechter Alt-toets geeft het 3e niveau, Shift + rechter Alt-toets is Multi_Key."
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"De rechter Alt-toets geeft het 3e niveau, Shift + rechter Alt-toets is "
+"Multi_Key."
 
 #: ../rules/base.xml.in.h:436
 msgid "Press Right Alt key to choose 3rd level."
@@ -1983,8 +1996,12 @@
 # BUG geen spatie op eind
 # sixth level? hoeveel levels zijn er wel niet?
 #: ../rules/base.xml.in.h:488
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Spatiebalk geeft harde spatie op het vierde niveau, smalle harde spatie op het zesde niveau."
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level"
+msgstr ""
+"Spatiebalk geeft harde spatie op het vierde niveau, smalle harde spatie op "
+"het zesde niveau."
 
 #: ../rules/base.xml.in.h:489
 msgid "Space key outputs non-breakable space character at fourth level."
@@ -1995,13 +2012,21 @@
 msgstr "Spatiebalk geeft harde spatie op het tweede niveau."
 
 #: ../rules/base.xml.in.h:491
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Spatiebalk geeft harde spatie op het derde niveau, niets op het vierde niveau."
+msgid ""
+"Space key outputs non-breakable space character at third level, nothing at "
+"fourth level."
+msgstr ""
+"Spatiebalk geeft harde spatie op het derde niveau, niets op het vierde "
+"niveau."
 
 # BUG geen punt op het einde
 #: ../rules/base.xml.in.h:492
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Spatiebalk geeft harde spatie op het derde niveau, smalle harde spatie op het vierde niveau."
+msgid ""
+"Space key outputs non-breakable space character at third level, thin non-"
+"breakable space character at fourth level"
+msgstr ""
+"Spatiebalk geeft harde spatie op het derde niveau, smalle harde spatie op "
+"het vierde niveau."
 
 #: ../rules/base.xml.in.h:493
 msgid "Space key outputs non-breakable space character at third level."
@@ -2078,7 +2103,9 @@
 # dit is de uitleg van bovenstaand bericht
 #: ../rules/base.xml.in.h:512
 msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "De keycodes van twee toetsen verwisselen wanneer Mac-toetsenborden niet juist herkend worden door de kernel."
+msgstr ""
+"De keycodes van twee toetsen verwisselen wanneer Mac-toetsenborden niet "
+"juist herkend worden door de kernel."
 
 #: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
 msgid "Swe"
@@ -2306,7 +2333,8 @@
 
 #: ../rules/base.xml.in.h:568
 msgid "Using space key to input non-breakable space character"
-msgstr "Spatiebalk gebruiken voor het invoeren van niet-afbrekende (harde) spaties"
+msgstr ""
+"Spatiebalk gebruiken voor het invoeren van niet-afbrekende (harde) spaties"
 
 #: ../rules/base.xml.in.h:569
 msgid "Uzb"
@@ -2326,11 +2354,17 @@
 
 #: ../rules/base.xml.in.h:573
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 cijferblok met unicode-aanvullingen (pijlen en wiskundige operatoren)"
+msgstr ""
+"Wang 724 cijferblok met unicode-aanvullingen (pijlen en wiskundige "
+"operatoren)"
 
 #: ../rules/base.xml.in.h:574
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Wang 724 cijferblok met unicode aanvullingen (pijlen en wiskundige operatoren). Wiskundige operatoren op het standaard niveau."
+msgid ""
+"Wang 724 keypad with unicode additions (arrows and math operators). Math "
+"operators on default level."
+msgstr ""
+"Wang 724 cijferblok met unicode aanvullingen (pijlen en wiskundige "
+"operatoren). Wiskundige operatoren op het standaard niveau."
 
 #: ../rules/base.xml.in.h:575
 msgid "Wang model 724 azerty"
@@ -2590,8 +2624,11 @@
 msgstr "De rechter Alt-toets geeft het 3e niveau"
 
 #: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "De rechter Alt-toets geeft het 3e niveau, Shift+rechter Alt-toets is Multi_Key"
+msgid ""
+"Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr ""
+"De rechter Alt-toets geeft het 3e niveau, Shift+rechter Alt-toets is "
+"Multi_Key"
 
 #: ../rules/sun.xml.in.h:86
 msgid "Press Right Control to choose 3rd level"
@@ -2719,7 +2756,8 @@
 # Caps ipv CapsLock?
 #: ../rules/sun.xml.in.h:130
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "Gebruikt interne conversie naar hoofdletters. Shift heft CapsLock niet op."
+msgstr ""
+"Gebruikt interne conversie naar hoofdletters. Shift heft CapsLock niet op."
 
 #: ../rules/sun.xml.in.h:131
 msgid "bksl"
@@ -2729,6 +2767,20 @@
 msgid "type4"
 msgstr "type4"
 
+#: ../rules/base.xml.in.h:81
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:322
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternatieve optie)"
+
+#: ../rules/base.xml.in.h:545
+msgid "Use keypad with unicode additions (arrows and math operators)"
+msgstr ""
+"Cijferblok gebruiken met unicode aanvullingen (pijlen en wiskundige "
+"operatoren)"
+
 #~ msgid "Acer TravelMate 800"
 #~ msgstr "Acer TravelMate 800"
 
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/uk.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/uk.po
@@ -485,11 +485,15 @@
 
 #: ../rules/base.xml.in.h:118
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock використовує внутрішнє збільшення літер. Shift \"призупиняє\" CapsLock."
+msgstr ""
+"CapsLock використовує внутрішнє збільшення літер. Shift \"призупиняє\" "
+"CapsLock."
 
 #: ../rules/base.xml.in.h:119
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock використовує внутрішнє збільшення літер. Shift не впливає на CapsLock."
+msgstr ""
+"CapsLock використовує внутрішнє збільшення літер. Shift не впливає на "
+"CapsLock."
 
 #: ../rules/base.xml.in.h:120
 msgid "Catalan variant with middle-dot L"
@@ -1175,11 +1179,16 @@
 
 #: ../rules/base.xml.in.h:292
 msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Цифрова клавіатура з юнікод-доповненнями (стрілки та математичні оператори)"
+msgstr ""
+"Цифрова клавіатура з юнікод-доповненнями (стрілки та математичні оператори)"
 
 #: ../rules/base.xml.in.h:293
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Цифрова клавіатура з юнікод-доповненнями (стрілки та математичні оператори). Математичні оператори на типовому рівні."
+msgid ""
+"Keypad with unicode additions (arrows and math operators). Math operators on "
+"default level."
+msgstr ""
+"Цифрова клавіатура з юнікод-доповненнями (стрілки та математичні оператори). "
+"Математичні оператори на типовому рівні."
 
 #: ../rules/base.xml.in.h:294
 msgid "Keytronic FlexPro"
@@ -1743,8 +1752,11 @@
 msgstr "Вибір 3-го рівня натисненням клавіші Menu."
 
 #: ../rules/base.xml.in.h:435
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Вибір 3-го рівня натисненням правої клавіші Alt, Shift+права клавіша Alt діє як Multi_Key."
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"Вибір 3-го рівня натисненням правої клавіші Alt, Shift+права клавіша Alt діє "
+"як Multi_Key."
 
 #: ../rules/base.xml.in.h:436
 msgid "Press Right Alt key to choose 3rd level."
@@ -1856,7 +1868,8 @@
 
 #: ../rules/base.xml.in.h:463
 msgid "Romanian keyboard with German letters, eliminate dead keys"
-msgstr "Румунська клавіатура  з німецькими літерами, вимикати спеціальні клавіші"
+msgstr ""
+"Румунська клавіатура  з німецькими літерами, вимикати спеціальні клавіші"
 
 #: ../rules/base.xml.in.h:464
 msgid "Rou"
@@ -1955,8 +1968,12 @@
 msgstr "Південний Узбекистан"
 
 #: ../rules/base.xml.in.h:488
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Клавіша пробіл вдає нерозривний пробіл на 4-му рівні, вузький нерозривний пробіл на 6-му рівні"
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level"
+msgstr ""
+"Клавіша пробіл вдає нерозривний пробіл на 4-му рівні, вузький нерозривний "
+"пробіл на 6-му рівні"
 
 #: ../rules/base.xml.in.h:489
 msgid "Space key outputs non-breakable space character at fourth level."
@@ -1967,12 +1984,20 @@
 msgstr "Клавіша пробіл на другому рівні видає символ нерозривного пробілу."
 
 #: ../rules/base.xml.in.h:491
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Клавіша пробіл на третьому рівні видає символ нерозривного пробілу, на четвертому не дає нічого."
+msgid ""
+"Space key outputs non-breakable space character at third level, nothing at "
+"fourth level."
+msgstr ""
+"Клавіша пробіл на третьому рівні видає символ нерозривного пробілу, на "
+"четвертому не дає нічого."
 
 #: ../rules/base.xml.in.h:492
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Клавіша пробіл вдає нерозривний пробіл на 3-му рівні, вузький нерозривний пробіл на 4-му рівні"
+msgid ""
+"Space key outputs non-breakable space character at third level, thin non-"
+"breakable space character at fourth level"
+msgstr ""
+"Клавіша пробіл вдає нерозривний пробіл на 3-му рівні, вузький нерозривний "
+"пробіл на 4-му рівні"
 
 #: ../rules/base.xml.in.h:493
 msgid "Space key outputs non-breakable space character at third level."
@@ -2046,7 +2071,9 @@
 
 #: ../rules/base.xml.in.h:512
 msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Міняти місцями дві клавіші, коли Mac-клавіатури неправильно визначаються ядром."
+msgstr ""
+"Міняти місцями дві клавіші, коли Mac-клавіатури неправильно визначаються "
+"ядром."
 
 #: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
 msgid "Swe"
@@ -2266,7 +2293,9 @@
 
 #: ../rules/base.xml.in.h:567
 msgid "Use keyboard LED to show alternative layout."
-msgstr "Використовувати клавіатурні індикатори для відображення альтернативних розкладок."
+msgstr ""
+"Використовувати клавіатурні індикатори для відображення альтернативних "
+"розкладок."
 
 #: ../rules/base.xml.in.h:568
 msgid "Using space key to input non-breakable space character"
@@ -2290,11 +2319,16 @@
 
 #: ../rules/base.xml.in.h:573
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Клавіатура Wang 724 з юнікод-доповненнями (стрілки та математичні оператори)"
+msgstr ""
+"Клавіатура Wang 724 з юнікод-доповненнями (стрілки та математичні оператори)"
 
 #: ../rules/base.xml.in.h:574
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Клавіатура Wang 724 з юнікод-доповненнями (стрілки та математичні оператори). Математичні операції на типовому рівні."
+msgid ""
+"Wang 724 keypad with unicode additions (arrows and math operators). Math "
+"operators on default level."
+msgstr ""
+"Клавіатура Wang 724 з юнікод-доповненнями (стрілки та математичні "
+"оператори). Математичні операції на типовому рівні."
 
 #: ../rules/base.xml.in.h:575
 msgid "Wang model 724 azerty"
@@ -2545,8 +2579,11 @@
 msgstr "Вибір 3-го рівня натисненням правої клавіші Alt"
 
 #: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "Вибір 3-го рівня натисненням правої клавіші Alt, Shift+права клавіша Alt діє як Multi_Key"
+msgid ""
+"Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr ""
+"Вибір 3-го рівня натисненням правої клавіші Alt, Shift+права клавіша Alt діє "
+"як Multi_Key"
 
 #: ../rules/sun.xml.in.h:86
 msgid "Press Right Control to choose 3rd level"
@@ -2662,11 +2699,14 @@
 
 #: ../rules/sun.xml.in.h:128
 msgid "Use keyboard LED to show alternative group"
-msgstr "Використовувати клавіатурні індикатори для відображення альтернативних розкладок"
+msgstr ""
+"Використовувати клавіатурні індикатори для відображення альтернативних "
+"розкладок"
 
 #: ../rules/sun.xml.in.h:129
 msgid "Uses internal capitalization. Shift cancels Caps."
-msgstr "Використовує внутрішнє збільшення літер. Shift \"призупиняє\" CapsLock."
+msgstr ""
+"Використовує внутрішнє збільшення літер. Shift \"призупиняє\" CapsLock."
 
 #: ../rules/sun.xml.in.h:130
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
@@ -2680,6 +2720,20 @@
 msgid "type4"
 msgstr "type4"
 
+#: ../rules/base.xml.in.h:81
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:322
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (альтернативний варіант)"
+
+#: ../rules/base.xml.in.h:545
+msgid "Use keypad with unicode additions (arrows and math operators)"
+msgstr ""
+"Використовувати цифрову клавіатуру з юнікод-доповненнями (стрілки та "
+"математичні оператори)"
+
 #~ msgid "Acer TravelMate 800"
 #~ msgstr "Acer TravelMate 800"
 
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/az.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/az.po
@@ -1138,7 +1138,8 @@
 
 #: xfree86.xml.in.h:281
 msgid "Special keys (Ctrl+Alt+<key>) handled in a server."
-msgstr "Xüsusi düymələr (Ctrl+Alt+<düyməsi>) verici tərəfindən idarə edilsin."
+msgstr ""
+"Xüsusi düymələr (Ctrl+Alt+<düyməsi>) verici tərəfindən idarə edilsin."
 
 #: xfree86.xml.in.h:282
 msgid "Standard"
@@ -1463,3 +1464,1185 @@
 #: xfree86.xml.in.h:362
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/nöqtə"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:2
+#, fuzzy
+msgid "101/qwerty/comma/Dead keys"
+msgstr "l2/101/qwerty/vergül"
+
+#: ../rules/base.xml.in.h:3
+#, fuzzy
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:4
+#, fuzzy
+msgid "101/qwerty/dot/Dead keys"
+msgstr "l2/101/qwerty/nöqtə"
+
+#: ../rules/base.xml.in.h:5
+#, fuzzy
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:6
+#, fuzzy
+msgid "101/qwertz/comma/Dead keys"
+msgstr "l2/101/qwertz/vergül"
+
+#: ../rules/base.xml.in.h:7
+#, fuzzy
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:8
+#, fuzzy
+msgid "101/qwertz/dot/Dead keys"
+msgstr "2/101/qwertz/nöqtə"
+
+#: ../rules/base.xml.in.h:9
+#, fuzzy
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:10
+#, fuzzy
+msgid "102/qwerty/comma/Dead keys"
+msgstr "l2/102/qwerty/vergül"
+
+#: ../rules/base.xml.in.h:11
+#, fuzzy
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:12
+#, fuzzy
+msgid "102/qwerty/dot/Dead keys"
+msgstr "l2/102/qwerty/nöqtə"
+
+#: ../rules/base.xml.in.h:13
+#, fuzzy
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:14
+#, fuzzy
+msgid "102/qwertz/comma/Dead keys"
+msgstr "l2/102/qwertz/vergül"
+
+#: ../rules/base.xml.in.h:15
+#, fuzzy
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:16
+#, fuzzy
+msgid "102/qwertz/dot/Dead keys"
+msgstr "l2/102/qwertz/nöqtə"
+
+#: ../rules/base.xml.in.h:17
+#, fuzzy
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr ""
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr ""
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30
+#, fuzzy
+msgid "Albania"
+msgstr "Albanca"
+
+#: ../rules/base.xml.in.h:31
+#, fuzzy
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt düymələri üstündə Alt və Meta (ön qurğulu)."
+
+#: ../rules/base.xml.in.h:32
+#, fuzzy
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Meta sol Win düyməsinə xəritələnib."
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Control düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:34
+#, fuzzy
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:37
+#, fuzzy
+msgid "Alternative"
+msgstr "Əvəz Et"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative international (former us_intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:39
+#, fuzzy
+msgid "Alternative, Sun dead keys"
+msgstr "Sun ölü düymələr"
+
+#: ../rules/base.xml.in.h:40
+#, fuzzy
+msgid "Alternative, eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:41
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:42
+#, fuzzy
+msgid "Ara"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:45
+#, fuzzy
+msgid "Armenia"
+msgstr "Ermənicə"
+
+#: ../rules/base.xml.in.h:47
+#, fuzzy
+msgid "Azerbaijan"
+msgstr "Azərbaycanca"
+
+#: ../rules/base.xml.in.h:48
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:55
+#, fuzzy
+msgid "Ban"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:56
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:58
+#, fuzzy
+msgid "Belarus"
+msgstr "Belarusca"
+
+#: ../rules/base.xml.in.h:59
+#, fuzzy
+msgid "Belgium"
+msgstr "Belçikaca"
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:63
+#, fuzzy
+msgid "Bhu"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:64
+#, fuzzy
+msgid "Bhutan"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../rules/base.xml.in.h:68
+#, fuzzy
+msgid "Both Alt keys together change group."
+msgstr "İki Alt düyməsi də bərabər qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:69
+#, fuzzy
+msgid "Both Ctrl keys together change group."
+msgstr "İki Ctrl düyməsi də bərabər qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:70
+#, fuzzy
+msgid "Both Shift keys together change group."
+msgstr "Hər iki Shift düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:71
+#, fuzzy
+msgid "Both Win-keys switch group while pressed."
+msgstr "İki Win düyməsi də basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:73
+#, fuzzy
+msgid "Brazil"
+msgstr "Brazilya düzülüşü"
+
+#: ../rules/base.xml.in.h:76
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Bolqarca"
+
+#: ../rules/base.xml.in.h:78
+#, fuzzy
+msgid "Canada"
+msgstr "Kanada düzülüşü"
+
+#: ../rules/base.xml.in.h:79
+#, fuzzy
+msgid "CapsLock LED shows alternative group."
+msgstr "Caps_Lock LED-ləri alternativ qrupları göstərir"
+
+#: ../rules/base.xml.in.h:80
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Qıfıllı Shift kimi davranır. Shift Caps-i ləğv edir."
+
+#: ../rules/base.xml.in.h:81
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Qıfıllı Shift kimi davranır. Shift Caps-i ləğv etmir."
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+
+#: ../rules/base.xml.in.h:84
+#, fuzzy
+msgid "CapsLock key changes group."
+msgstr "Caps Lock düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+
+#: ../rules/base.xml.in.h:87
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "Daxili kapitalizasiya işlədir. Shift Caps-i ləğv edir."
+
+#: ../rules/base.xml.in.h:88
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "Daxili kapitalizasiya işlədir. Shift Caps-i ləğv etmir."
+
+#: ../rules/base.xml.in.h:89
+#, fuzzy
+msgid "Che"
+msgstr "Çex"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:101
+#, fuzzy
+msgid "Compose key position"
+msgstr "Control Düyməsinin Yeri"
+
+#: ../rules/base.xml.in.h:102
+#, fuzzy
+msgid "Croatia"
+msgstr "Xorvatca"
+
+#: ../rules/base.xml.in.h:103
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Control düyməsi sol altda"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Control düyməsi 'A' hərfinin solunda"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Control Düyməsinin Yeri"
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Control+Shift düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:109
+#, fuzzy
+msgid "Czechia"
+msgstr "Çexcə"
+
+#: ../rules/base.xml.in.h:110
+msgid "DTK2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:115
+#, fuzzy
+msgid "Denmark"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+#, fuzzy
+msgid "Estonia"
+msgstr "Estonca"
+
+#: ../rules/base.xml.in.h:130
+#, fuzzy
+msgid "Extended Backslash"
+msgstr "Uzadılmış"
+
+#: ../rules/base.xml.in.h:131
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:133
+#, fuzzy
+msgid "Faroe Islands"
+msgstr "Faroescə"
+
+#: ../rules/base.xml.in.h:135
+#, fuzzy
+msgid "Finland"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:137
+#, fuzzy
+msgid "France"
+msgstr "Fransızca"
+
+#: ../rules/base.xml.in.h:139
+#, fuzzy
+msgid "French (legacy)"
+msgstr "Fransızca (alternativ)"
+
+#: ../rules/base.xml.in.h:140
+#, fuzzy
+msgid "French Dvorak"
+msgstr "Fransızca"
+
+#: ../rules/base.xml.in.h:141
+#, fuzzy
+msgid "French, Sun dead keys"
+msgstr "Sun ölü düymələr"
+
+#: ../rules/base.xml.in.h:142
+#, fuzzy
+msgid "French, eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:149
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: ../rules/base.xml.in.h:151
+#, fuzzy
+msgid "Georgia"
+msgstr "Almaca"
+
+#: ../rules/base.xml.in.h:152
+#, fuzzy
+msgid "German, Sun dead keys"
+msgstr "Sun ölü düymələr"
+
+#: ../rules/base.xml.in.h:153
+#, fuzzy
+msgid "German, eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:154
+#, fuzzy
+msgid "Germany"
+msgstr "Almaca"
+
+#: ../rules/base.xml.in.h:155
+#, fuzzy
+msgid "Gre"
+msgstr "Yunanca"
+
+#: ../rules/base.xml.in.h:156
+#, fuzzy
+msgid "Greece"
+msgstr "Yunanca"
+
+#: ../rules/base.xml.in.h:160
+#, fuzzy
+msgid "Gyration"
+msgstr "Xorvatca"
+
+#: ../rules/base.xml.in.h:174
+#, fuzzy
+msgid "Hungary"
+msgstr "Macarca"
+
+#: ../rules/base.xml.in.h:181
+#, fuzzy
+msgid "Iceland"
+msgstr "Icelandic"
+
+#: ../rules/base.xml.in.h:182
+#, fuzzy
+msgid "Ind"
+msgstr "İrn"
+
+#: ../rules/base.xml.in.h:183
+#, fuzzy
+msgid "India"
+msgstr "Ukraynaca"
+
+#: ../rules/base.xml.in.h:184
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:186
+#, fuzzy
+msgid "Iran"
+msgstr "İrn"
+
+#: ../rules/base.xml.in.h:187
+#, fuzzy
+msgid "Ireland"
+msgstr "Icelandic"
+
+#: ../rules/base.xml.in.h:192
+#, fuzzy
+msgid "Israel"
+msgstr "Yəhudicə"
+
+#: ../rules/base.xml.in.h:194
+#, fuzzy
+msgid "Italy"
+msgstr "İta"
+
+#: ../rules/base.xml.in.h:195
+#, fuzzy
+msgid "Japan"
+msgstr "Yaponca"
+
+#: ../rules/base.xml.in.h:199
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:201
+#, fuzzy
+msgid "Kyr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:204
+#, fuzzy
+msgid "Lao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:205
+#, fuzzy
+msgid "Laos"
+msgstr "Laptop"
+
+#: ../rules/base.xml.in.h:210
+#, fuzzy
+msgid "Latin American"
+msgstr "Latın Amerika"
+
+#: ../rules/base.xml.in.h:211
+#, fuzzy
+msgid "Latin Unicode"
+msgstr "Latın Amerika"
+
+#: ../rules/base.xml.in.h:212
+#, fuzzy
+msgid "Latin Unicode qwerty"
+msgstr "Latın Amerika"
+
+#: ../rules/base.xml.in.h:213
+#, fuzzy
+msgid "Latin qwerty"
+msgstr "Macarca (qwerty)"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:215
+#, fuzzy
+msgid "Latvia"
+msgstr "Latışca"
+
+#: ../rules/base.xml.in.h:216
+#, fuzzy
+msgid "Left Alt key changes group."
+msgstr "Sol Alt düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:217
+#, fuzzy
+msgid "Left Alt key switches group while pressed."
+msgstr "Sol Win düyməsi basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:218
+#, fuzzy
+msgid "Left Ctrl key changes group."
+msgstr "Sol Ctrl düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:219
+#, fuzzy
+msgid "Left Shift key changes group."
+msgstr "Sol Shift düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:220
+#, fuzzy
+msgid "Left Win-key changes group."
+msgstr "Sol Win düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:221
+#, fuzzy
+msgid "Left Win-key switches group while pressed."
+msgstr "Sol Win düyməsi basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:222
+msgid "Lithuania"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: ../rules/base.xml.in.h:235
+#, fuzzy
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "Makedonca"
+
+#: ../rules/base.xml.in.h:244
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "CapsLock düyməsini əlavə idarə olaraq tə'yin et"
+
+#: ../rules/base.xml.in.h:247
+#, fuzzy
+msgid "Maldives"
+msgstr "Maltaca"
+
+#: ../rules/base.xml.in.h:248
+#, fuzzy
+msgid "Malta"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:249
+#, fuzzy
+msgid "Mao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:250
+#, fuzzy
+msgid "Maori"
+msgstr "Farsca"
+
+#: ../rules/base.xml.in.h:254
+#, fuzzy
+msgid "Menu is Compose."
+msgstr "Menyu yazma düyməsidir"
+
+#: ../rules/base.xml.in.h:255
+#, fuzzy
+msgid "Menu key changes group."
+msgstr "Menü düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:263
+#, fuzzy
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:265
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:271
+#, fuzzy
+msgid "Mongolia"
+msgstr "Monqolca"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr ""
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274
+#, fuzzy
+msgid "Myanmar"
+msgstr "Danimarkaca"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr ""
+
+#: ../rules/base.xml.in.h:278
+#, fuzzy
+msgid "Northern Saami"
+msgstr "Şimali Saami (Norveç)"
+
+#: ../rules/base.xml.in.h:279
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:281
+#, fuzzy
+msgid "Norway"
+msgstr "Norveçcə"
+
+#: ../rules/base.xml.in.h:282
+#, fuzzy
+msgid "NumLock LED shows alternative group."
+msgstr "Num_Lock LED-ləri alternativ qrupları göstərir"
+
+#: ../rules/base.xml.in.h:284
+#, fuzzy
+msgid "Ogham IS434"
+msgstr "IS434"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+#, fuzzy
+msgid "Pakistan"
+msgstr "Tacikcə"
+
+#: ../rules/base.xml.in.h:290
+#, fuzzy
+msgid "Pattachote"
+msgstr "Tayca (Pattachote)"
+
+#: ../rules/base.xml.in.h:293
+#, fuzzy
+msgid "Poland"
+msgstr "Pan"
+
+#: ../rules/base.xml.in.h:295
+#, fuzzy
+msgid "Portugal"
+msgstr "Portuqalca"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:298
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "3-cü səviyyəni seçmək üçün sol Win düyməsinə basılsın"
+
+#: ../rules/base.xml.in.h:299
+#, fuzzy
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "3-cü səviyyəni seçmək üçün sol Win düyməsinə basılsın"
+
+#: ../rules/base.xml.in.h:300
+#, fuzzy
+msgid "Press Menu key to choose 3rd level."
+msgstr "3-cü səviyyəni seçmək üçün sağ menyuya basılsın"
+
+#: ../rules/base.xml.in.h:301
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "3-cü səviyyəni seçmək üçün sağ Win düyməsinə basılsın"
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "3-cü səviyyəni seçmək üçün sağ Control düyməsinə basılsın"
+
+#: ../rules/base.xml.in.h:303
+#, fuzzy
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "3-cü səviyyəni seçmək üçün sağ Win düyməsinə basılsın"
+
+#: ../rules/base.xml.in.h:304
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "3-cü səviyyəni seçmək üçün hər hansı bir Win düyməsinə basılsın"
+
+#: ../rules/base.xml.in.h:305
+#, fuzzy
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "3-cü səviyyəni seçmək üçün hər hansı bir Win düyməsinə basılsın"
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Pro"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:307
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+#, fuzzy
+msgid "Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:312
+#, fuzzy
+msgid "R-Alt switches group while pressed."
+msgstr "R-Alt basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:313
+#, fuzzy
+msgid "Right Alt is Compose."
+msgstr "Sağ Alt düyməsi yazma düyməsidir"
+
+#: ../rules/base.xml.in.h:314
+#, fuzzy
+msgid "Right Alt key changes group."
+msgstr "Sağ Alt düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:315
+#, fuzzy
+msgid "Right Ctrl is Compose."
+msgstr "Sağ Alt düyməsi yazma düyməsidir"
+
+#: ../rules/base.xml.in.h:316
+#, fuzzy
+msgid "Right Ctrl key changes group."
+msgstr "Sağ Ctrl düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:317
+#, fuzzy
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Sağ Win düyməsi basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Sağ Control düyməsi sağ Alt kimi işləyir"
+
+#: ../rules/base.xml.in.h:319
+#, fuzzy
+msgid "Right Shift key changes group."
+msgstr "Sağ Shift düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:320
+#, fuzzy
+msgid "Right Win-key changes group."
+msgstr "Sağ Win düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:321
+#, fuzzy
+msgid "Right Win-key is Compose."
+msgstr "Sağ Win düyməsi yazma düyməsidir"
+
+#: ../rules/base.xml.in.h:322
+#, fuzzy
+msgid "Right Win-key switches group while pressed."
+msgstr "Sağ Win düyməsi basılı olduğu müddətcə qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:323
+#, fuzzy
+msgid "Romania"
+msgstr "Rumınca"
+
+#: ../rules/base.xml.in.h:324
+#, fuzzy
+msgid "Romanian keyboard with German letters"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:325
+#, fuzzy
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:328
+#, fuzzy
+msgid "Russia"
+msgstr "Rusca"
+
+#: ../rules/base.xml.in.h:330
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Rusca"
+
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Ölü düymələri sayma"
+
+#: ../rules/base.xml.in.h:332
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:340
+#, fuzzy
+msgid "ScrollLock LED shows alternative group."
+msgstr "Scroll_Lock LED-ləri alternativ qrupları göstərir"
+
+#: ../rules/base.xml.in.h:341
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342
+#, fuzzy
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Ədəd düymələrində Shift MS Windows-dakı kimi işləyir"
+
+#: ../rules/base.xml.in.h:343
+#, fuzzy
+msgid "Shift+CapsLock changes group."
+msgstr "Caps Lock düyməsi qrupu dəyişdirir"
+
+#: ../rules/base.xml.in.h:344
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovakca"
+
+#: ../rules/base.xml.in.h:345
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovencə"
+
+#: ../rules/base.xml.in.h:346
+#, fuzzy
+msgid "Spain"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "SrL"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "Servcə"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "Standart"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:354
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:356
+#, fuzzy
+msgid "Super Power Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:360
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Control və Caps Lock arasında dəyiş"
+
+#: ../rules/base.xml.in.h:362
+#, fuzzy
+msgid "Sweden"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:363
+#, fuzzy
+msgid "Switzerland"
+msgstr "İsveçrə Almancası"
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Syria"
+msgstr "Syriac"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Rusca"
+
+#: ../rules/base.xml.in.h:369
+#, fuzzy
+msgid "TIS-820.2538"
+msgstr "Tayca (TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:370
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tacikcə"
+
+#: ../rules/base.xml.in.h:372
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "\"Yazı Makinası\""
+
+#: ../rules/base.xml.in.h:373
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+#, fuzzy
+msgid "Tamil Unicode"
+msgstr "Latın Amerika"
+
+#: ../rules/base.xml.in.h:377
+#, fuzzy
+msgid "Thailand"
+msgstr "Tay"
+
+#: ../rules/base.xml.in.h:379
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386
+#, fuzzy
+msgid "Typewriter"
+msgstr "\"Yazı Makinası\""
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:390
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:391
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:392
+#, fuzzy
+msgid "US keyboard with Lithuanian letters"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:393
+#, fuzzy
+msgid "US keyboard with Maltian letters"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:394
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "Roman hərfli ABŞ klaviaturası"
+
+#: ../rules/base.xml.in.h:398
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukraynaca"
+
+#: ../rules/base.xml.in.h:401
+msgid "Urdu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:402
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+#, fuzzy
+msgid "Use keyboard LED to show alternative group."
+msgstr "Alternativ qrupu göstərmək üçün klaviatura LED-ini işlət"
+
+#: ../rules/base.xml.in.h:408
+#, fuzzy
+msgid "Uzbekistan"
+msgstr "Özbəkcə"
+
+#: ../rules/base.xml.in.h:409
+#, fuzzy
+msgid "Vietnam"
+msgstr "Vyetnamca"
+
+#: ../rules/base.xml.in.h:413
+msgid "With <\\|> key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:414
+msgid "With guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:416
+msgid "Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:422
+msgid "qwerty, extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:424
+#, fuzzy
+msgid "qwertz"
+msgstr "qwerty"
+
+#, fuzzy
+#~ msgid "\"Standard\""
+#~ msgstr "Standart"
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "Roman hərfli ABŞ klaviaturası"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "Servcə"
+
+#, fuzzy
+#~ msgid "Srp"
+#~ msgstr "Syr"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Benqalca"
+
+#, fuzzy
+#~ msgid "Ogham IS434 laptop"
+#~ msgstr "IS434 laptop"
+
+#, fuzzy
+#~ msgid "Ogham laptop"
+#~ msgstr "laptop"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "Rusca"
+
+#, fuzzy
+#~ msgid "Malayalam with Malayalam digits"
+#~ msgstr "Malayalamca"
+
+#, fuzzy
+#~ msgid "Dzo"
+#~ msgstr "Dvo"
+
+#, fuzzy
+#~ msgid "Gurmukhi INSCRIPT"
+#~ msgstr "Gurmukhi"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "Kannada"
+
+#, fuzzy
+#~ msgid "Smi"
+#~ msgstr "Sapmi"
+
+#, fuzzy
+#~ msgid "Deva"
+#~ msgstr "Dvorak"
+
+#, fuzzy
+#~ msgid "Ogam"
+#~ msgstr "Ogham"
+
+#, fuzzy
+#~ msgid "Sin"
+#~ msgstr "Svn"
+
+#, fuzzy
+#~ msgid "Tam"
+#~ msgstr "Tamilcə"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TAB encoding"
+#~ msgstr "Tamil yazı makinası tərzində düzülüş TAB kodlaması"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "Tamil yazı makinası tərzində düzülüş TSCII kodlaması"
+
+#, fuzzy
+#~ msgid "Urd"
+#~ msgstr "Ukr"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; Unicode encoding"
+#~ msgstr "Tamil yazı makinası tərzində düzülüş Yunikod kodlaması"
+
+#, fuzzy
+#~ msgid "Kedmanee"
+#~ msgstr "Tayca (Kedmanee)"
+
+#, fuzzy
+#~ msgid "Old standard"
+#~ msgstr "Standart"
+
+#, fuzzy
+#~ msgid "Swiss"
+#~ msgstr "İsveçcə"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/sv.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/sv.po
@@ -464,7 +464,8 @@
 
 #: ../rules/base.xml.in.h:112
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "CapsLock fungerar som Skift med låsning. Skift påverkar inte Caps Lock."
+msgstr ""
+"CapsLock fungerar som Skift med låsning. Skift påverkar inte Caps Lock."
 
 #: ../rules/base.xml.in.h:113
 msgid "CapsLock just locks the Shift modifier."
@@ -488,11 +489,13 @@
 
 #: ../rules/base.xml.in.h:118
 msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
-msgstr "CapsLock använder intern skiftlägesstyrning. Skift \"pausar\" CapsLock."
+msgstr ""
+"CapsLock använder intern skiftlägesstyrning. Skift \"pausar\" CapsLock."
 
 #: ../rules/base.xml.in.h:119
 msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
-msgstr "CapsLock använder intern skiftlägesstyrning. Skift påverkar inte CapsLock."
+msgstr ""
+"CapsLock använder intern skiftlägesstyrning. Skift påverkar inte CapsLock."
 
 #: ../rules/base.xml.in.h:120
 msgid "Catalan variant with middle-dot L"
@@ -592,7 +595,8 @@
 
 #: ../rules/base.xml.in.h:144
 msgid "Control is mapped to the Win-keys (and the usual Ctrl keys)."
-msgstr "Control är mappat till Win-tangenterna (och de vanliga Ctrl-tangenterna)."
+msgstr ""
+"Control är mappat till Win-tangenterna (och de vanliga Ctrl-tangenterna)."
 
 #: ../rules/base.xml.in.h:145
 msgid "Croatia"
@@ -1180,11 +1184,16 @@
 
 #: ../rules/base.xml.in.h:292
 msgid "Keypad with unicode additions (arrows and math operators)"
-msgstr "Numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer)"
+msgstr ""
+"Numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer)"
 
 #: ../rules/base.xml.in.h:293
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå."
+msgid ""
+"Keypad with unicode additions (arrows and math operators). Math operators on "
+"default level."
+msgstr ""
+"Numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer). "
+"Matematikoperatorer på standardnivå."
 
 #: ../rules/base.xml.in.h:294
 msgid "Keytronic FlexPro"
@@ -1749,8 +1758,11 @@
 msgstr "Tryck Meny-tangenten för att välja tredjenivå."
 
 #: ../rules/base.xml.in.h:435
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Tryck höger Alt-tangent för att välja tredjenivå. Skft+höger Alt-tangent är Multi_Key."
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"Tryck höger Alt-tangent för att välja tredjenivå. Skft+höger Alt-tangent är "
+"Multi_Key."
 
 #: ../rules/base.xml.in.h:436
 msgid "Press Right Alt key to choose 3rd level."
@@ -1938,7 +1950,8 @@
 
 #: ../rules/base.xml.in.h:482
 msgid "Shift with numeric keypad keys works as in MS Windows."
-msgstr "Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows."
+msgstr ""
+"Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows."
 
 #: ../rules/base.xml.in.h:483
 msgid "Shift+CapsLock changes layout."
@@ -1961,28 +1974,42 @@
 msgstr "Södra Uzbekistan"
 
 #: ../rules/base.xml.in.h:488
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån, tunt icke-brytande blankstegstecken på sjätte nivån"
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level"
+msgstr ""
+"Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån, tunt "
+"icke-brytande blankstegstecken på sjätte nivån"
 
 #: ../rules/base.xml.in.h:489
 msgid "Space key outputs non-breakable space character at fourth level."
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån."
+msgstr ""
+"Blankstegstangenten skriver ut icke-brytande blanksteg på fjärde nivån."
 
 #: ../rules/base.xml.in.h:490
 msgid "Space key outputs non-breakable space character at second level."
 msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på andra nivån."
 
 #: ../rules/base.xml.in.h:491
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån, ingenting på fjärde nivån."
+msgid ""
+"Space key outputs non-breakable space character at third level, nothing at "
+"fourth level."
+msgstr ""
+"Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån, "
+"ingenting på fjärde nivån."
 
 #: ../rules/base.xml.in.h:492
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån, tunt icke-brytande blankstegstecken på fjärde nivån"
+msgid ""
+"Space key outputs non-breakable space character at third level, thin non-"
+"breakable space character at fourth level"
+msgstr ""
+"Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån, tunt "
+"icke-brytande blankstegstecken på fjärde nivån"
 
 #: ../rules/base.xml.in.h:493
 msgid "Space key outputs non-breakable space character at third level."
-msgstr "Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån."
+msgstr ""
+"Blankstegstangenten skriver ut icke-brytande blanksteg på tredje nivån."
 
 #: ../rules/base.xml.in.h:494
 msgid "Space key outputs usual space at any level."
@@ -2052,7 +2079,9 @@
 
 #: ../rules/base.xml.in.h:512
 msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Byt tangentkoder för två tangenter när Mac-tangentbord identifieras fel av kärnan."
+msgstr ""
+"Byt tangentkoder för två tangenter när Mac-tangentbord identifieras fel av "
+"kärnan."
 
 #: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
 msgid "Swe"
@@ -2276,7 +2305,8 @@
 
 #: ../rules/base.xml.in.h:568
 msgid "Using space key to input non-breakable space character"
-msgstr "Använder blankstegstangenten för att mata in icke-brytande blankstegstecken"
+msgstr ""
+"Använder blankstegstangenten för att mata in icke-brytande blankstegstecken"
 
 #: ../rules/base.xml.in.h:569
 msgid "Uzb"
@@ -2296,11 +2326,17 @@
 
 #: ../rules/base.xml.in.h:573
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Wang 724 numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer)"
+msgstr ""
+"Wang 724 numeriskt tangentbord med unicode-tillägg (pilar och "
+"matematikoperatorer)"
 
 #: ../rules/base.xml.in.h:574
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Wang 724 numeriskt tangentbord med unicode-tillägg (pilar och matematikoperatorer). Matematikoperatorer på standardnivå."
+msgid ""
+"Wang 724 keypad with unicode additions (arrows and math operators). Math "
+"operators on default level."
+msgstr ""
+"Wang 724 numeriskt tangentbord med unicode-tillägg (pilar och "
+"matematikoperatorer). Matematikoperatorer på standardnivå."
 
 #: ../rules/base.xml.in.h:575
 msgid "Wang model 724 azerty"
@@ -2551,8 +2587,11 @@
 msgstr "Tryck höger Alt-tangent för att välja tredjenivå"
 
 #: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "Tryck höger Alt-tangent för att välja tredjenivå. Skift+höger Alt-tangent är Multi_Key"
+msgid ""
+"Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr ""
+"Tryck höger Alt-tangent för att välja tredjenivå. Skift+höger Alt-tangent är "
+"Multi_Key"
 
 #: ../rules/sun.xml.in.h:86
 msgid "Press Right Control to choose 3rd level"
@@ -2592,7 +2631,8 @@
 
 #: ../rules/sun.xml.in.h:99
 msgid "Shift with numpad keys works as in MS Windows"
-msgstr "Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows"
+msgstr ""
+"Skift med tangenterna på numeriska tangentbordet fungerar som i MS Windows"
 
 #: ../rules/sun.xml.in.h:100
 msgid "Shift+CapsLock changes group"
@@ -2686,6 +2726,20 @@
 msgid "type4"
 msgstr "type4"
 
+#: ../rules/base.xml.in.h:81
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
+
+#: ../rules/base.xml.in.h:322
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (alternativ)"
+
+#: ../rules/base.xml.in.h:545
+msgid "Use keypad with unicode additions (arrows and math operators)"
+msgstr ""
+"Använd numeriskt tangentbord med unicode-tillägg (pilar och "
+"matematikoperatorer)"
+
 #~ msgid "Acer TravelMate 800"
 #~ msgstr "Acer TravelMate 800"
 
@@ -2711,7 +2765,9 @@
 #~ msgstr "Logitech Cordless Desktop iTouch"
 
 #~ msgid "Adding the nobreakspace keysym to space key"
-#~ msgstr "Lägger till den icke-brytande blankstegstangentsymbolen till blankstegstangenten"
+#~ msgstr ""
+#~ "Lägger till den icke-brytande blankstegstangentsymbolen till "
+#~ "blankstegstangenten"
 
 #~ msgid "PowerPC PS/2"
 #~ msgstr "PowerPC PS/2"
@@ -3005,7 +3061,8 @@
 #~ msgstr "Behåll separat grupp för varje programfönster."
 
 #~ msgid "Keep the state of indicators separately for each application window."
-#~ msgstr "Behåll tillståndet för indikatorerna separat för varje programfönster."
+#~ msgstr ""
+#~ "Behåll tillståndet för indikatorerna separat för varje programfönster."
 
 #~ msgid "Save/restore _indicators with group"
 #~ msgstr "Spara/återställ _indikatorer med grupp"
@@ -3047,7 +3104,8 @@
 #~ msgstr "Välj layout."
 
 #~ msgid "Choose the layout. Note: one layout can provide several groups."
-#~ msgstr "Välj layouten. Observera att en layout kan tillhandahålla flera grupper."
+#~ msgstr ""
+#~ "Välj layouten. Observera att en layout kan tillhandahålla flera grupper."
 
 #~ msgid "Choose the model of the keyboard (brand, number of keys, etc.)."
 #~ msgstr "Välj modellen på tangentbordet (märke, antal tangenter, osv.)."
@@ -3074,13 +3132,21 @@
 #~ msgstr "Visa _avancerade parametrar"
 
 #~ msgid "Show tabs with advanced keyboard parameters (for power users)."
-#~ msgstr "Visa flikar med avancerade tangentbordsparametrar (för avancerade användare)."
+#~ msgstr ""
+#~ "Visa flikar med avancerade tangentbordsparametrar (för avancerade "
+#~ "användare)."
 
-#~ msgid "This version of XFree86 does not support multiple layouts, so only one layout can be choosen."
-#~ msgstr "Denna version av XFree86 stöder inte flera layouter, så endast en layout kan väljas."
+#~ msgid ""
+#~ "This version of XFree86 does not support multiple layouts, so only one "
+#~ "layout can be choosen."
+#~ msgstr ""
+#~ "Denna version av XFree86 stöder inte flera layouter, så endast en layout "
+#~ "kan väljas."
 
 #~ msgid "Use custom settings, ignore global configuration set in XF86Config."
-#~ msgstr "Använd anpassade inställningar, ignorera global konfiguration som är angiven i XF86Config."
+#~ msgstr ""
+#~ "Använd anpassade inställningar, ignorera global konfiguration som är "
+#~ "angiven i XF86Config."
 
 #~ msgid "Use global configuration set in XF86Config."
 #~ msgstr "Använd global konfiguration som är angiven i XF86Config."
@@ -3145,8 +3211,12 @@
 #~ msgid "Show layout names instead of group names"
 #~ msgstr "Visa layoutnamn istället för gruppnamn"
 
-#~ msgid "Show layout names instead of group names (only for versions of XFree supporting multiple layouts)"
-#~ msgstr "Visa layoutnamn istället för gruppnamn (endast för versioner av XFree som stöder flera layouter)"
+#~ msgid ""
+#~ "Show layout names instead of group names (only for versions of XFree "
+#~ "supporting multiple layouts)"
+#~ msgstr ""
+#~ "Visa layoutnamn istället för gruppnamn (endast för versioner av XFree som "
+#~ "stöder flera layouter)"
 
 #~ msgid "The id of active switchcut"
 #~ msgstr "Id för den aktiva genvägen"
@@ -3345,3 +3415,15 @@
 
 #~ msgid "Layout:"
 #~ msgstr "Layout:"
+
+#~ msgid "Guj"
+#~ msgstr "Guj"
+
+#~ msgid "Laptop"
+#~ msgstr "Bärbar dator"
+
+#~ msgid "Clear"
+#~ msgstr "Töm"
+
+#~ msgid "General"
+#~ msgstr "Allmänt"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/sq.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/sq.po
@@ -1463,3 +1463,1184 @@
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/pikë"
 
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:2
+#, fuzzy
+msgid "101/qwerty/comma/Dead keys"
+msgstr "l2/101/qwerty/presje"
+
+#: ../rules/base.xml.in.h:3
+#, fuzzy
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:4
+#, fuzzy
+msgid "101/qwerty/dot/Dead keys"
+msgstr "l2/101/qwerty/pikë"
+
+#: ../rules/base.xml.in.h:5
+#, fuzzy
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:6
+#, fuzzy
+msgid "101/qwertz/comma/Dead keys"
+msgstr "l2/101/qwertz/presje"
+
+#: ../rules/base.xml.in.h:7
+#, fuzzy
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:8
+#, fuzzy
+msgid "101/qwertz/dot/Dead keys"
+msgstr "l2/101/qwertz/pikë"
+
+#: ../rules/base.xml.in.h:9
+#, fuzzy
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:10
+#, fuzzy
+msgid "102/qwerty/comma/Dead keys"
+msgstr "l2/102/qwerty/presje"
+
+#: ../rules/base.xml.in.h:11
+#, fuzzy
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:12
+#, fuzzy
+msgid "102/qwerty/dot/Dead keys"
+msgstr "l2/102/qwerty/pikë"
+
+#: ../rules/base.xml.in.h:13
+#, fuzzy
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:14
+#, fuzzy
+msgid "102/qwertz/comma/Dead keys"
+msgstr "l2/102/qwertz/presje"
+
+#: ../rules/base.xml.in.h:15
+#, fuzzy
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:16
+#, fuzzy
+msgid "102/qwertz/dot/Dead keys"
+msgstr "l2/102/qwertz/pikë"
+
+#: ../rules/base.xml.in.h:17
+#, fuzzy
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr ""
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr ""
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30
+#, fuzzy
+msgid "Albania"
+msgstr "Shqip"
+
+#: ../rules/base.xml.in.h:31
+#, fuzzy
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt dhe Meta tek pulsanti Alt (e prezgjedhur)."
+
+#: ../rules/base.xml.in.h:32
+#, fuzzy
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Meta është vendosur tek pulsanti i majtë Win."
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Control ndryshon grupin"
+
+#: ../rules/base.xml.in.h:34
+#, fuzzy
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift ndryshon grupin"
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:37
+#, fuzzy
+msgid "Alternative"
+msgstr "Alterno"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative international (former us_intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:39
+#, fuzzy
+msgid "Alternative, Sun dead keys"
+msgstr "Pulsantë të vdekur Sun"
+
+#: ../rules/base.xml.in.h:40
+#, fuzzy
+msgid "Alternative, eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:41
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:42
+#, fuzzy
+msgid "Ara"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:45
+#, fuzzy
+msgid "Armenia"
+msgstr "Armenisht"
+
+#: ../rules/base.xml.in.h:47
+#, fuzzy
+msgid "Azerbaijan"
+msgstr "Azerbaijani"
+
+#: ../rules/base.xml.in.h:48
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Tastierë për Internet Logitech"
+
+#: ../rules/base.xml.in.h:55
+#, fuzzy
+msgid "Ban"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:56
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:58
+#, fuzzy
+msgid "Belarus"
+msgstr "Bjelloruse"
+
+#: ../rules/base.xml.in.h:59
+#, fuzzy
+msgid "Belgium"
+msgstr "Belg"
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:63
+#, fuzzy
+msgid "Bhu"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:64
+#, fuzzy
+msgid "Bhutan"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../rules/base.xml.in.h:68
+#, fuzzy
+msgid "Both Alt keys together change group."
+msgstr "Dy pulsantët Alt së bashku ndryshjnë grupin"
+
+#: ../rules/base.xml.in.h:69
+#, fuzzy
+msgid "Both Ctrl keys together change group."
+msgstr "Dy pulsantët Ctrl së bashku ndryshojnë grupin"
+
+#: ../rules/base.xml.in.h:70
+#, fuzzy
+msgid "Both Shift keys together change group."
+msgstr "Dy pulsantët Shift së bashku ndryshojnë grupin"
+
+#: ../rules/base.xml.in.h:71
+#, fuzzy
+msgid "Both Win-keys switch group while pressed."
+msgstr "Të dy pulsantët Win ndryshojnë gropin kur shtypen"
+
+#: ../rules/base.xml.in.h:73
+#, fuzzy
+msgid "Brazil"
+msgstr "Braziliane"
+
+#: ../rules/base.xml.in.h:76
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Bullgarisht"
+
+#: ../rules/base.xml.in.h:78
+#, fuzzy
+msgid "Canada"
+msgstr "Kanadeze"
+
+#: ../rules/base.xml.in.h:79
+#, fuzzy
+msgid "CapsLock LED shows alternative group."
+msgstr "Llampa e Caps_Lock tregon grupin alternativ"
+
+#: ../rules/base.xml.in.h:80
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Vepron si Shift me bllokues. Shift fshin Caps."
+
+#: ../rules/base.xml.in.h:81
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Vepron si Shift me bllokues. Shift nuk fshin Caps."
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+
+#: ../rules/base.xml.in.h:84
+#, fuzzy
+msgid "CapsLock key changes group."
+msgstr "Pulsanti Caps Lock ndryshon grupin"
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+
+#: ../rules/base.xml.in.h:87
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "Përdor gërma të mëdha në brendësi. Shift fshin Caps."
+
+#: ../rules/base.xml.in.h:88
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "Përdor gërma të mëdha në brendësi. Shift nuk fshin Caps."
+
+#: ../rules/base.xml.in.h:89
+#, fuzzy
+msgid "Che"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:101
+#, fuzzy
+msgid "Compose key position"
+msgstr "Pozicioni i pulsantit Control"
+
+#: ../rules/base.xml.in.h:102
+#, fuzzy
+msgid "Croatia"
+msgstr "Kroate"
+
+#: ../rules/base.xml.in.h:103
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Pulsanti Control sipër majtas"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Pulsanti Control në të majtë të 'A'"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Pozicioni i pulsantit Control"
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Control+Shift ndryshon grupin"
+
+#: ../rules/base.xml.in.h:109
+#, fuzzy
+msgid "Czechia"
+msgstr "Çekisht"
+
+#: ../rules/base.xml.in.h:110
+msgid "DTK2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:115
+#, fuzzy
+msgid "Denmark"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+#, fuzzy
+msgid "Estonia"
+msgstr "Estonisht"
+
+#: ../rules/base.xml.in.h:130
+#, fuzzy
+msgid "Extended Backslash"
+msgstr "E zgjeruar"
+
+#: ../rules/base.xml.in.h:131
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:133
+#, fuzzy
+msgid "Faroe Islands"
+msgstr "Faroese"
+
+#: ../rules/base.xml.in.h:135
+#, fuzzy
+msgid "Finland"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:137
+#, fuzzy
+msgid "France"
+msgstr "Frengjisht"
+
+#: ../rules/base.xml.in.h:139
+#, fuzzy
+msgid "French (legacy)"
+msgstr "Franceze (alternativa)"
+
+#: ../rules/base.xml.in.h:140
+#, fuzzy
+msgid "French Dvorak"
+msgstr "Frengjisht"
+
+#: ../rules/base.xml.in.h:141
+#, fuzzy
+msgid "French, Sun dead keys"
+msgstr "Pulsantë të vdekur Sun"
+
+#: ../rules/base.xml.in.h:142
+#, fuzzy
+msgid "French, eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:149
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: ../rules/base.xml.in.h:151
+#, fuzzy
+msgid "Georgia"
+msgstr "Gjermanisht"
+
+#: ../rules/base.xml.in.h:152
+#, fuzzy
+msgid "German, Sun dead keys"
+msgstr "Pulsantë të vdekur Sun"
+
+#: ../rules/base.xml.in.h:153
+#, fuzzy
+msgid "German, eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:154
+#, fuzzy
+msgid "Germany"
+msgstr "Gjermanisht"
+
+#: ../rules/base.xml.in.h:155
+#, fuzzy
+msgid "Gre"
+msgstr "Greqisht"
+
+#: ../rules/base.xml.in.h:156
+#, fuzzy
+msgid "Greece"
+msgstr "Greqisht"
+
+#: ../rules/base.xml.in.h:160
+#, fuzzy
+msgid "Gyration"
+msgstr "Kroate"
+
+#: ../rules/base.xml.in.h:174
+#, fuzzy
+msgid "Hungary"
+msgstr "Hungarisht"
+
+#: ../rules/base.xml.in.h:181
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandeze"
+
+#: ../rules/base.xml.in.h:182
+#, fuzzy
+msgid "Ind"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:183
+#, fuzzy
+msgid "India"
+msgstr "Ukrahinase"
+
+#: ../rules/base.xml.in.h:184
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:186
+#, fuzzy
+msgid "Iran"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:187
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandeze"
+
+#: ../rules/base.xml.in.h:192
+#, fuzzy
+msgid "Israel"
+msgstr "Izraeliane"
+
+#: ../rules/base.xml.in.h:194
+#, fuzzy
+msgid "Italy"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:195
+#, fuzzy
+msgid "Japan"
+msgstr "Japonisht"
+
+#: ../rules/base.xml.in.h:199
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:201
+#, fuzzy
+msgid "Kyr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:204
+#, fuzzy
+msgid "Lao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:205
+#, fuzzy
+msgid "Laos"
+msgstr "Laptop"
+
+#: ../rules/base.xml.in.h:210
+#, fuzzy
+msgid "Latin American"
+msgstr "Latino amerikane"
+
+#: ../rules/base.xml.in.h:211
+#, fuzzy
+msgid "Latin Unicode"
+msgstr "Latino amerikane"
+
+#: ../rules/base.xml.in.h:212
+#, fuzzy
+msgid "Latin Unicode qwerty"
+msgstr "Latino amerikane"
+
+#: ../rules/base.xml.in.h:213
+#, fuzzy
+msgid "Latin qwerty"
+msgstr "Hungareze (qwerty)"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:215
+#, fuzzy
+msgid "Latvia"
+msgstr "Letonisht"
+
+#: ../rules/base.xml.in.h:216
+#, fuzzy
+msgid "Left Alt key changes group."
+msgstr "Pulsanti i majtë Alt ndryshon grupin"
+
+#: ../rules/base.xml.in.h:217
+#, fuzzy
+msgid "Left Alt key switches group while pressed."
+msgstr "Pulsanti i majtë Win ndryshon grupin kur është i shtypur"
+
+#: ../rules/base.xml.in.h:218
+#, fuzzy
+msgid "Left Ctrl key changes group."
+msgstr "Pulsanti i majtë Ctrl ndryshon grupin"
+
+#: ../rules/base.xml.in.h:219
+#, fuzzy
+msgid "Left Shift key changes group."
+msgstr "Pulsanti i majtë Shift ndryshon grupin"
+
+#: ../rules/base.xml.in.h:220
+#, fuzzy
+msgid "Left Win-key changes group."
+msgstr "Pulsanti i majtë Win ndryshon grupin"
+
+#: ../rules/base.xml.in.h:221
+#, fuzzy
+msgid "Left Win-key switches group while pressed."
+msgstr "Pulsanti i majtë Win ndryshon grupin kur është i shtypur"
+
+#: ../rules/base.xml.in.h:222
+msgid "Lithuania"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Tastierë Logitech Deluxe Access"
+
+#: ../rules/base.xml.in.h:235
+#, fuzzy
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Tastierë për Internet Logitech"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "Maqedonisht"
+
+#: ../rules/base.xml.in.h:244
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "Kthe CapsLock në një Control shtesë"
+
+#: ../rules/base.xml.in.h:247
+#, fuzzy
+msgid "Maldives"
+msgstr "Malteze"
+
+#: ../rules/base.xml.in.h:248
+#, fuzzy
+msgid "Malta"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:249
+#, fuzzy
+msgid "Mao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:250
+#, fuzzy
+msgid "Maori"
+msgstr "Farsi"
+
+#: ../rules/base.xml.in.h:254
+#, fuzzy
+msgid "Menu is Compose."
+msgstr "Menu është krijuar"
+
+#: ../rules/base.xml.in.h:255
+#, fuzzy
+msgid "Menu key changes group."
+msgstr "Pulsanti i menu ndryshon grupin"
+
+#: ../rules/base.xml.in.h:263
+#, fuzzy
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:265
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Tastierë Microsoft Internet"
+
+#: ../rules/base.xml.in.h:271
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mongoliane"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr ""
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274
+#, fuzzy
+msgid "Myanmar"
+msgstr "Danisht"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr ""
+
+#: ../rules/base.xml.in.h:278
+#, fuzzy
+msgid "Northern Saami"
+msgstr "Northern Saami (Norvegjeze)"
+
+#: ../rules/base.xml.in.h:279
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:281
+#, fuzzy
+msgid "Norway"
+msgstr "Norvegjeze"
+
+#: ../rules/base.xml.in.h:282
+#, fuzzy
+msgid "NumLock LED shows alternative group."
+msgstr "Llampa e Num_Lock tregon grupin alternativ"
+
+#: ../rules/base.xml.in.h:284
+#, fuzzy
+msgid "Ogham IS434"
+msgstr "IS434"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+#, fuzzy
+msgid "Pakistan"
+msgstr "Tajik"
+
+#: ../rules/base.xml.in.h:290
+#, fuzzy
+msgid "Pattachote"
+msgstr "Thai (Pattachote)"
+
+#: ../rules/base.xml.in.h:293
+#, fuzzy
+msgid "Poland"
+msgstr "Pan"
+
+#: ../rules/base.xml.in.h:295
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugeze"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:298
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Shtyp pulsantin e majtë Win për të zgjedhur nivelin e tretë"
+
+#: ../rules/base.xml.in.h:299
+#, fuzzy
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Shtyp pulsantin e majtë Win për të zgjedhur nivelin e tretë"
+
+#: ../rules/base.xml.in.h:300
+#, fuzzy
+msgid "Press Menu key to choose 3rd level."
+msgstr "Shtyp pulsantin Menu për të zgjedhur nivelin e tretë"
+
+#: ../rules/base.xml.in.h:301
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Shtyp pulsantin e djathtë Win për të zgjedhur nivelin e tretë"
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Shtyp pulsantin e djathtë Control për të zgjedhur nivelin e tretë"
+
+#: ../rules/base.xml.in.h:303
+#, fuzzy
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Shtyp pulsantin e djathtë Win për të zgjedhur nivelin e tretë"
+
+#: ../rules/base.xml.in.h:304
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Shtyp çfarëdo pulsanti Win për të zgjedhur nivelin e tretë"
+
+#: ../rules/base.xml.in.h:305
+#, fuzzy
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Shtyp çfarëdo pulsanti Win për të zgjedhur nivelin e tretë"
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Pro"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:307
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+#, fuzzy
+msgid "Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:312
+#, fuzzy
+msgid "R-Alt switches group while pressed."
+msgstr "D-Alt ndryshon grupin kur është i shtypur"
+
+#: ../rules/base.xml.in.h:313
+#, fuzzy
+msgid "Right Alt is Compose."
+msgstr "Alt i djathtë u krijua"
+
+#: ../rules/base.xml.in.h:314
+#, fuzzy
+msgid "Right Alt key changes group."
+msgstr "Pulsanti i djathtë Alt ndryshon grupin"
+
+#: ../rules/base.xml.in.h:315
+#, fuzzy
+msgid "Right Ctrl is Compose."
+msgstr "Alt i djathtë u krijua"
+
+#: ../rules/base.xml.in.h:316
+#, fuzzy
+msgid "Right Ctrl key changes group."
+msgstr "Pulsanti i djathtë Ctrl ndryshon grupin"
+
+#: ../rules/base.xml.in.h:317
+#, fuzzy
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Pulsanti i djathtë Win ndryshon grupin kur është i shtypur"
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "Pulsanti i djathtë Control punon si Alt i djathtë"
+
+#: ../rules/base.xml.in.h:319
+#, fuzzy
+msgid "Right Shift key changes group."
+msgstr "Pulsanti i djathtë Shift ndryshon grupin"
+
+#: ../rules/base.xml.in.h:320
+#, fuzzy
+msgid "Right Win-key changes group."
+msgstr "Pulsanti i djathtë Win ndryshon grupin"
+
+#: ../rules/base.xml.in.h:321
+#, fuzzy
+msgid "Right Win-key is Compose."
+msgstr "Pulsanti Win i djathtë u krijua"
+
+#: ../rules/base.xml.in.h:322
+#, fuzzy
+msgid "Right Win-key switches group while pressed."
+msgstr "Pulsanti i djathtë Win ndryshon grupin kur është i shtypur"
+
+#: ../rules/base.xml.in.h:323
+#, fuzzy
+msgid "Romania"
+msgstr "Rumanisht"
+
+#: ../rules/base.xml.in.h:324
+#, fuzzy
+msgid "Romanian keyboard with German letters"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:325
+#, fuzzy
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:328
+#, fuzzy
+msgid "Russia"
+msgstr "Rusisht"
+
+#: ../rules/base.xml.in.h:330
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Rusisht"
+
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Elemino pulsantët e vdekur"
+
+#: ../rules/base.xml.in.h:332
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:340
+#, fuzzy
+msgid "ScrollLock LED shows alternative group."
+msgstr "Llampa e Scroll_Lock tregon grupin alternativ"
+
+#: ../rules/base.xml.in.h:341
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342
+#, fuzzy
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift së bashku me pulsantin numpad funksionon si tek MS Windows"
+
+#: ../rules/base.xml.in.h:343
+#, fuzzy
+msgid "Shift+CapsLock changes group."
+msgstr "Pulsanti Caps Lock ndryshon grupin"
+
+#: ../rules/base.xml.in.h:344
+#, fuzzy
+msgid "Slovakia"
+msgstr "Sllovake"
+
+#: ../rules/base.xml.in.h:345
+#, fuzzy
+msgid "Slovenia"
+msgstr "Sllovene"
+
+#: ../rules/base.xml.in.h:346
+#, fuzzy
+msgid "Spain"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "SrL"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "Sërbisht"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "Standart"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:354
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:356
+#, fuzzy
+msgid "Super Power Multimedia Keyboard"
+msgstr "Tastierë multimediale Hewlett-Packard SK-2501"
+
+#: ../rules/base.xml.in.h:360
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Shkëmbyesi Control dhe Caps Lock"
+
+#: ../rules/base.xml.in.h:362
+#, fuzzy
+msgid "Sweden"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:363
+#, fuzzy
+msgid "Switzerland"
+msgstr "Gjermenishte e Zvicrës"
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Syria"
+msgstr "Siriane"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Rusisht"
+
+#: ../rules/base.xml.in.h:369
+#, fuzzy
+msgid "TIS-820.2538"
+msgstr "Thai (TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:370
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tajik"
+
+#: ../rules/base.xml.in.h:372
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "\"Makinë shkrimi\""
+
+#: ../rules/base.xml.in.h:373
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+#, fuzzy
+msgid "Tamil Unicode"
+msgstr "Latino amerikane"
+
+#: ../rules/base.xml.in.h:377
+#, fuzzy
+msgid "Thailand"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:379
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386
+#, fuzzy
+msgid "Typewriter"
+msgstr "\"Makinë shkrimi\""
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:390
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:391
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:392
+#, fuzzy
+msgid "US keyboard with Lithuanian letters"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:393
+#, fuzzy
+msgid "US keyboard with Maltian letters"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:394
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "Tastierë US me gërma Romane"
+
+#: ../rules/base.xml.in.h:398
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukrahinase"
+
+#: ../rules/base.xml.in.h:401
+msgid "Urdu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:402
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+#, fuzzy
+msgid "Use keyboard LED to show alternative group."
+msgstr "Përdor LED e tastierës për të treguar grupin alternativ"
+
+#: ../rules/base.xml.in.h:408
+#, fuzzy
+msgid "Uzbekistan"
+msgstr "Uzbek"
+
+#: ../rules/base.xml.in.h:409
+#, fuzzy
+msgid "Vietnam"
+msgstr "Vietnamisht"
+
+#: ../rules/base.xml.in.h:413
+msgid "With <\\|> key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:414
+msgid "With guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:416
+msgid "Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:422
+msgid "qwerty, extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:424
+#, fuzzy
+msgid "qwertz"
+msgstr "qwerty"
+
+#, fuzzy
+#~ msgid "\"Standard\""
+#~ msgstr "Standart"
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "Tastierë US me gërma Romane"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "Sërbisht"
+
+#, fuzzy
+#~ msgid "Srp"
+#~ msgstr "Syr"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Bengali"
+
+#, fuzzy
+#~ msgid "Ogham IS434 laptop"
+#~ msgstr "Laptop IS434"
+
+#, fuzzy
+#~ msgid "Ogham laptop"
+#~ msgstr "laptop"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "Rusisht"
+
+#, fuzzy
+#~ msgid "Malayalam with Malayalam digits"
+#~ msgstr "Malayalam"
+
+#, fuzzy
+#~ msgid "Dzo"
+#~ msgstr "Dvo"
+
+#, fuzzy
+#~ msgid "Gurmukhi INSCRIPT"
+#~ msgstr "Gurmukhi"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "Kanadeze"
+
+#, fuzzy
+#~ msgid "Smi"
+#~ msgstr "Sapmi"
+
+#, fuzzy
+#~ msgid "Deva"
+#~ msgstr "Dvorak"
+
+#, fuzzy
+#~ msgid "Ogam"
+#~ msgstr "Ogham"
+
+#, fuzzy
+#~ msgid "Sin"
+#~ msgstr "Svn"
+
+#, fuzzy
+#~ msgid "Tam"
+#~ msgstr "Tamil"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TAB encoding"
+#~ msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim TAB"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim TSCII"
+
+#, fuzzy
+#~ msgid "Urd"
+#~ msgstr "Ukr"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; Unicode encoding"
+#~ msgstr "Një tastierë Tamil-ane stil makinë shkrimi; kodifikim Unicode"
+
+#, fuzzy
+#~ msgid "Kedmanee"
+#~ msgstr "Thai (Kedmanee)"
+
+#, fuzzy
+#~ msgid "Old standard"
+#~ msgstr "Standart"
+
+#, fuzzy
+#~ msgid "Swiss"
+#~ msgstr "Suedisht"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/Makefile.in
+++ xkeyboard-config-1.1~cvs.20080104.1/po/Makefile.in
@@ -0,0 +1,320 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = po
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CREATE_RULES_SYMLINK_FALSE = @CREATE_RULES_SYMLINK_FALSE@
+CREATE_RULES_SYMLINK_TRUE = @CREATE_RULES_SYMLINK_TRUE@
+CREATE_XKBCOMP_SYMLINK_FALSE = @CREATE_XKBCOMP_SYMLINK_FALSE@
+CREATE_XKBCOMP_SYMLINK_TRUE = @CREATE_XKBCOMP_SYMLINK_TRUE@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EXEEXT = @EXEEXT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_COMPAT_RULES_FALSE = @USE_COMPAT_RULES_FALSE@
+USE_COMPAT_RULES_TRUE = @USE_COMPAT_RULES_TRUE@
+VERSION = @VERSION@
+XKBCOMP = @XKBCOMP@
+ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+xkb_base = @xkb_base@
+xkb_rules_symlink = @xkb_rules_symlink@
+EXTRA_DIST = $(wildcard *.po) POTFILES POTFILES.in
+DISTCLEANFILES = .intltool-merge-cache POTFILES stamp-it
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  po/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  po/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+
+update-pot:
+	$(INTLTOOL_UPDATE) -p -g $(PACKAGE)
+
+update-po:
+	for i in *.po; do echo Updating $$i; $(INTLTOOL_UPDATE) `basename $$i .po` -g $(PACKAGE); done
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/vi.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/vi.po
@@ -466,11 +466,13 @@
 
 #: ../rules/base.xml.in.h:111
 msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
-msgstr "CapsLock hoạt động như Shift với việc khóa. Shift « tạm dừng » CapsLock."
+msgstr ""
+"CapsLock hoạt động như Shift với việc khóa. Shift « tạm dừng » CapsLock."
 
 #: ../rules/base.xml.in.h:112
 msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
-msgstr "CapsLock hoạt động như Shift với việc khóa. Shift không có tác động CapsLock."
+msgstr ""
+"CapsLock hoạt động như Shift với việc khóa. Shift không có tác động CapsLock."
 
 #: ../rules/base.xml.in.h:113
 msgid "CapsLock just locks the Shift modifier."
@@ -1191,8 +1193,12 @@
 msgstr "Vùng phím có phần thêm Unicode (các mũi tên và toán tử toán học)"
 
 #: ../rules/base.xml.in.h:293
-msgid "Keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Vùng phím có phần thêm Unicode (các mũi tên và toán tử toán học).  Bậc mặc định thì nhập các toán tử toán học."
+msgid ""
+"Keypad with unicode additions (arrows and math operators). Math operators on "
+"default level."
+msgstr ""
+"Vùng phím có phần thêm Unicode (các mũi tên và toán tử toán học).  Bậc mặc "
+"định thì nhập các toán tử toán học."
 
 #: ../rules/base.xml.in.h:294
 msgid "Keytronic FlexPro"
@@ -1758,8 +1764,11 @@
 msgstr "Nhấn phím Menu để chọn ngôn ngữ thứ 3."
 
 #: ../rules/base.xml.in.h:435
-msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
-msgstr "Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3, phím Shift+Right Alt là Multi_Key."
+msgid ""
+"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+msgstr ""
+"Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3, phím Shift+Right Alt là "
+"Multi_Key."
 
 #: ../rules/base.xml.in.h:436
 msgid "Press Right Alt key to choose 3rd level."
@@ -1970,8 +1979,12 @@
 msgstr "Nam Ux-béc"
 
 #: ../rules/base.xml.in.h:488
-msgid "Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level"
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách không thể ngắt mảnh ở bậc thứ sáu."
+msgid ""
+"Space key outputs non-breakable space character at fourth level, thin non-"
+"breakable space character at sixth level"
+msgstr ""
+"Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ tư, ký tự dấu cách "
+"không thể ngắt mảnh ở bậc thứ sáu."
 
 #: ../rules/base.xml.in.h:489
 msgid "Space key outputs non-breakable space character at fourth level."
@@ -1982,12 +1995,20 @@
 msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ hai."
 
 #: ../rules/base.xml.in.h:491
-msgid "Space key outputs non-breakable space character at third level, nothing at fourth level."
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba, không nhập gì ở bậc thứ tư."
+msgid ""
+"Space key outputs non-breakable space character at third level, nothing at "
+"fourth level."
+msgstr ""
+"Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba, không nhập gì ở "
+"bậc thứ tư."
 
 #: ../rules/base.xml.in.h:492
-msgid "Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level"
-msgstr "Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba, ký tự dấu cách không thể ngắt mảnh ở bậc thứ tư."
+msgid ""
+"Space key outputs non-breakable space character at third level, thin non-"
+"breakable space character at fourth level"
+msgstr ""
+"Phím dài nhập ký tự dấu cách không thể ngắt ở bậc thứ ba, ký tự dấu cách "
+"không thể ngắt mảnh ở bậc thứ tư."
 
 #: ../rules/base.xml.in.h:493
 msgid "Space key outputs non-breakable space character at third level."
@@ -2061,7 +2082,8 @@
 
 #: ../rules/base.xml.in.h:512
 msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr "Trao đổi mã phím của hai phím khi bàn phím Mac bị hạt nhân phát hiện sai."
+msgstr ""
+"Trao đổi mã phím của hai phím khi bàn phím Mac bị hạt nhân phát hiện sai."
 
 #: ../rules/base.xml.in.h:513 ../rules/sun.xml.in.h:115
 msgid "Swe"
@@ -2305,11 +2327,16 @@
 
 #: ../rules/base.xml.in.h:573
 msgid "Wang 724 keypad with unicode additions (arrows and math operators)"
-msgstr "Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán học)"
+msgstr ""
+"Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán học)"
 
 #: ../rules/base.xml.in.h:574
-msgid "Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level."
-msgstr "Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán học). Mặc định thì nhập toán tử toán học."
+msgid ""
+"Wang 724 keypad with unicode additions (arrows and math operators). Math "
+"operators on default level."
+msgstr ""
+"Vùng phím Wang 724 có phần thêm Unicode (các mũi tên và toán tử toán học). "
+"Mặc định thì nhập toán tử toán học."
 
 #: ../rules/base.xml.in.h:575
 msgid "Wang model 724 azerty"
@@ -2561,8 +2588,10 @@
 msgstr "Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3"
 
 #: ../rules/sun.xml.in.h:85
-msgid "Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
-msgstr "Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3, Shift+Right-Alt là Multi_Key"
+msgid ""
+"Press Right Alt-key to choose 3rd level, Shift+Right Alt-key is Multi_Key"
+msgstr ""
+"Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3, Shift+Right-Alt là Multi_Key"
 
 #: ../rules/sun.xml.in.h:86
 msgid "Press Right Control to choose 3rd level"
@@ -2696,6 +2725,182 @@
 msgid "type4"
 msgstr "kiểu4"
 
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:31
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt và Meta trên phím các Alt (mặc định)."
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Control thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:34
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:68
+msgid "Both Alt keys together change group."
+msgstr "Nhấn đồng thời hai phím Alt thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:69
+msgid "Both Ctrl keys together change group."
+msgstr "Nhấn đồng thời hai phím Ctrl thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:70
+msgid "Both Shift keys together change group."
+msgstr "Nhấn đồng thời hai phím Shift thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:71
+msgid "Both Win-keys switch group while pressed."
+msgstr "Cả hai phím Win chuyển ngôn ngữ nhập khi nhấn."
+
+#: ../rules/base.xml.in.h:79
+msgid "CapsLock LED shows alternative group."
+msgstr "Đèn CapsLock cho biết ngôn ngữ nhập tương đương."
+
+#: ../rules/base.xml.in.h:80
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "CapsLock hoạt động như Shift với việc khóa. Shift dừng CapsLock."
+
+#: ../rules/base.xml.in.h:81
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "CapsLock hoạt động như Shift với việc khóa. Shift không dừng CapsLock."
+
+#: ../rules/base.xml.in.h:84
+msgid "CapsLock key changes group."
+msgstr "Phím CapsLock thay đổi nhóm."
+
+#: ../rules/base.xml.in.h:87
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "CapsLock sử dụng viết hoa nội bộ. Shift dừng CapsLock."
+
+#: ../rules/base.xml.in.h:88
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "CapsLock sử dụng viết hoa nội bộ. Shift không dừng CapsLock."
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Control+Shift thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:208
+msgid "Laptop/notebook Dell Inspiron 8xxx"
+msgstr "Laptop/notebook Dell Inspiron 8xxx"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr "La tinh với chim guillemot"
+
+#: ../rules/base.xml.in.h:216
+msgid "Left Alt key changes group."
+msgstr "Phím Alt bên trái thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:217
+msgid "Left Alt key switches group while pressed."
+msgstr "Phím Alt bên trái chuyển đổi ngôn ngữ khi được nhấn."
+
+#: ../rules/base.xml.in.h:218
+msgid "Left Ctrl key changes group."
+msgstr "Phím Ctrl bên trái thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:219
+msgid "Left Shift key changes group."
+msgstr "Phím Shift bên trái thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:220
+msgid "Left Win-key changes group."
+msgstr "Phím Win bên trái thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:221
+msgid "Left Win-key switches group while pressed."
+msgstr "Phím Win bên trái chuyển đổi ngôn ngữ khi được nhấn."
+
+#: ../rules/base.xml.in.h:228
+msgid "Logitech Cordless Desktop Pro (alternate option)"
+msgstr "Logitech Cordless Desktop Pro (luân phiên tùy chọn)"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "Mác-kê-đô-nhia"
+
+#: ../rules/base.xml.in.h:255
+msgid "Menu key changes group."
+msgstr "Phím Menu thay đổi ngôn ngữ nhập vào."
+
+#: ../rules/base.xml.in.h:282
+msgid "NumLock LED shows alternative group."
+msgstr "Đèn NumLock cho biết ngôn ngữ tương đương."
+
+#: ../rules/base.xml.in.h:285
+msgid "Oretec MCK-800 MM/Internet keyboard"
+msgstr "Bàn phím Oretec MCK-800 MM/Internet"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:312
+msgid "R-Alt switches group while pressed."
+msgstr "R-Alt thay đổi ngôn ngữ nhập vào khi được nhấn."
+
+#: ../rules/base.xml.in.h:314
+msgid "Right Alt key changes group."
+msgstr "Phím Alt bên phải thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:316
+msgid "Right Ctrl key changes group."
+msgstr "Phím Ctrl bên phải thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:317
+msgid "Right Ctrl key switches group while pressed."
+msgstr "Ctrl bên phải thay đổi ngôn ngữ nhập vào khi được nhấn."
+
+#: ../rules/base.xml.in.h:319
+msgid "Right Shift key changes group."
+msgstr "Phím Shift bên phải thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:320
+msgid "Right Win-key changes group."
+msgstr "Phím Win bên phải thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:322
+msgid "Right Win-key switches group while pressed."
+msgstr "Phím Alt bên phải thay đổi ngôn ngữ nhập vào khi được nhấn."
+
+#: ../rules/base.xml.in.h:340
+msgid "ScrollLock LED shows alternative group."
+msgstr "Đèn ScrollLock cho biết ngôn ngữ tương đương."
+
+#: ../rules/base.xml.in.h:342
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift với các phím của bàn phím số làm việc như trong MS Windows."
+
+#: ../rules/base.xml.in.h:343
+msgid "Shift+CapsLock changes group."
+msgstr "Shift+CapsLock thay đổi ngôn ngữ nhập."
+
+#: ../rules/base.xml.in.h:357
+msgid "Super is mapped to the Win-keys (default)."
+msgstr "Super được ánh xạ tới các phím Win (mặc định)."
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+msgid "Use keyboard LED to show alternative group."
+msgstr "Sử dụng đèn bàn phím để chỉ ra ngôn ngữ tương đương."
+
+#: ../rules/base.xml.in.h:414
+msgid "With guillemots"
+msgstr "Với chim guillemot"
+
 #~ msgid "\"Standard\""
 #~ msgstr "\"Tiêu chuẩn\""
 
@@ -2788,3 +2993,62 @@
 
 #~ msgid "si1452"
 #~ msgstr "si1452"
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "Bàn phím Rô-ma-ni với các chữ cái Đức"
+
+#, fuzzy
+#~ msgid "Romanian standard keyboard"
+#~ msgstr "U-cra-in tiêu chuẩn RSTU"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "Séc-bia"
+
+#~ msgid "Srp"
+#~ msgstr "Srp"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Băng-gan"
+
+#~ msgid "US keyboard with Romanian letters"
+#~ msgstr "Bàn phím Mỹ với các chữ cái Ro-ma-ni"
+
+#~ msgid "Laptop"
+#~ msgstr "Xách tay"
+
+#, fuzzy
+#~ msgid "Ogham IS434 laptop"
+#~ msgstr "IS434 xách tay"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "Nga"
+
+#, fuzzy
+#~ msgid "Malayalam with Malayalam digits"
+#~ msgstr "Với các chữ số Malayalam"
+
+#, fuzzy
+#~ msgid "Devanagari INSCRIPT"
+#~ msgstr "Devanagari"
+
+#, fuzzy
+#~ msgid "Gurmukhi INSCRIPT"
+#~ msgstr "Gurmukhi"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "Kannada"
+
+#~ msgid "Ben"
+#~ msgstr "Ben"
+
+#~ msgid "Guj"
+#~ msgstr "Guj"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "Bàn phím dạng máy chữ; bảng mã TAB"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/zh_CN.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/zh_CN.po
@@ -1462,3 +1462,1185 @@
 #: xfree86.xml.in.h:362
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/dot"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:2
+#, fuzzy
+msgid "101/qwerty/comma/Dead keys"
+msgstr "l2/101/qwerty/comma"
+
+#: ../rules/base.xml.in.h:3
+#, fuzzy
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:4
+#, fuzzy
+msgid "101/qwerty/dot/Dead keys"
+msgstr "l2/101/qwerty/dot"
+
+#: ../rules/base.xml.in.h:5
+#, fuzzy
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:6
+#, fuzzy
+msgid "101/qwertz/comma/Dead keys"
+msgstr "l2/101/qwertz/comma"
+
+#: ../rules/base.xml.in.h:7
+#, fuzzy
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:8
+#, fuzzy
+msgid "101/qwertz/dot/Dead keys"
+msgstr "l2/101/qwertz/dot"
+
+#: ../rules/base.xml.in.h:9
+#, fuzzy
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:10
+#, fuzzy
+msgid "102/qwerty/comma/Dead keys"
+msgstr "l2/102/qwerty/comma"
+
+#: ../rules/base.xml.in.h:11
+#, fuzzy
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:12
+#, fuzzy
+msgid "102/qwerty/dot/Dead keys"
+msgstr "l2/102/qwerty/dot"
+
+#: ../rules/base.xml.in.h:13
+#, fuzzy
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:14
+#, fuzzy
+msgid "102/qwertz/comma/Dead keys"
+msgstr "l2/102/qwertz/comma"
+
+#: ../rules/base.xml.in.h:15
+#, fuzzy
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:16
+#, fuzzy
+msgid "102/qwertz/dot/Dead keys"
+msgstr "l2/102/qwertz/dot"
+
+#: ../rules/base.xml.in.h:17
+#, fuzzy
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr ""
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr ""
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30
+#, fuzzy
+msgid "Albania"
+msgstr "阿尔巴尼亚"
+
+#: ../rules/base.xml.in.h:31
+#, fuzzy
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt 键同时代表 Alt 和 Meta(默认)。"
+
+#: ../rules/base.xml.in.h:32
+#, fuzzy
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Meta 被映射到左 Windows 键。"
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Ctrl 更改组"
+
+#: ../rules/base.xml.in.h:34
+#, fuzzy
+msgid "Alt+Shift changes group."
+msgstr "Alt+Shift 更改组"
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:37
+#, fuzzy
+msgid "Alternative"
+msgstr "替代"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative international (former us_intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:39
+#, fuzzy
+msgid "Alternative, Sun dead keys"
+msgstr "Sun 死键"
+
+#: ../rules/base.xml.in.h:40
+#, fuzzy
+msgid "Alternative, eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:41
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:42
+#, fuzzy
+msgid "Ara"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:45
+#, fuzzy
+msgid "Armenia"
+msgstr "亚美尼亚"
+
+#: ../rules/base.xml.in.h:47
+#, fuzzy
+msgid "Azerbaijan"
+msgstr "阿塞拜疆"
+
+#: ../rules/base.xml.in.h:48
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "罗技网际键盘"
+
+#: ../rules/base.xml.in.h:55
+#, fuzzy
+msgid "Ban"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:56
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:58
+#, fuzzy
+msgid "Belarus"
+msgstr "白俄罗斯"
+
+#: ../rules/base.xml.in.h:59
+#, fuzzy
+msgid "Belgium"
+msgstr "比利时"
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:63
+#, fuzzy
+msgid "Bhu"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:64
+#, fuzzy
+msgid "Bhutan"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../rules/base.xml.in.h:68
+#, fuzzy
+msgid "Both Alt keys together change group."
+msgstr "两个 Alt 键可以更改组"
+
+#: ../rules/base.xml.in.h:69
+#, fuzzy
+msgid "Both Ctrl keys together change group."
+msgstr "两个 Ctrl 键更改组"
+
+#: ../rules/base.xml.in.h:70
+#, fuzzy
+msgid "Both Shift keys together change group."
+msgstr "两个 Shift 键更改组"
+
+#: ../rules/base.xml.in.h:71
+#, fuzzy
+msgid "Both Win-keys switch group while pressed."
+msgstr "按下两个 Windows 键可切换组"
+
+#: ../rules/base.xml.in.h:73
+#, fuzzy
+msgid "Brazil"
+msgstr "巴西"
+
+#: ../rules/base.xml.in.h:76
+#, fuzzy
+msgid "Bulgaria"
+msgstr "保加利亚"
+
+#: ../rules/base.xml.in.h:78
+#, fuzzy
+msgid "Canada"
+msgstr "加拿大"
+
+#: ../rules/base.xml.in.h:79
+#, fuzzy
+msgid "CapsLock LED shows alternative group."
+msgstr "CapsLock 灯显示替代组(_L)"
+
+#: ../rules/base.xml.in.h:80
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "锁定时和 Shift 功能相同。Shift 取消大写。"
+
+#: ../rules/base.xml.in.h:81
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "锁定时和 Shift 功能相同。Shift 不取消大写。"
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+
+#: ../rules/base.xml.in.h:84
+#, fuzzy
+msgid "CapsLock key changes group."
+msgstr "CapsLock 键更改组"
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+
+#: ../rules/base.xml.in.h:87
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "使用内部大写。Shift 取消大写。"
+
+#: ../rules/base.xml.in.h:88
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr "使用内部大写。Shift 不取消大写。"
+
+#: ../rules/base.xml.in.h:89
+#, fuzzy
+msgid "Che"
+msgstr "Cze"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:101
+#, fuzzy
+msgid "Compose key position"
+msgstr "Ctrl 键位置"
+
+#: ../rules/base.xml.in.h:102
+#, fuzzy
+msgid "Croatia"
+msgstr "克罗地亚"
+
+#: ../rules/base.xml.in.h:103
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl 键在左下角"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl 键在“A”左侧"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Ctrl 键位置"
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl+Shift 更改组"
+
+#: ../rules/base.xml.in.h:109
+#, fuzzy
+msgid "Czechia"
+msgstr "捷克"
+
+#: ../rules/base.xml.in.h:110
+msgid "DTK2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:115
+#, fuzzy
+msgid "Denmark"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+#, fuzzy
+msgid "Estonia"
+msgstr "爱沙尼亚"
+
+#: ../rules/base.xml.in.h:130
+#, fuzzy
+msgid "Extended Backslash"
+msgstr "扩展"
+
+#: ../rules/base.xml.in.h:131
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:133
+#, fuzzy
+msgid "Faroe Islands"
+msgstr "法罗"
+
+#: ../rules/base.xml.in.h:135
+#, fuzzy
+msgid "Finland"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:137
+#, fuzzy
+msgid "France"
+msgstr "法语"
+
+#: ../rules/base.xml.in.h:139
+#, fuzzy
+msgid "French (legacy)"
+msgstr "法语(替代)"
+
+#: ../rules/base.xml.in.h:140
+#, fuzzy
+msgid "French Dvorak"
+msgstr "法语"
+
+#: ../rules/base.xml.in.h:141
+#, fuzzy
+msgid "French, Sun dead keys"
+msgstr "Sun 死键"
+
+#: ../rules/base.xml.in.h:142
+#, fuzzy
+msgid "French, eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:149
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: ../rules/base.xml.in.h:151
+#, fuzzy
+msgid "Georgia"
+msgstr "德语"
+
+#: ../rules/base.xml.in.h:152
+#, fuzzy
+msgid "German, Sun dead keys"
+msgstr "Sun 死键"
+
+#: ../rules/base.xml.in.h:153
+#, fuzzy
+msgid "German, eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:154
+#, fuzzy
+msgid "Germany"
+msgstr "德语"
+
+#: ../rules/base.xml.in.h:155
+#, fuzzy
+msgid "Gre"
+msgstr "希腊"
+
+#: ../rules/base.xml.in.h:156
+#, fuzzy
+msgid "Greece"
+msgstr "希腊"
+
+#: ../rules/base.xml.in.h:160
+#, fuzzy
+msgid "Gyration"
+msgstr "克罗地亚"
+
+#: ../rules/base.xml.in.h:174
+#, fuzzy
+msgid "Hungary"
+msgstr "匈牙利"
+
+#: ../rules/base.xml.in.h:181
+#, fuzzy
+msgid "Iceland"
+msgstr "冰岛"
+
+#: ../rules/base.xml.in.h:182
+#, fuzzy
+msgid "Ind"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:183
+#, fuzzy
+msgid "India"
+msgstr "乌克兰"
+
+#: ../rules/base.xml.in.h:184
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:186
+#, fuzzy
+msgid "Iran"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:187
+#, fuzzy
+msgid "Ireland"
+msgstr "冰岛"
+
+#: ../rules/base.xml.in.h:192
+#, fuzzy
+msgid "Israel"
+msgstr "以色列"
+
+#: ../rules/base.xml.in.h:194
+#, fuzzy
+msgid "Italy"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:195
+#, fuzzy
+msgid "Japan"
+msgstr "日语"
+
+#: ../rules/base.xml.in.h:199
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:201
+#, fuzzy
+msgid "Kyr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:204
+#, fuzzy
+msgid "Lao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:205
+#, fuzzy
+msgid "Laos"
+msgstr "便携"
+
+#: ../rules/base.xml.in.h:210
+#, fuzzy
+msgid "Latin American"
+msgstr "拉美"
+
+#: ../rules/base.xml.in.h:211
+#, fuzzy
+msgid "Latin Unicode"
+msgstr "拉美"
+
+#: ../rules/base.xml.in.h:212
+#, fuzzy
+msgid "Latin Unicode qwerty"
+msgstr "拉美"
+
+#: ../rules/base.xml.in.h:213
+#, fuzzy
+msgid "Latin qwerty"
+msgstr "匈牙利(qwerty)"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:215
+#, fuzzy
+msgid "Latvia"
+msgstr "拉脱维亚"
+
+#: ../rules/base.xml.in.h:216
+#, fuzzy
+msgid "Left Alt key changes group."
+msgstr "左 Alt 键更改组"
+
+#: ../rules/base.xml.in.h:217
+#, fuzzy
+msgid "Left Alt key switches group while pressed."
+msgstr "按下左 Windows 键切换组"
+
+#: ../rules/base.xml.in.h:218
+#, fuzzy
+msgid "Left Ctrl key changes group."
+msgstr "左 Ctrl 键更改组"
+
+#: ../rules/base.xml.in.h:219
+#, fuzzy
+msgid "Left Shift key changes group."
+msgstr "左 Shift 键更改组"
+
+#: ../rules/base.xml.in.h:220
+#, fuzzy
+msgid "Left Win-key changes group."
+msgstr "左 Windows 键更改组"
+
+#: ../rules/base.xml.in.h:221
+#, fuzzy
+msgid "Left Win-key switches group while pressed."
+msgstr "按下左 Windows 键切换组"
+
+#: ../rules/base.xml.in.h:222
+msgid "Lithuania"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "罗技强手键盘"
+
+#: ../rules/base.xml.in.h:235
+#, fuzzy
+msgid "Logitech Ultra-X Keyboard"
+msgstr "罗技网际键盘"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "马其顿"
+
+#: ../rules/base.xml.in.h:244
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "将 CapsLock 作为额外的 Ctrl"
+
+#: ../rules/base.xml.in.h:247
+#, fuzzy
+msgid "Maldives"
+msgstr "马耳他"
+
+#: ../rules/base.xml.in.h:248
+#, fuzzy
+msgid "Malta"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:249
+#, fuzzy
+msgid "Mao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:250
+#, fuzzy
+msgid "Maori"
+msgstr "波斯"
+
+#: ../rules/base.xml.in.h:254
+#, fuzzy
+msgid "Menu is Compose."
+msgstr "菜单已编排"
+
+#: ../rules/base.xml.in.h:255
+#, fuzzy
+msgid "Menu key changes group."
+msgstr "菜单键更改组"
+
+#: ../rules/base.xml.in.h:263
+#, fuzzy
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "微软自然键盘增强版/微软网际键盘增强版"
+
+#: ../rules/base.xml.in.h:265
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "微软网际键盘"
+
+#: ../rules/base.xml.in.h:271
+#, fuzzy
+msgid "Mongolia"
+msgstr "蒙古"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr ""
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274
+#, fuzzy
+msgid "Myanmar"
+msgstr "丹麦"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr ""
+
+#: ../rules/base.xml.in.h:278
+#, fuzzy
+msgid "Northern Saami"
+msgstr "北部沙米(挪威)"
+
+#: ../rules/base.xml.in.h:279
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:281
+#, fuzzy
+msgid "Norway"
+msgstr "挪威"
+
+#: ../rules/base.xml.in.h:282
+#, fuzzy
+msgid "NumLock LED shows alternative group."
+msgstr "NumLock 灯显示替代组(_L)"
+
+#: ../rules/base.xml.in.h:284
+#, fuzzy
+msgid "Ogham IS434"
+msgstr "IS434"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+#, fuzzy
+msgid "Pakistan"
+msgstr "塔吉克"
+
+#: ../rules/base.xml.in.h:290
+#, fuzzy
+msgid "Pattachote"
+msgstr "泰语(Pattachote)"
+
+#: ../rules/base.xml.in.h:293
+#, fuzzy
+msgid "Poland"
+msgstr "Pan"
+
+#: ../rules/base.xml.in.h:295
+#, fuzzy
+msgid "Portugal"
+msgstr "葡萄牙"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:298
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "按左 Windows 键选择第三级"
+
+#: ../rules/base.xml.in.h:299
+#, fuzzy
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "按左 Windows 键选择第三级"
+
+#: ../rules/base.xml.in.h:300
+#, fuzzy
+msgid "Press Menu key to choose 3rd level."
+msgstr "按菜单键选择第三级"
+
+#: ../rules/base.xml.in.h:301
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "按右 Windows 键选择第三级"
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "按右 Ctrl 选择第三级"
+
+#: ../rules/base.xml.in.h:303
+#, fuzzy
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "按右 Windows 键选择第三级"
+
+#: ../rules/base.xml.in.h:304
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "按任何 Windows 键选择第三级"
+
+#: ../rules/base.xml.in.h:305
+#, fuzzy
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "按任何 Windows 键选择第三级"
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Pro"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:307
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+#, fuzzy
+msgid "Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:312
+#, fuzzy
+msgid "R-Alt switches group while pressed."
+msgstr "按下右 Alt 切换组"
+
+#: ../rules/base.xml.in.h:313
+#, fuzzy
+msgid "Right Alt is Compose."
+msgstr "右 Alt 已编排"
+
+#: ../rules/base.xml.in.h:314
+#, fuzzy
+msgid "Right Alt key changes group."
+msgstr "右 Alt 键更改组"
+
+#: ../rules/base.xml.in.h:315
+#, fuzzy
+msgid "Right Ctrl is Compose."
+msgstr "右 Alt 已编排"
+
+#: ../rules/base.xml.in.h:316
+#, fuzzy
+msgid "Right Ctrl key changes group."
+msgstr "右 Ctrl 键更改组"
+
+#: ../rules/base.xml.in.h:317
+#, fuzzy
+msgid "Right Ctrl key switches group while pressed."
+msgstr "按下右 Windows 键切换组"
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "右 Ctrl 键等同于右 Alt"
+
+#: ../rules/base.xml.in.h:319
+#, fuzzy
+msgid "Right Shift key changes group."
+msgstr "右 Shift 健更改组"
+
+#: ../rules/base.xml.in.h:320
+#, fuzzy
+msgid "Right Win-key changes group."
+msgstr "右 Windows 键更改组"
+
+#: ../rules/base.xml.in.h:321
+#, fuzzy
+msgid "Right Win-key is Compose."
+msgstr "右 Windows 键已编排"
+
+#: ../rules/base.xml.in.h:322
+#, fuzzy
+msgid "Right Win-key switches group while pressed."
+msgstr "按下右 Windows 键切换组"
+
+#: ../rules/base.xml.in.h:323
+#, fuzzy
+msgid "Romania"
+msgstr "罗马尼亚"
+
+#: ../rules/base.xml.in.h:324
+#, fuzzy
+msgid "Romanian keyboard with German letters"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:325
+#, fuzzy
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:328
+#, fuzzy
+msgid "Russia"
+msgstr "俄语"
+
+#: ../rules/base.xml.in.h:330
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "俄语"
+
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "除去死键"
+
+#: ../rules/base.xml.in.h:332
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:340
+#, fuzzy
+msgid "ScrollLock LED shows alternative group."
+msgstr "ScrollLock 灯显示替代组(_L)"
+
+#: ../rules/base.xml.in.h:341
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342
+#, fuzzy
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Shift+数字键盘的功能等同于 MS Windows"
+
+#: ../rules/base.xml.in.h:343
+#, fuzzy
+msgid "Shift+CapsLock changes group."
+msgstr "CapsLock 键更改组"
+
+#: ../rules/base.xml.in.h:344
+#, fuzzy
+msgid "Slovakia"
+msgstr "斯洛伐克"
+
+#: ../rules/base.xml.in.h:345
+#, fuzzy
+msgid "Slovenia"
+msgstr "斯洛文尼亚"
+
+#: ../rules/base.xml.in.h:346
+#, fuzzy
+msgid "Spain"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "SrL"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "塞尔维亚"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "标准"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:354
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:356
+#, fuzzy
+msgid "Super Power Multimedia Keyboard"
+msgstr "惠普 SK-2501 多媒体键盘"
+
+#: ../rules/base.xml.in.h:360
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "交换 Ctrl 和 CapsLock"
+
+#: ../rules/base.xml.in.h:362
+#, fuzzy
+msgid "Sweden"
+msgstr "Swe"
+
+#: ../rules/base.xml.in.h:363
+#, fuzzy
+msgid "Switzerland"
+msgstr "瑞典德语"
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Syria"
+msgstr "叙利亚"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "俄语"
+
+#: ../rules/base.xml.in.h:369
+#, fuzzy
+msgid "TIS-820.2538"
+msgstr "泰语(TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:370
+#, fuzzy
+msgid "Tajikistan"
+msgstr "塔吉克"
+
+#: ../rules/base.xml.in.h:372
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "“打字机”"
+
+#: ../rules/base.xml.in.h:373
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+#, fuzzy
+msgid "Tamil Unicode"
+msgstr "拉美"
+
+#: ../rules/base.xml.in.h:377
+#, fuzzy
+msgid "Thailand"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:379
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386
+#, fuzzy
+msgid "Typewriter"
+msgstr "“打字机”"
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:390
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:391
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:392
+#, fuzzy
+msgid "US keyboard with Lithuanian letters"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:393
+#, fuzzy
+msgid "US keyboard with Maltian letters"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:394
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "美国键盘，带罗马尼亚字符"
+
+#: ../rules/base.xml.in.h:398
+#, fuzzy
+msgid "Ukraine"
+msgstr "乌克兰"
+
+#: ../rules/base.xml.in.h:401
+msgid "Urdu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:402
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+#, fuzzy
+msgid "Use keyboard LED to show alternative group."
+msgstr "使用键盘灯显示替代组"
+
+#: ../rules/base.xml.in.h:408
+#, fuzzy
+msgid "Uzbekistan"
+msgstr "乌兹别克"
+
+#: ../rules/base.xml.in.h:409
+#, fuzzy
+msgid "Vietnam"
+msgstr "越南语"
+
+#: ../rules/base.xml.in.h:413
+msgid "With <\\|> key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:414
+msgid "With guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:416
+msgid "Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:422
+msgid "qwerty, extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:424
+#, fuzzy
+msgid "qwertz"
+msgstr "qwerty"
+
+#, fuzzy
+#~ msgid "\"Standard\""
+#~ msgstr "标准"
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "美国键盘，带罗马尼亚字符"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "塞尔维亚"
+
+#, fuzzy
+#~ msgid "Srp"
+#~ msgstr "Syr"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "孟加拉"
+
+#, fuzzy
+#~ msgid "Ogham IS434 laptop"
+#~ msgstr "IS434 便携"
+
+#, fuzzy
+#~ msgid "Ogham laptop"
+#~ msgstr "laptop"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "俄语"
+
+#, fuzzy
+#~ msgid "Malayalam with Malayalam digits"
+#~ msgstr "马来西亚"
+
+#, fuzzy
+#~ msgid "Dzo"
+#~ msgstr "Dvo"
+
+#, fuzzy
+#~ msgid "Gurmukhi INSCRIPT"
+#~ msgstr "旁遮普"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "埃纳德"
+
+#, fuzzy
+#~ msgid "Smi"
+#~ msgstr "Sapmi"
+
+#, fuzzy
+#~ msgid "Deva"
+#~ msgstr "Dvorak"
+
+#, fuzzy
+#~ msgid "Ogam"
+#~ msgstr "欧甘"
+
+#, fuzzy
+#~ msgid "Sin"
+#~ msgstr "Svn"
+
+#, fuzzy
+#~ msgid "Tam"
+#~ msgstr "泰米尔"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TAB encoding"
+#~ msgstr "泰米尔打字机风格的键映射；TAB 编码"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "泰米尔打字机风格的键映射；TSCII 编码"
+
+#, fuzzy
+#~ msgid "Urd"
+#~ msgstr "Ukr"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; Unicode encoding"
+#~ msgstr "泰米尔打字机风格的键映射；Unicode 编码"
+
+#, fuzzy
+#~ msgid "Kedmanee"
+#~ msgstr "泰语(Kedmanee)"
+
+#, fuzzy
+#~ msgid "Old standard"
+#~ msgstr "标准"
+
+#, fuzzy
+#~ msgid "Swiss"
+#~ msgstr "瑞典"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/po/da.po
+++ xkeyboard-config-1.1~cvs.20080104.1/po/da.po
@@ -1317,7 +1317,8 @@
 
 #: xfree86.xml.in.h:326
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
-msgstr "Bruger intern forst�rrelse af bogstaver. Skift annullerer ikke Caps Lock."
+msgstr ""
+"Bruger intern forst�rrelse af bogstaver. Skift annullerer ikke Caps Lock."
 
 #: xfree86.xml.in.h:327
 msgid "Uzb"
@@ -1462,3 +1463,1186 @@
 #: xfree86.xml.in.h:362
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/punktum"
+
+#: ../rules/base.xml.in.h:1
+msgid "(F)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:2
+#, fuzzy
+msgid "101/qwerty/comma/Dead keys"
+msgstr "l2/101/qwerty/komma"
+
+#: ../rules/base.xml.in.h:3
+#, fuzzy
+msgid "101/qwerty/comma/Eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:4
+#, fuzzy
+msgid "101/qwerty/dot/Dead keys"
+msgstr "l2/101/qwerty/punktum"
+
+#: ../rules/base.xml.in.h:5
+#, fuzzy
+msgid "101/qwerty/dot/Eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:6
+#, fuzzy
+msgid "101/qwertz/comma/Dead keys"
+msgstr "l2/101/qwertz/komma"
+
+#: ../rules/base.xml.in.h:7
+#, fuzzy
+msgid "101/qwertz/comma/Eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:8
+#, fuzzy
+msgid "101/qwertz/dot/Dead keys"
+msgstr "l2/101/qwertz/punktum"
+
+#: ../rules/base.xml.in.h:9
+#, fuzzy
+msgid "101/qwertz/dot/Eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:10
+#, fuzzy
+msgid "102/qwerty/comma/Dead keys"
+msgstr "l2/102/qwerty/komma"
+
+#: ../rules/base.xml.in.h:11
+#, fuzzy
+msgid "102/qwerty/comma/Eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:12
+#, fuzzy
+msgid "102/qwerty/dot/Dead keys"
+msgstr "l2/102/qwerty/punktum"
+
+#: ../rules/base.xml.in.h:13
+#, fuzzy
+msgid "102/qwerty/dot/Eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:14
+#, fuzzy
+msgid "102/qwertz/comma/Dead keys"
+msgstr "l2/102/qwertz/komma"
+
+#: ../rules/base.xml.in.h:15
+#, fuzzy
+msgid "102/qwertz/comma/Eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:16
+#, fuzzy
+msgid "102/qwertz/dot/Dead keys"
+msgstr "l2/102/qwertz/punktum"
+
+#: ../rules/base.xml.in.h:17
+#, fuzzy
+msgid "102/qwertz/dot/Eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:18
+msgid "A4Tech KB-21"
+msgstr ""
+
+#: ../rules/base.xml.in.h:19
+msgid "A4Tech KBS-8"
+msgstr ""
+
+#: ../rules/base.xml.in.h:22
+msgid "Acer TravelMate 800"
+msgstr ""
+
+#: ../rules/base.xml.in.h:23
+msgid "Add the EuroSign to the 2 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:24
+msgid "Add the EuroSign to the 5 key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:25
+msgid "Add the EuroSign to the E key."
+msgstr ""
+
+#: ../rules/base.xml.in.h:27
+msgid "Adding the EuroSign to certain keys"
+msgstr ""
+
+#: ../rules/base.xml.in.h:30
+#, fuzzy
+msgid "Albania"
+msgstr "Albansk"
+
+#: ../rules/base.xml.in.h:31
+#, fuzzy
+msgid "Alt and Meta are on the Alt keys (default)."
+msgstr "Alt og Meta p� Alt-tasterne (standard)."
+
+#: ../rules/base.xml.in.h:32
+#, fuzzy
+msgid "Alt is mapped to the right Win-key and Super to Menu."
+msgstr "Meta ligger p� venstre Win-tast."
+
+#: ../rules/base.xml.in.h:33
+#, fuzzy
+msgid "Alt+Ctrl changes group."
+msgstr "Alt+Ctrl skifter gruppe"
+
+#: ../rules/base.xml.in.h:34
+#, fuzzy
+msgid "Alt+Shift changes group."
+msgstr "Alt+skift skifter gruppe"
+
+#: ../rules/base.xml.in.h:35
+msgid "Alt-Q"
+msgstr ""
+
+#: ../rules/base.xml.in.h:37
+#, fuzzy
+msgid "Alternative"
+msgstr "Alternativ"
+
+#: ../rules/base.xml.in.h:38
+msgid "Alternative international (former us_intl)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:39
+#, fuzzy
+msgid "Alternative, Sun dead keys"
+msgstr "Sun d�de taster"
+
+#: ../rules/base.xml.in.h:40
+#, fuzzy
+msgid "Alternative, eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:41
+msgid "Apostrophe (') variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:42
+#, fuzzy
+msgid "Ara"
+msgstr "Fra"
+
+#: ../rules/base.xml.in.h:45
+#, fuzzy
+msgid "Armenia"
+msgstr "Armensk"
+
+#: ../rules/base.xml.in.h:47
+#, fuzzy
+msgid "Azerbaijan"
+msgstr "Aserbadjansk"
+
+#: ../rules/base.xml.in.h:48
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:55
+#, fuzzy
+msgid "Ban"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:56
+msgid "Bangladesh"
+msgstr ""
+
+#: ../rules/base.xml.in.h:58
+#, fuzzy
+msgid "Belarus"
+msgstr "Belarusian"
+
+#: ../rules/base.xml.in.h:59
+#, fuzzy
+msgid "Belgium"
+msgstr "Belgisk"
+
+#: ../rules/base.xml.in.h:61
+#, fuzzy
+msgid "Bengali Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:63
+#, fuzzy
+msgid "Bhu"
+msgstr "Bih"
+
+#: ../rules/base.xml.in.h:64
+#, fuzzy
+msgid "Bhutan"
+msgstr "Kan"
+
+#: ../rules/base.xml.in.h:67
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: ../rules/base.xml.in.h:68
+#, fuzzy
+msgid "Both Alt keys together change group."
+msgstr "Begge Alt-taster til sammen skifter gruppe"
+
+#: ../rules/base.xml.in.h:69
+#, fuzzy
+msgid "Both Ctrl keys together change group."
+msgstr "Begge Ctrl-taster til sammen skifter gruppe"
+
+#: ../rules/base.xml.in.h:70
+#, fuzzy
+msgid "Both Shift keys together change group."
+msgstr "Begge skiftetaster til sammen skifter gruppe"
+
+#: ../rules/base.xml.in.h:71
+#, fuzzy
+msgid "Both Win-keys switch group while pressed."
+msgstr "Begge Win-taster til sammen skifter gruppe"
+
+#: ../rules/base.xml.in.h:73
+#, fuzzy
+msgid "Brazil"
+msgstr "Brasiliansk"
+
+#: ../rules/base.xml.in.h:76
+#, fuzzy
+msgid "Bulgaria"
+msgstr "Bulgarisk"
+
+#: ../rules/base.xml.in.h:78
+#, fuzzy
+msgid "Canada"
+msgstr "Canadisk"
+
+#: ../rules/base.xml.in.h:79
+#, fuzzy
+msgid "CapsLock LED shows alternative group."
+msgstr "Caps Lock LED viser alternativ gruppe"
+
+#: ../rules/base.xml.in.h:80
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
+msgstr "Agerer som skiftetasten med l�s. Skift annullerer Caps Lock."
+
+#: ../rules/base.xml.in.h:81
+#, fuzzy
+msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
+msgstr "Agerer som skiftetasten med l�s. Skift annullerer ikke Caps Lock."
+
+#: ../rules/base.xml.in.h:82
+msgid "CapsLock just locks the Shift modifier."
+msgstr ""
+
+#: ../rules/base.xml.in.h:84
+#, fuzzy
+msgid "CapsLock key changes group."
+msgstr "Caps Lock-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:85
+msgid "CapsLock toggles Shift so all keys are affected."
+msgstr ""
+
+#: ../rules/base.xml.in.h:86
+msgid "CapsLock toggles normal capitalization of alphabetic characters."
+msgstr ""
+
+#: ../rules/base.xml.in.h:87
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
+msgstr "Bruger intern forst�rrelse af bogstaver. Skift annullerer Caps Lock."
+
+#: ../rules/base.xml.in.h:88
+#, fuzzy
+msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
+msgstr ""
+"Bruger intern forst�rrelse af bogstaver. Skift annullerer ikke Caps Lock."
+
+#: ../rules/base.xml.in.h:89
+#, fuzzy
+msgid "Che"
+msgstr "Tje"
+
+#: ../rules/base.xml.in.h:92
+msgid "Cherry CyMotion Master Linux"
+msgstr ""
+
+#: ../rules/base.xml.in.h:101
+#, fuzzy
+msgid "Compose key position"
+msgstr "Ctrl-tast placering"
+
+#: ../rules/base.xml.in.h:102
+#, fuzzy
+msgid "Croatia"
+msgstr "Kroatisk"
+
+#: ../rules/base.xml.in.h:103
+#, fuzzy
+msgid "Ctrl key at bottom left"
+msgstr "Ctrl-tast nederst til venstre"
+
+#: ../rules/base.xml.in.h:104
+#, fuzzy
+msgid "Ctrl key at left of 'A'"
+msgstr "Ctrl-tast til venstre for 'A'"
+
+#: ../rules/base.xml.in.h:105
+#, fuzzy
+msgid "Ctrl key position"
+msgstr "Ctrl-tast placering"
+
+#: ../rules/base.xml.in.h:106
+#, fuzzy
+msgid "Ctrl+Shift changes group."
+msgstr "Ctrl+skift skifter gruppe"
+
+#: ../rules/base.xml.in.h:109
+#, fuzzy
+msgid "Czechia"
+msgstr "Tjekkisk"
+
+#: ../rules/base.xml.in.h:110
+msgid "DTK2000"
+msgstr ""
+
+#: ../rules/base.xml.in.h:115
+#, fuzzy
+msgid "Denmark"
+msgstr "Dnk"
+
+#: ../rules/base.xml.in.h:121
+msgid "Dvorak, Polish quotes on key \"1/!\""
+msgstr ""
+
+#: ../rules/base.xml.in.h:122
+msgid "Dvorak, Polish quotes on quotemark key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:127
+#, fuzzy
+msgid "Estonia"
+msgstr "Estisk"
+
+#: ../rules/base.xml.in.h:130
+#, fuzzy
+msgid "Extended Backslash"
+msgstr "Udvidet"
+
+#: ../rules/base.xml.in.h:131
+msgid "F-letter (F) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:133
+#, fuzzy
+msgid "Faroe Islands"
+msgstr "F�r�isk"
+
+#: ../rules/base.xml.in.h:135
+#, fuzzy
+msgid "Finland"
+msgstr "Fin"
+
+#: ../rules/base.xml.in.h:137
+#, fuzzy
+msgid "France"
+msgstr "Fransk"
+
+#: ../rules/base.xml.in.h:139
+#, fuzzy
+msgid "French (legacy)"
+msgstr "Fransk (alternativ)"
+
+#: ../rules/base.xml.in.h:140
+#, fuzzy
+msgid "French Dvorak"
+msgstr "Fransk"
+
+#: ../rules/base.xml.in.h:141
+#, fuzzy
+msgid "French, Sun dead keys"
+msgstr "Sun d�de taster"
+
+#: ../rules/base.xml.in.h:142
+#, fuzzy
+msgid "French, eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:149
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: ../rules/base.xml.in.h:151
+#, fuzzy
+msgid "Georgia"
+msgstr "Tysk"
+
+#: ../rules/base.xml.in.h:152
+#, fuzzy
+msgid "German, Sun dead keys"
+msgstr "Sun d�de taster"
+
+#: ../rules/base.xml.in.h:153
+#, fuzzy
+msgid "German, eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:154
+#, fuzzy
+msgid "Germany"
+msgstr "Tysk"
+
+#: ../rules/base.xml.in.h:155
+#, fuzzy
+msgid "Gre"
+msgstr "Gr�sk"
+
+#: ../rules/base.xml.in.h:156
+#, fuzzy
+msgid "Greece"
+msgstr "Gr�sk"
+
+#: ../rules/base.xml.in.h:160
+#, fuzzy
+msgid "Gyration"
+msgstr "Kroatisk"
+
+#: ../rules/base.xml.in.h:174
+#, fuzzy
+msgid "Hungary"
+msgstr "Ungarsk"
+
+#: ../rules/base.xml.in.h:181
+#, fuzzy
+msgid "Iceland"
+msgstr "Islandsk"
+
+#: ../rules/base.xml.in.h:182
+#, fuzzy
+msgid "Ind"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:183
+#, fuzzy
+msgid "India"
+msgstr "Ukraine"
+
+#: ../rules/base.xml.in.h:184
+msgid "International (with dead keys)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:186
+#, fuzzy
+msgid "Iran"
+msgstr "Irn"
+
+#: ../rules/base.xml.in.h:187
+#, fuzzy
+msgid "Ireland"
+msgstr "Islandsk"
+
+#: ../rules/base.xml.in.h:192
+#, fuzzy
+msgid "Israel"
+msgstr "Israelsk"
+
+#: ../rules/base.xml.in.h:194
+#, fuzzy
+msgid "Italy"
+msgstr "Ita"
+
+#: ../rules/base.xml.in.h:195
+#, fuzzy
+msgid "Japan"
+msgstr "Japansk"
+
+#: ../rules/base.xml.in.h:199
+msgid "Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:201
+#, fuzzy
+msgid "Kyr"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:202
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: ../rules/base.xml.in.h:204
+#, fuzzy
+msgid "Lao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:205
+#, fuzzy
+msgid "Laos"
+msgstr "B�rbar"
+
+#: ../rules/base.xml.in.h:210
+#, fuzzy
+msgid "Latin American"
+msgstr "Latinamerika"
+
+#: ../rules/base.xml.in.h:211
+#, fuzzy
+msgid "Latin Unicode"
+msgstr "Latinamerika"
+
+#: ../rules/base.xml.in.h:212
+#, fuzzy
+msgid "Latin Unicode qwerty"
+msgstr "Latinamerika"
+
+#: ../rules/base.xml.in.h:213
+#, fuzzy
+msgid "Latin qwerty"
+msgstr "Ungarsk (qwerty)"
+
+#: ../rules/base.xml.in.h:214
+msgid "Latin with guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:215
+#, fuzzy
+msgid "Latvia"
+msgstr "Lettisk"
+
+#: ../rules/base.xml.in.h:216
+#, fuzzy
+msgid "Left Alt key changes group."
+msgstr "Venstre Alt-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:217
+#, fuzzy
+msgid "Left Alt key switches group while pressed."
+msgstr "Venstre Win-tast skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:218
+#, fuzzy
+msgid "Left Ctrl key changes group."
+msgstr "Venstre Ctrl-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:219
+#, fuzzy
+msgid "Left Shift key changes group."
+msgstr "Venstre skiftetast skifter gruppe"
+
+#: ../rules/base.xml.in.h:220
+#, fuzzy
+msgid "Left Win-key changes group."
+msgstr "Venstre Win-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:221
+#, fuzzy
+msgid "Left Win-key switches group while pressed."
+msgstr "Venstre Win-tast skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:222
+msgid "Lithuania"
+msgstr ""
+
+#: ../rules/base.xml.in.h:223
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: ../rules/base.xml.in.h:235
+#, fuzzy
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: ../rules/base.xml.in.h:241
+#, fuzzy
+msgid "Macedonia (FYROM)"
+msgstr "Makedonsk"
+
+#: ../rules/base.xml.in.h:244
+#, fuzzy
+msgid "Make CapsLock an additional Ctrl."
+msgstr "G�r Caps Lock til en ekstra Ctrl"
+
+#: ../rules/base.xml.in.h:247
+#, fuzzy
+msgid "Maldives"
+msgstr "Maltesisk"
+
+#: ../rules/base.xml.in.h:248
+#, fuzzy
+msgid "Malta"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:249
+#, fuzzy
+msgid "Mao"
+msgstr "Mal"
+
+#: ../rules/base.xml.in.h:250
+#, fuzzy
+msgid "Maori"
+msgstr "Farsi"
+
+#: ../rules/base.xml.in.h:254
+#, fuzzy
+msgid "Menu is Compose."
+msgstr "Menu is Compose"
+
+#: ../rules/base.xml.in.h:255
+#, fuzzy
+msgid "Menu key changes group."
+msgstr "Menutast skifter gruppe"
+
+#: ../rules/base.xml.in.h:263
+#, fuzzy
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+
+#: ../rules/base.xml.in.h:265
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Internet Keyboard"
+
+#: ../rules/base.xml.in.h:271
+#, fuzzy
+msgid "Mongolia"
+msgstr "Mongolsk"
+
+#: ../rules/base.xml.in.h:272
+msgid "Multilingual"
+msgstr ""
+
+#: ../rules/base.xml.in.h:273
+msgid "Multilingual, second part"
+msgstr ""
+
+#: ../rules/base.xml.in.h:274
+#, fuzzy
+msgid "Myanmar"
+msgstr "Dansk"
+
+#: ../rules/base.xml.in.h:275
+msgid "Netherlands"
+msgstr ""
+
+#: ../rules/base.xml.in.h:278
+#, fuzzy
+msgid "Northern Saami"
+msgstr "Nordligt Saami (Norge)"
+
+#: ../rules/base.xml.in.h:279
+#, fuzzy
+msgid "Northern Saami, eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:281
+#, fuzzy
+msgid "Norway"
+msgstr "Norsk"
+
+#: ../rules/base.xml.in.h:282
+#, fuzzy
+msgid "NumLock LED shows alternative group."
+msgstr "Num Lock LED viser alternativ gruppe"
+
+#: ../rules/base.xml.in.h:284
+#, fuzzy
+msgid "Ogham IS434"
+msgstr "IS434"
+
+#: ../rules/base.xml.in.h:288
+msgid "Pak"
+msgstr ""
+
+#: ../rules/base.xml.in.h:289
+#, fuzzy
+msgid "Pakistan"
+msgstr "Tajik"
+
+#: ../rules/base.xml.in.h:290
+#, fuzzy
+msgid "Pattachote"
+msgstr "Thai (Pattachote)"
+
+#: ../rules/base.xml.in.h:293
+#, fuzzy
+msgid "Poland"
+msgstr "Pan"
+
+#: ../rules/base.xml.in.h:295
+#, fuzzy
+msgid "Portugal"
+msgstr "Portugisisk"
+
+#: ../rules/base.xml.in.h:296
+#, fuzzy
+msgid "Power G5"
+msgstr "PowerPC PS/2"
+
+#: ../rules/base.xml.in.h:298
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level."
+msgstr "Tryk venstre Win-tast for at v�lge tredje niveau"
+
+#: ../rules/base.xml.in.h:299
+#, fuzzy
+msgid "Press Left Win-key to choose 3rd level."
+msgstr "Tryk venstre Win-tast for at v�lge tredje niveau"
+
+#: ../rules/base.xml.in.h:300
+#, fuzzy
+msgid "Press Menu key to choose 3rd level."
+msgstr "Tryk menutast for at v�lge tredje niveau"
+
+#: ../rules/base.xml.in.h:301
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level."
+msgstr "Tryk h�jre Win-tast for at v�lge tredje niveau"
+
+#: ../rules/base.xml.in.h:302
+#, fuzzy
+msgid "Press Right Ctrl to choose 3rd level."
+msgstr "Tryk h�jre Ctrl-tast for at v�lge tredje niveau"
+
+#: ../rules/base.xml.in.h:303
+#, fuzzy
+msgid "Press Right Win-key to choose 3rd level."
+msgstr "Tryk h�jre Win-tast for at v�lge tredje niveau"
+
+#: ../rules/base.xml.in.h:304
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level."
+msgstr "Tryk en af Win-tasterne for at v�lge tredje niveau"
+
+#: ../rules/base.xml.in.h:305
+#, fuzzy
+msgid "Press any of Win-keys to choose 3rd level."
+msgstr "Tryk en af Win-tasterne for at v�lge tredje niveau"
+
+#: ../rules/base.xml.in.h:306
+#, fuzzy
+msgid "Pro"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:307
+msgid "Pro Keypad"
+msgstr ""
+
+#: ../rules/base.xml.in.h:308
+#, fuzzy
+msgid "Probhat"
+msgstr "Prt"
+
+#: ../rules/base.xml.in.h:312
+#, fuzzy
+msgid "R-Alt switches group while pressed."
+msgstr "H�jre Alt skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:313
+#, fuzzy
+msgid "Right Alt is Compose."
+msgstr "H�jre Alt er Compose"
+
+#: ../rules/base.xml.in.h:314
+#, fuzzy
+msgid "Right Alt key changes group."
+msgstr "H�jre Alt-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:315
+#, fuzzy
+msgid "Right Ctrl is Compose."
+msgstr "H�jre Alt er Compose"
+
+#: ../rules/base.xml.in.h:316
+#, fuzzy
+msgid "Right Ctrl key changes group."
+msgstr "H�jre Ctrl-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:317
+#, fuzzy
+msgid "Right Ctrl key switches group while pressed."
+msgstr "H�jre Win-tast skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:318
+#, fuzzy
+msgid "Right Ctrl key works as Right Alt."
+msgstr "H�jre Ctrl-tast virker som h�jre Alt"
+
+#: ../rules/base.xml.in.h:319
+#, fuzzy
+msgid "Right Shift key changes group."
+msgstr "H�jre skiftetast skifter gruppe"
+
+#: ../rules/base.xml.in.h:320
+#, fuzzy
+msgid "Right Win-key changes group."
+msgstr "H�jre Win-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:321
+#, fuzzy
+msgid "Right Win-key is Compose."
+msgstr "H�jre Win-tast er Compose"
+
+#: ../rules/base.xml.in.h:322
+#, fuzzy
+msgid "Right Win-key switches group while pressed."
+msgstr "H�jre Win-tast skifter gruppe mens nedtrykket"
+
+#: ../rules/base.xml.in.h:323
+#, fuzzy
+msgid "Romania"
+msgstr "Rum�nsk"
+
+#: ../rules/base.xml.in.h:324
+#, fuzzy
+msgid "Romanian keyboard with German letters"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:325
+#, fuzzy
+msgid "Romanian keyboard with German letters, eliminate dead keys"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:328
+#, fuzzy
+msgid "Russia"
+msgstr "Russisk"
+
+#: ../rules/base.xml.in.h:330
+#, fuzzy
+msgid "Russian phonetic"
+msgstr "Russisk"
+
+#: ../rules/base.xml.in.h:331
+#, fuzzy
+msgid "Russian phonetic, eliminate dead keys"
+msgstr "Sl� d�de taster fra"
+
+#: ../rules/base.xml.in.h:332
+msgid "SCG"
+msgstr ""
+
+#: ../rules/base.xml.in.h:340
+#, fuzzy
+msgid "ScrollLock LED shows alternative group."
+msgstr "Scroll Lock LED viser alternativ gruppe"
+
+#: ../rules/base.xml.in.h:341
+msgid "Serbia and Montenegro"
+msgstr ""
+
+#: ../rules/base.xml.in.h:342
+#, fuzzy
+msgid "Shift with numpad keys works as in MS Windows."
+msgstr "Skift med numeriske taster virker som i MS Windows"
+
+#: ../rules/base.xml.in.h:343
+#, fuzzy
+msgid "Shift+CapsLock changes group."
+msgstr "Caps Lock-tast skifter gruppe"
+
+#: ../rules/base.xml.in.h:344
+#, fuzzy
+msgid "Slovakia"
+msgstr "Slovakisk"
+
+#: ../rules/base.xml.in.h:345
+#, fuzzy
+msgid "Slovenia"
+msgstr "Slovensk"
+
+#: ../rules/base.xml.in.h:346
+#, fuzzy
+msgid "Spain"
+msgstr "Svn"
+
+#: ../rules/base.xml.in.h:348
+#, fuzzy
+msgid "SrL"
+msgstr "Syr"
+
+#: ../rules/base.xml.in.h:349
+#, fuzzy
+msgid "Sri Lanka"
+msgstr "Serbisk"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:352
+#, fuzzy
+msgid "Standard RSTU"
+msgstr "Standard"
+
+#. RSTU 2019-91
+#: ../rules/base.xml.in.h:354
+msgid "Standard RSTU on Russian layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:356
+#, fuzzy
+msgid "Super Power Multimedia Keyboard"
+msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
+
+#: ../rules/base.xml.in.h:360
+#, fuzzy
+msgid "Swap Ctrl and CapsLock."
+msgstr "Ombyt Ctrl og Caps Lock"
+
+#: ../rules/base.xml.in.h:362
+#, fuzzy
+msgid "Sweden"
+msgstr "Sve"
+
+#: ../rules/base.xml.in.h:363
+#, fuzzy
+msgid "Switzerland"
+msgstr "Schweizisk-tysk"
+
+#: ../rules/base.xml.in.h:366
+#, fuzzy
+msgid "Syria"
+msgstr "Syrisk"
+
+#: ../rules/base.xml.in.h:368
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Russisk"
+
+#: ../rules/base.xml.in.h:369
+#, fuzzy
+msgid "TIS-820.2538"
+msgstr "Thai (TIS-820.2538)"
+
+#: ../rules/base.xml.in.h:370
+#, fuzzy
+msgid "Tajikistan"
+msgstr "Tajik"
+
+#: ../rules/base.xml.in.h:372
+#, fuzzy
+msgid "Tamil TAB Typewriter"
+msgstr "\"Skrivemaskine\""
+
+#: ../rules/base.xml.in.h:373
+msgid "Tamil TSCII Typewriter"
+msgstr ""
+
+#: ../rules/base.xml.in.h:374
+#, fuzzy
+msgid "Tamil Unicode"
+msgstr "Latinamerika"
+
+#: ../rules/base.xml.in.h:377
+#, fuzzy
+msgid "Thailand"
+msgstr "Tha"
+
+#: ../rules/base.xml.in.h:379
+msgid "Tilde (~) variant"
+msgstr ""
+
+#: ../rules/base.xml.in.h:386
+#, fuzzy
+msgid "Typewriter"
+msgstr "\"Skrivemaskine\""
+
+#: ../rules/base.xml.in.h:388
+#, fuzzy
+msgid "US keyboard with Bosnian digraphs"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:389
+#, fuzzy
+msgid "US keyboard with Bosnian letters"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:390
+#, fuzzy
+msgid "US keyboard with Croatian digraphs"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:391
+#, fuzzy
+msgid "US keyboard with Croatian letters"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:392
+#, fuzzy
+msgid "US keyboard with Lithuanian letters"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:393
+#, fuzzy
+msgid "US keyboard with Maltian letters"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:394
+#, fuzzy
+msgid "US keyboard with Slovenian digraphs"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:395
+#, fuzzy
+msgid "US keyboard with Slovenian letters"
+msgstr "US-tastatur med rum�nske bogstaver"
+
+#: ../rules/base.xml.in.h:398
+#, fuzzy
+msgid "Ukraine"
+msgstr "Ukraine"
+
+#: ../rules/base.xml.in.h:401
+msgid "Urdu"
+msgstr ""
+
+#: ../rules/base.xml.in.h:402
+msgid "Use Bosnian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:403
+msgid "Use Croatian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:404
+msgid "Use Slovenian digraphs"
+msgstr ""
+
+#: ../rules/base.xml.in.h:405
+msgid "Use guillemots for quotes"
+msgstr ""
+
+#: ../rules/base.xml.in.h:406
+#, fuzzy
+msgid "Use keyboard LED to show alternative group."
+msgstr "Bruger tastatur-LED til at vise alternativ gruppe"
+
+#: ../rules/base.xml.in.h:408
+#, fuzzy
+msgid "Uzbekistan"
+msgstr "Uzbekisk"
+
+#: ../rules/base.xml.in.h:409
+#, fuzzy
+msgid "Vietnam"
+msgstr "Vietnamesisk"
+
+#: ../rules/base.xml.in.h:413
+msgid "With <\\|> key"
+msgstr ""
+
+#: ../rules/base.xml.in.h:414
+msgid "With guillemots"
+msgstr ""
+
+#: ../rules/base.xml.in.h:416
+msgid "Z and ZHE swapped"
+msgstr ""
+
+#: ../rules/base.xml.in.h:422
+msgid "qwerty, extended Backslash"
+msgstr ""
+
+#: ../rules/base.xml.in.h:424
+#, fuzzy
+msgid "qwertz"
+msgstr "qwerty"
+
+#, fuzzy
+#~ msgid "\"Standard\""
+#~ msgstr "Standard"
+
+#, fuzzy
+#~ msgid "Romanian keyboard with MS layout"
+#~ msgstr "US-tastatur med rum�nske bogstaver"
+
+#, fuzzy
+#~ msgid "Serbia"
+#~ msgstr "Serbisk"
+
+#, fuzzy
+#~ msgid "Srp"
+#~ msgstr "Syr"
+
+#, fuzzy
+#~ msgid "Tamil INSCRIPT"
+#~ msgstr "Bengali"
+
+#, fuzzy
+#~ msgid "Ogham IS434 laptop"
+#~ msgstr "IS434-b�rbar"
+
+#, fuzzy
+#~ msgid "Ogham laptop"
+#~ msgstr "b�bar"
+
+#, fuzzy
+#~ msgid "Sinhala phonetic"
+#~ msgstr "Russisk"
+
+#, fuzzy
+#~ msgid "Malayalam with Malayalam digits"
+#~ msgstr "Malayalam"
+
+#, fuzzy
+#~ msgid "Dzo"
+#~ msgstr "Dvo"
+
+#, fuzzy
+#~ msgid "Gurmukhi INSCRIPT"
+#~ msgstr "Gurmukhi"
+
+#, fuzzy
+#~ msgid "Kannada INSCRIPT"
+#~ msgstr "Kannada"
+
+#, fuzzy
+#~ msgid "Smi"
+#~ msgstr "Sapmi"
+
+#, fuzzy
+#~ msgid "Deva"
+#~ msgstr "Dvorak"
+
+#, fuzzy
+#~ msgid "Ogam"
+#~ msgstr "Ogham"
+
+#, fuzzy
+#~ msgid "Sin"
+#~ msgstr "Svn"
+
+#, fuzzy
+#~ msgid "Tam"
+#~ msgstr "Tamil"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TAB encoding"
+#~ msgstr "En tamilsk skrivemaskine-tastaturudl�gning; TAB-kodning"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; TSCII encoding"
+#~ msgstr "En tamilsk skrivemaskine-tastaturudl�gning; TSCII-kodning"
+
+#, fuzzy
+#~ msgid "Urd"
+#~ msgstr "Ukr"
+
+#, fuzzy
+#~ msgid "Typewrite-style keymap; Unicode encoding"
+#~ msgstr "En tamilsk skrivemaskine-tastaturudl�gning; Unicode-kodning"
+
+#, fuzzy
+#~ msgid "Kedmanee"
+#~ msgstr "Thai (Kedmanee)"
+
+#, fuzzy
+#~ msgid "Old standard"
+#~ msgstr "Standard"
+
+#, fuzzy
+#~ msgid "Swiss"
+#~ msgstr "Svensk"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/quiltrc
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/quiltrc
@@ -0,0 +1,2 @@
+QUILT_PATCHES="debian/patches"
+QUILT_NO_DIFF_TIMESTAMPS=1
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/series
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/series
@@ -0,0 +1,22 @@
+#cvs.diff
+#fix_xkbcomp_crash.diff
+#revert_bz8572.diff
+#po.diff
+clean.diff
+docs.diff
+sclk_toggle.diff
+mac_poweroff.diff
+#bz1576.diff
+#bz8668.diff
+unhide_lv3_enter_switch.diff
+#compatibility.diff
+#japan.diff
+resync_rules_base.diff
+send-upstream/001_keypad_comma.diff
+#send-upstream/002_add_asus6000.diff
+add_void_definition_pl-324647.diff
+in_backslash.diff
+unicode_symbols.diff
+ca-shs-add.diff
+lekp-add.diff
+nbsp-level4nl.diff
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/13_macintosh_problems.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/13_macintosh_problems.diff
@@ -0,0 +1,22 @@
+$Id: 093_xkb_fix_macintosh_problems.diff 480 2005-08-02 20:14:26Z branden $
+
+Fix miscellaneous Macintosh XKB data problems:
+* The keypad equal key (<KPEQ>) should map to the "KP_Equal" keysym, not
+  "equal".
+
+This patch by Branden Robinson.
+
+Not submitted to X.Org.
+
+diff -ruN xc-old/programs/xkbcomp/symbols/macintosh/us xc/programs/xkbcomp/symbols/macintosh/us
+--- xc-old/programs/xkbcomp/symbols/macintosh/us	2005-05-08 23:28:52.000000000 -0400
++++ xc/programs/xkbcomp/symbols/macintosh/us	2005-07-02 14:59:09.000000000 -0400
+@@ -101,7 +101,7 @@
+ 
+     // Begin "Keypad" section
+     key <NMLK> {	[  Num_Lock,	Pointer_EnableKeys	]	};
+-    key <KPEQ> {	[  equal				]	};
++    key <KPEQ> {	[  KP_Equal				]	};
+     key <KPDV> {	[  KP_Divide				]	};
+     key <KPMU> {	[  KP_Multiply				]	};
+ 
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/japan.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/japan.diff
@@ -0,0 +1,143 @@
+See https://bugs.freedesktop.org/show_bug.cgi?id=8503
+Fixed in CVS.
+
+Index: xkb-data/symbols/jp
+===================================================================
+--- xkb-data.orig/symbols/jp
++++ xkb-data/symbols/jp
+@@ -3,9 +3,11 @@
+ // based on:
+ // symbols for a Japanese 106 keyboard(by tsuka@kawalab.dnj.ynu.ac.jp)
+ 
+-default xkb_symbols "jp106" {
+-    include "srvr_ctrl(xfree86)"
++// latin part of jp keyboard map
++partial default
++xkb_symbols "latin" {
+ 
++    include "us"
+     name[Group1]= "Japan";
+ 
+     // Alphanumeric section
+@@ -13,6 +15,55 @@
+ 	type[Group1]="PC_SYSRQ",
+ 	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
+     };
++
++    key <AE02> { [ 2, quotedbl		] };
++
++    key <AE06> { [ 6, ampersand		] };
++    key <AE07> { [ 7, apostrophe	] };
++    key <AE08> { [ 8, parenleft		] };
++    key <AE09> { [ 9, parenright	] };
++    key <AE10> { [ 0,asciitilde		] };
++    key <AE11> { [ minus, equal		] };
++    key <AE12> { [ asciicircum,	asciitilde] };
++    key <AE13> { [ backslash, bar 	] };
++
++    key <AD11> { [ at, grave		] };
++    key <AD12> { [ bracketleft,	braceleft ] };
++
++    key <CAPS> { [ Eisu_toggle, Caps_Lock ] };
++
++    key <AC10> { [ semicolon, plus	] };
++    key <AC11> { [ colon, asterisk	] };
++    key <AC12> { [ bracketright, braceright ] };
++
++    key <AB11> { [ backslash, underscore ] };
++
++    key <NFER> { [ Muhenkan		]	};
++
++    key <XFER> {
++	type[Group1]="PC_SYSRQ",
++	symbols[Group1]= [ Henkan, Mode_switch ]
++    };
++    key <HKTG> {
++	type[Group1]="PC_SYSRQ",
++	symbols[Group1]= [ Hiragana_Katakana, Romaji ]
++    };
++
++    key <PRSC> {
++        type[Group1]= "PC_SYSRQ",
++        symbols[Group1]= [ Print, Execute ]
++    };
++};
++
++partial hidden
++xkb_symbols "jp106" {
++    include "srvr_ctrl(xfree86)"
++
++    // Alphanumeric section
++    key <HZTG> {
++	type[Group1]="PC_SYSRQ",
++	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
++    };
+     key <AE01> { [ kana_NU		]	};
+     key <AE02> { [ kana_FU		]	};
+     key <AE03> { [ kana_A, kana_a	]	};
+@@ -84,53 +135,3 @@
+         symbols[Group1]= [ Print, Execute ]
+     };
+ };
+-
+-// latin part of jp keyboard map
+-partial hidden
+-xkb_symbols "latin" {
+-
+-    include "us"
+-    // Alphanumeric section
+-    key <HZTG> {
+-	type[Group1]="PC_SYSRQ",
+-	symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
+-    };
+-
+-    key <AE02> { [ 2, quotedbl		] };
+-
+-    key <AE06> { [ 6, ampersand		] };
+-    key <AE07> { [ 7, apostrophe	] };
+-    key <AE08> { [ 8, parenleft		] };
+-    key <AE09> { [ 9, parenright	] };
+-    key <AE10> { [ 0,asciitilde		] };
+-    key <AE11> { [ minus, equal		] };
+-    key <AE12> { [ asciicircum,	asciitilde] };
+-    key <AE13> { [ backslash, bar 	] };
+-
+-    key <AD11> { [ at, grave		] };
+-    key <AD12> { [ bracketleft,	braceleft ] };
+-
+-    key <CAPS> { [ Eisu_toggle, Caps_Lock ] };
+-
+-    key <AC10> { [ semicolon, plus	] };
+-    key <AC11> { [ colon, asterisk	] };
+-    key <AC12> { [ bracketright, braceright ] };
+-
+-    key <AB11> { [ backslash, underscore ] };
+-
+-    key <NFER> { [ Muhenkan		]	};
+-
+-    key <XFER> {
+-	type[Group1]="PC_SYSRQ",
+-	symbols[Group1]= [ Henkan, Mode_switch ]
+-    };
+-    key <HKTG> {
+-	type[Group1]="PC_SYSRQ",
+-	symbols[Group1]= [ Hiragana_Katakana, Romaji ]
+-    };
+-
+-    key <PRSC> {
+-        type[Group1]= "PC_SYSRQ",
+-        symbols[Group1]= [ Print, Execute ]
+-    };
+-};
+Index: xkb-data/rules/base.ml_s.part
+===================================================================
+--- xkb-data.orig/rules/base.ml_s.part
++++ xkb-data/rules/base.ml_s.part
+@@ -15,6 +15,6 @@
+   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
+  $macs		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
+  $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
+-  *		jp			=	pc(pc105)+jp(latin)+jp:2
++  *		jp			=	pc(pc105)+jp(latin)+jp(jp106):2
+   *	   	$nonlatin		=	pc(pc105)+us+%l%(v):2
+   *		*			=	pc(pc105)+%l%(v)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/fix_xkbcomp_crash.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/fix_xkbcomp_crash.diff
@@ -0,0 +1,204 @@
+At some point, CVS triggered nasty bugs in xkbcomp.  A patch has been
+tested in Debian and submitted upstream, but a different fix has been
+applied.  For now fix_xkbcomp_crash.diff is disabled, but if xkbcomp
+crashes again, it can be reenabled to get back to the previous fix.
+
+Submitted upstream: https://bugs.freedesktop.org/show_bug.cgi?id=8402
+
+Index: xkb-data/types/numpad
+===================================================================
+--- xkb-data.orig/types/numpad
++++ xkb-data/types/numpad
+@@ -1,6 +1,9 @@
+ 
+-partial default xkb_types "pc" {
+-    type "KEYPAD" {
++default
++xkb_types "pc" {
++    virtual_modifiers LevelThree;
++
++    override type "KEYPAD" {
+ 	modifiers = Shift+NumLock;
+ 	map[None] = Level1;
+ 	map[Shift] = Level2;
+@@ -9,12 +12,29 @@
+ 	level_name[Level1] = "Base";
+ 	level_name[Level2] = "Number";
+     };
+-    include "extra(keypad)"
++
++    override type "FOUR_LEVEL_KEYPAD" {
++	modifiers = Shift+NumLock+LevelThree;
++	map[None] = Level1;
++	map[Shift] = Level2;
++	map[NumLock] = Level2;
++	map[Shift+NumLock] = Level1;
++	map[LevelThree] = Level3;
++	map[Shift+LevelThree] = Level4;
++	map[NumLock+LevelThree] = Level4;
++	map[Shift+NumLock+LevelThree] = Level3;
++	level_name[Level1] = "Base";
++	level_name[Level2] = "Number";
++	level_name[Level3] = "Alt Base";
++	level_name[Level4] = "Alt Number";
++    };       
+ };
+ 
+ // On Mac keypads, level 1 and 2 are swapped
+-partial xkb_types "mac" {
+-    type "KEYPAD" {
++xkb_types "mac" {
++    virtual_modifiers LevelThree;
++
++    override type "KEYPAD" {
+ 	modifiers = Shift+NumLock;
+ 	map[None] = Level2;
+ 	map[Shift] = Level1;
+@@ -23,11 +43,28 @@
+ 	level_name[Level2] = "Base";
+ 	level_name[Level1] = "Number";
+     };
+-    include "extra(mac_keypad)"
++
++    override type "FOUR_LEVEL_KEYPAD" {
++	modifiers = Shift+NumLock+LevelThree;
++	map[None] = Level2;
++	map[Shift] = Level1;
++	map[NumLock] = Level1;
++	map[Shift+NumLock] = Level2;
++	map[LevelThree] = Level4;
++	map[Shift+LevelThree] = Level3;
++	map[NumLock+LevelThree] = Level3;
++	map[Shift+NumLock+LevelThree] = Level4;
++	level_name[Level2] = "Base";
++	level_name[Level1] = "Number";
++	level_name[Level4] = "Alt Base";
++	level_name[Level3] = "Alt Number";
++    };       
+ };
+ 
+-partial xkb_types "microsoft" {
+-    type "KEYPAD" {
++xkb_types "microsoft" {
++    virtual_modifiers LevelThree;
++
++    override type "KEYPAD" {
+         modifiers = Shift+NumLock;
+         map[None] = Level1;
+         preserve[Shift] = Shift;
+@@ -35,6 +72,21 @@
+         level_name[Level1] = "Base";
+         level_name[Level2] = "Number";
+     };
+-    include "extra(keypad)"
++
++    override type "FOUR_LEVEL_KEYPAD" {
++	modifiers = Shift+NumLock+LevelThree;
++	map[None] = Level1;
++	map[Shift] = Level2;
++	map[NumLock] = Level2;
++	map[Shift+NumLock] = Level1;
++	map[LevelThree] = Level3;
++	map[Shift+LevelThree] = Level4;
++	map[NumLock+LevelThree] = Level4;
++	map[Shift+NumLock+LevelThree] = Level3;
++	level_name[Level1] = "Base";
++	level_name[Level2] = "Number";
++	level_name[Level3] = "Alt Base";
++	level_name[Level4] = "Alt Number";
++    };       
+ };
+ 
+Index: xkb-data/types/extra
+===================================================================
+--- xkb-data.orig/types/extra
++++ xkb-data/types/extra
+@@ -85,6 +85,23 @@
+ 	level_name[Level4] = "Ctrl+Alt";
+     };
+ 
++    // This enables the four level shifting also for the keypad.
++    type "FOUR_LEVEL_KEYPAD" {
++	modifiers = Shift+NumLock+LevelThree;
++	map[None] = Level1;
++	map[Shift] = Level2;
++	map[NumLock] = Level2;
++	map[Shift+NumLock] = Level1;
++	map[LevelThree] = Level3;
++	map[Shift+LevelThree] = Level4;
++	map[NumLock+LevelThree] = Level4;
++	map[Shift+NumLock+LevelThree] = Level3;
++	level_name[Level1] = "Base";
++	level_name[Level2] = "Number";
++	level_name[Level3] = "Alt Base";
++	level_name[Level4] = "Alt Number";
++    };       
++
+ // Special type for keys used in Serbian Latin Unicode map
+ // It makes it possible to use all three forms of latin letters 
+ // present in Unicode that are made up of two separate letters 
+@@ -107,46 +124,3 @@
+         level_name[Level4] = "Shift AltGr";
+     };
+ };
+-
+-// This enables the four level shifting also for the keypad.
+-partial xkb_types "keypad" {
+-    virtual_modifiers LevelThree;
+-
+-    type "FOUR_LEVEL_KEYPAD" {
+-	modifiers = Shift+NumLock+LevelThree;
+-	map[None] = Level1;
+-	map[Shift] = Level2;
+-	map[NumLock] = Level2;
+-	map[Shift+NumLock] = Level1;
+-	map[LevelThree] = Level3;
+-	map[Shift+LevelThree] = Level4;
+-	map[NumLock+LevelThree] = Level4;
+-	map[Shift+NumLock+LevelThree] = Level3;
+-	level_name[Level1] = "Base";
+-	level_name[Level2] = "Number";
+-	level_name[Level3] = "Alt Base";
+-	level_name[Level4] = "Alt Number";
+-    };       
+-};
+-
+-// This enables the four level shifting also for the keypad,
+-// but levels 1 and 2, and 3 and 4 are swapped on Mac keypads.
+-partial xkb_types "mac_keypad" {
+-    virtual_modifiers LevelThree;
+-
+-    type "FOUR_LEVEL_KEYPAD" {
+-	modifiers = Shift+NumLock+LevelThree;
+-	map[None] = Level2;
+-	map[Shift] = Level1;
+-	map[NumLock] = Level1;
+-	map[Shift+NumLock] = Level2;
+-	map[LevelThree] = Level4;
+-	map[Shift+LevelThree] = Level3;
+-	map[NumLock+LevelThree] = Level3;
+-	map[Shift+NumLock+LevelThree] = Level4;
+-	level_name[Level2] = "Base";
+-	level_name[Level1] = "Number";
+-	level_name[Level4] = "Alt Base";
+-	level_name[Level3] = "Alt Number";
+-    };       
+-};
+Index: xkb-data/types/basic
+===================================================================
+--- xkb-data.orig/types/basic
++++ xkb-data/types/basic
+@@ -28,4 +28,13 @@
+         level_name[Level2] = "Caps";
+     };
+ 
++    type "KEYPAD" {
++	modifiers = Shift+NumLock;
++	map[None] = Level1;
++	map[Shift] = Level2;
++	map[NumLock] = Level2;
++	map[Shift+NumLock] = Level1;
++	level_name[Level1] = "Base";
++	level_name[Level2] = "Number";
++    };
+ };
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/bz1576.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/bz1576.diff
@@ -0,0 +1,202 @@
+Apply patch found in
+   https://bugs.freedesktop.org/show_bug.cgi?id=1576
+
+Index: xkb-data/rules/base.lists.part
+===================================================================
+--- xkb-data.orig/rules/base.lists.part
++++ xkb-data/rules/base.lists.part
+@@ -18,7 +18,7 @@
+ ! $maclaptop = ibook powerbook macbook78 macbook79
+ ! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
+ 
+-! $macvendorlayouts = ch de dk es fi fr gb is it nl no pt se us
++! $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 
+Index: xkb-data/symbols/macintosh_vndr/Makefile.am
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/Makefile.am
++++ xkb-data/symbols/macintosh_vndr/Makefile.am
+@@ -4,5 +4,5 @@
+ apple ch de dk \
+ es fi fr \
+ gb is it \
+-nl no pt \
++latam nl no pt \
+ se us
+Index: xkb-data/symbols/macintosh_vndr/Makefile.in
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/Makefile.in
++++ xkb-data/symbols/macintosh_vndr/Makefile.in
+@@ -159,7 +159,7 @@
+ apple ch de dk \
+ es fi fr \
+ gb is it \
+-nl no pt \
++latam nl no pt \
+ se us
+ 
+ all: all-am
+Index: xkb-data/symbols/macintosh_vndr/dk
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/dk
++++ xkb-data/symbols/macintosh_vndr/dk
+@@ -29,7 +29,7 @@
+     key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};
+     key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};
+     key <AC03> {        [        d,               D,              eth,             ETH      ]};
+-    key <AD03> {        [        e,               E,         NoSymbol,            cent      ]};
++    key <AD03> {        [        e,               E,         EuroSign,            cent      ]};
+     key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
+     key <AD05> {        [        t,               T,            thorn,           THORN      ]};
+     key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
+Index: xkb-data/symbols/macintosh_vndr/es
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/es
++++ xkb-data/symbols/macintosh_vndr/es
+@@ -1,38 +1,6 @@
+ 
+ partial default alphanumeric_keys 
+ xkb_symbols "basic" {
+-
+-    // Describes the differences between a very simple mac_US
+-    // keyboard and a very simple Spanish keybaord
+-
+-    include "latin"
++    include "es"
+     name[Group1]= "Spain - Mac";
+-
+-    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
+-    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
+-    key <AE01> {	[               1,          exclam 	]	};
+-    key <AE02> {	[               2,      exclamdown,               at,       oneeighth	]	};
+-    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
+-    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
+-    key <AE05> {	[               5,         percent	]	};
+-    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
+-    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
+-    key <AE08> {	[               8,        asterisk,           degree	]	};
+-    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
+-    key <AE10> {	[               0,      parenright     	]	};
+-    key <AE11> {	[           minus,      underscore	]	};
+-    key <AE12> {	[           equal,            plus,        plusminus	]	};
+-    key <AD11> {	[      dead_grave,          degree 	]	};
+-    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
+-
+-    key <AB08> {	[           comma,    questiondown   	]	};
+-    key <AB09> {	[          period,        question     	]	};
+-    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
+-    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
+-    key <AC11> {	[       semicolon,    	     colon 	]	};
+-    key <BKSL> {	[      apostrophe,        quotedbl	]	};
+-
+-    // End alphanumeric section
+-
+-    include "level3(ralt_switch)"
+ };
+Index: xkb-data/symbols/macintosh_vndr/it
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/it
++++ xkb-data/symbols/macintosh_vndr/it
+@@ -21,7 +21,7 @@
+ 
+     key <AD01> {	[           q,  Q 		]	};
+     key <AD02> {	[	    z,  Z		]	};
+-    key <AD03> {	[	    e,  E		]	};
++    key <AD03> {	[	    e,  E,     EuroSign		]	};
+     key <AD04> {	[	    r,  R,   registered			] 	};
+     key <AD05> {	[	    t,  T		]	};
+     key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
+Index: xkb-data/symbols/macintosh_vndr/latam
+===================================================================
+--- /dev/null
++++ xkb-data/symbols/macintosh_vndr/latam
+@@ -0,0 +1,38 @@
++
++partial default alphanumeric_keys 
++xkb_symbols "basic" {
++
++    // Describes the differences between a very simple mac_US
++    // keyboard and a very simple Spanish keybaord
++
++    include "latin"
++    name[Group1]= "Latin American - Mac";
++
++    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
++    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
++    key <AE01> {	[               1,      exclamdown 	]	};
++    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};
++    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
++    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
++    key <AE05> {	[               5,         percent	]	};
++    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
++    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
++    key <AE08> {	[               8,        asterisk,           degree	]	};
++    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
++    key <AE10> {	[               0,      parenright     	]	};
++    key <AE11> {	[           minus,      underscore	]	};
++    key <AE12> {	[           equal,            plus,        plusminus	]	};
++    key <AD11> {	[      dead_grave,          degree 	]	};
++    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
++
++    key <AB08> {	[           comma,    questiondown   	]	};
++    key <AB09> {	[          period,        question     	]	};
++    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
++    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
++    key <AC11> {	[       semicolon,    	     colon 	]	};
++    key <BKSL> {	[      apostrophe,        quotedbl	]	};
++
++    // End alphanumeric section
++
++    include "level3(ralt_switch)"
++};
+Index: xkb-data/symbols/macintosh_vndr/no
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/no
++++ xkb-data/symbols/macintosh_vndr/no
+@@ -34,6 +34,7 @@
+ 
+     // End alphanumeric section
+ 
++    include "eurosign(e)"
+     include "level3(ralt_switch)"
+ };
+ 
+Index: xkb-data/symbols/macintosh_vndr/pt
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/pt
++++ xkb-data/symbols/macintosh_vndr/pt
+@@ -33,6 +33,7 @@
+     key <AD12> {	[      dead_acute,      dead_grave 	]	};
+     // End alphanumeric section
+ 
++    include "eurosign(e)"
+     include "level3(ralt_switch)"
+ };
+ 
+Index: xkb-data/symbols/macintosh_vndr/se
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/se
++++ xkb-data/symbols/macintosh_vndr/se
+@@ -34,6 +34,7 @@
+     key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
+ 
+     include "keypad(comma)"
++    include "eurosign(e)"
+     include "level3(ralt_switch)"
+ };
+ 
+Index: xkb-data/symbols/it
+===================================================================
+--- xkb-data.orig/symbols/it
++++ xkb-data/symbols/it
+@@ -89,7 +89,7 @@
+ 
+     key <AD01> {	[           q,  Q 		]	};
+     key <AD02> {	[	    z,  Z		]	};
+-    key <AD03> {	[	    e,  E		]	};
++    key <AD03> {	[	    e,  E,     EuroSign		]	};
+     key <AD04> {	[	    r,  R,   registered			] 	};
+     key <AD05> {	[	    t,  T		]	};
+     key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/15_symbols_polish_keypad_separator.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/15_symbols_polish_keypad_separator.diff
@@ -0,0 +1,55 @@
+$Id: 099g_xkb_symbols_polish_fix_keypad_separator.diff 689 2005-10-19 22:11:30Z dnusinow $
+
+This patch by Branden Robinson, based on a report from Emil Novak.
+
+Not submitted to XFree86.
+
+Index: xc/programs/xkbcomp/symbols/pc/pl
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/pl.orig	2005-10-19 17:35:50.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/pl	2005-10-19 17:57:15.000000000 -0400
+@@ -24,6 +24,10 @@
+ 
+     include "keypad(comma)"
+ 
++    // Begin keypad section
++    key  <KPDL> {        [        KP_Delete, KP_Separator     ]       };
++    // End of keypad section
++
+     include "level3(ralt_switch)"
+ };
+ 
+Index: xc/programs/xkbcomp/symbols/pl
+===================================================================
+--- xc/programs/xkbcomp/symbols/pl.orig	2005-10-19 17:51:55.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pl	2005-10-19 17:57:15.000000000 -0400
+@@ -37,8 +37,12 @@
+ 			[	zabovedot,       Zabovedot	]	};
+     // End alphanumeric section
+ 
+-    // Begin mofifier mappings
+-    
++    // Begin keypad section
++    key  <KPDL> {        [        KP_Delete, KP_Separator     ]       };
++    // End of keypad section
++
++    // Begin modifier mappings
++
+     modifier_map Shift  { Shift_L };
+     modifier_map Lock   { Caps_Lock };
+     modifier_map Control{ Control_L };
+Index: xc/programs/xkbcomp/symbols/pl2
+===================================================================
+--- xc/programs/xkbcomp/symbols/pl2.orig	2005-10-19 17:51:55.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pl2	2005-10-19 17:57:15.000000000 -0400
+@@ -95,6 +95,10 @@
+ 
+     // End alphanumeric section
+ 
++    // Begin keypad section
++    key  <KPDL> {        [        KP_Delete, KP_Separator     ]       };
++    // End of keypad section
++
+     // begin modifier mappings
+     modifier_map Shift  { Shift_L };
+     modifier_map Lock   { Caps_Lock };
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/05_evdev_xkb.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/05_evdev_xkb.diff
@@ -0,0 +1,763 @@
+Index: xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/keycodes/Makefile.am	2006-01-26 21:46:49.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am	2006-02-26 21:38:10.000000000 -0500
+@@ -5,6 +5,7 @@
+ 	aliases \
+ 	amiga \
+ 	ataritt \
++	evdev \
+ 	fujitsu \
+ 	hp \
+ 	ibm \
+Index: xkbdata-X11R7.0-1.0.1/keycodes/evdev
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkbdata-X11R7.0-1.0.1/keycodes/evdev	2006-02-26 21:37:54.000000000 -0500
+@@ -0,0 +1,355 @@
++// translation from evdev scancodes to something resembling xfree86 keycodes.
++
++default xkb_keycodes "evdev" {
++	minimum = 8;
++	maximum = 255;
++
++	<TLDE> = 49;
++	<AE01> = 10;
++	<AE02> = 11;
++	<AE03> = 12;
++	<AE04> = 13;
++	<AE05> = 14;
++	<AE06> = 15;
++	<AE07> = 16;
++	<AE08> = 17;
++	<AE09> = 18;
++	<AE10> = 19;
++	<AE11> = 20;
++	<AE12> = 21;
++	<BKSP> = 22;
++
++	<TAB> = 23;
++	<AD01> = 24;
++	<AD02> = 25;
++	<AD03> = 26;
++	<AD04> = 27;
++	<AD05> = 28;
++	<AD06> = 29;
++	<AD07> = 30;
++	<AD08> = 31;
++	<AD09> = 32;
++	<AD10> = 33;
++	<AD11> = 34;
++	<AD12> = 35;
++	<BKSL> = 51;
++	<RTRN> = 36;
++
++	<CAPS> = 66;
++	<AC01> = 38;
++	<AC02> = 39;
++	<AC03> = 40;
++	<AC04> = 41;
++	<AC05> = 42;
++	<AC06> = 43;
++	<AC07> = 44;
++	<AC08> = 45;
++	<AC09> = 46;
++	<AC10> = 47;
++	<AC11> = 48;
++
++	<LFSH> = 50;
++	<AB01> = 52;
++	<AB02> = 53;
++	<AB03> = 54;
++	<AB04> = 55;
++	<AB05> = 56;
++	<AB06> = 57;
++	<AB07> = 58;
++	<AB08> = 59;
++	<AB09> = 60;
++	<AB10> = 61;
++	<RTSH> = 62;
++
++	<LALT> = 64;
++	<LCTL> = 37;
++	<SPCE> = 65;
++	<RCTL> = 105;
++	<RALT> = 108;
++	// Microsoft keyboard extra keys
++	<LWIN> = 133;
++	<RWIN> = 134;
++	<MENU> = 135;
++
++	<ESC> = 9;
++	<FK01> = 67;
++	<FK02> = 68;
++	<FK03> = 69;
++	<FK04> = 70;
++	<FK05> = 71;
++	<FK06> = 72;
++	<FK07> = 73;
++	<FK08> = 74;
++	<FK09> = 75;
++	<FK10> = 76;
++	<FK11> = 95;
++	<FK12> = 96;
++
++	<PRSC> = 107;
++	// <SYRQ> = 107;
++	<SCLK> = 78;
++	<PAUS> = 127;
++	// <BRK> = 419;
++
++	<INS> = 118;
++	<HOME> = 110;
++	<PGUP> = 112;
++	<DELE> = 119;
++	<END> = 115;
++	<PGDN> = 117;
++
++	<UP> = 111;
++	<LEFT> = 113;
++	<DOWN> = 116;
++	<RGHT> = 114;
++
++	<NMLK> = 77;
++	<KPDV> = 106;
++	<KPMU> = 63;
++	<KPSU> = 82;
++
++	<KP7> = 79;
++	<KP8> = 80;
++	<KP9> = 81;
++	<KPAD> = 86;
++
++	<KP4> = 83;
++	<KP5> = 84;
++	<KP6> = 85;
++
++	<KP1> = 87;
++	<KP2> = 88;
++	<KP3> = 89;
++	<KPEN> = 104;
++
++	<KP0> = 90;
++	<KPDL> = 91;
++	// <KPEQ> = 126;
++
++	<FK13> = 191;
++	<FK14> = 192;
++	<FK15> = 193;
++	<FK16> = 194;
++	<FK17> = 195;
++	// <KPDC> = 123;
++
++	// Keys that are generated on Japanese keyboards
++
++	// alias <HZTG> = <TLDE>;	// Hankaku_Zenkaku toggle
++	// <HZTG> =  85;               // Hankaku/Zenkakau toggle
++	// <HKTG> =  93;		// Hiragana/Katakana toggle
++	// <AB11> = 211;		// backslash/underscore
++	// <XFER> =  92;		// Henkan
++	// <NFER> =  94;		// Muhenkan
++	// <AE13> = 124;		// Yen
++
++	// Keys that are generated on Korean keyboards
++
++	// alias <HNGL> = <FK16>;     // Hangul Latin toggle
++	// alias <HJCV> = <FK17>;     // Hangul to Hanja conversion
++	<HNGL> = 130;
++	<HJCV> = 131;
++
++	// Extended keys that may be generated on "Internet" keyboards.
++	// These are not standardised, hence the meaningless names.
++	// The entries commented out are never generated because the raw codes
++	// in those positions are already used for well-defined keys.
++
++	// evdev does standardize names for these though.  comment them
++	// all out for now.
++
++	// alias <I01> = <XFER>;
++	// <I02> =   130;
++	// alias <I03> = <NFER>;
++	// <I04> =   132;
++	// alias <I05> = <AE13>;
++	// <I06> =   134;
++	// <I07> =   135;
++	// <I08> =   136;
++	// <I09> =   137;
++	// <I0A> =   138;
++	// <I0B> =   139;
++	// <I0C> =   140;
++	// <I0D> =   141;
++	// <I0E> =   142;
++	// <I0F> =   143;
++	// <I10> =   144;
++	// <I11> =   145;
++	// <I12> =   146;
++	// <I13> =   147;
++	// <I14> =   148;
++	// <I15> =   149;
++	// <I16> =   150;
++	// <I17> =   151;
++	// <I18> =   152;
++	// <I19> =   153;
++	// <I1A> =   154;
++	// <I1B> =   155;
++	// <I1C> =   156;	<META>
++	// <I1D> =   157;	<K59>
++	// <I1E> =   158;
++	// <I1F> =   159;
++	// <I20> =   160;
++	// <I21> =   161;
++	// <I22> =   162;
++	// <I23> =   163;
++	// <I24> =   164;
++	// <I25> =   165;
++	// <I26> =   166;
++	// <I27> =   167;
++	// <I28> =   168;
++	// <I29> =   169;
++	// <I2A> =   170;	<K5A>
++	// <I2B> =   171;
++	// <I2C> =   172;
++	// <I2D> =   173;
++	// <I2E> =   174;
++	// <I2F> =   175;
++	// <I30> =   176;
++	// <I31> =   177;
++	// <I32> =   178;
++	// <I33> =   179;
++	// <I34> =   180;
++	// <I35> =   181;	<K5B>
++	// <I36> =   182;	<K5D>
++	// <I37> =   183;	<K5E>
++	// <I38> =   184;	<K5F>
++	// <I39> =   185;
++	// <I3A> =   186;
++	// <I3B> =   187;
++	// <I3C> =   188;
++	// <I3D> =   189;	<K62>
++	// <I3E> =   190;	<K63>
++	// <I3F> =   191;	<K64>
++	// <I40> =   192;	<K65>
++	// <I41> =   193;	<K66>
++	// <I42> =   194;
++	// <I43> =   195;
++	// <I44> =   196;
++	// <I45> =   197;
++	// <I46> =   198;	<K67>
++	// <I47> =   199;	<K68>
++	// <I48> =   200;	<K69>
++	// <I49> =   201;	<K6A>
++	// <I4A> =   202;
++	// <I4B> =   203;	<K6B>
++	// <I4C> =   204;	<K6C>
++	// <I4D> =   205;	<K6D>
++	// <I4E> =   206;	<K6E>
++	// <I4F> =   207;	<K6F>
++	// <I50> =   208;	<K70>
++	// <I51> =   209;	<K71>
++	// <I52> =   210;	<K72>
++	// <I53> =   211;	<K73>
++	// <I54> =   212;
++	// <I55> =   213;
++	// <I56> =   214;
++	// <I57> =   215;
++	// <I58> =   216;
++	// <I59> =   217;
++	// <I5A> =   218;
++	// <I5B> =   219;	<K74>
++	// <I5C> =   220;	<K75>
++	// <I5D> =   221;	<K76>
++	// <I5E> =   222;
++	// <I5F> =   223;
++	// <I60> =   224;
++	// <I61> =   225;
++	// <I62> =   226;
++	// <I63> =   227;
++	// <I64> =   228;
++	// <I65> =   229;
++	// <I66> =   230;
++	// <I67> =   231;
++	// <I68> =   232;
++	// <I69> =   233;
++	// <I6A> =   234;
++	// <I6B> =   235;
++	// <I6C> =   236;
++	// <I6D> =   237;
++	// <I6E> =   238;
++	// <I6F> =   239;
++	// <I70> =   240;
++	// <I71> =   241;
++	// <I72> =   242;
++	// <I73> =   243;
++	// <I74> =   244;
++	// <I75> =   245;
++	// <I76> =   246;
++	// <I77> =   247;
++	// <I78> =   248;
++	// <I79> =   249;
++	// <I7A> =   250;
++	// <I7B> =   251;
++	// <I7C> =   252;
++	// <I7D> =   253;
++	// <I7E> =   254;
++	// <I7F> =   255;
++
++	// Codes generated for scancodes 0x59-0x5f, 0x62-0x76
++	// <K59> =   157;		// <I1D>
++	// <K5A> =   170;		// <I2A>
++	// <K5B> =   181;		// <I35>
++	// alias <K5C> = <KPEQ>;
++	// <K5D> =   182;		// <I36>
++	// <K5E> =   183;		// <I37>
++	// <K5F> =   184;		// <I38>
++	// <K62> =   189;		// <I3D>
++	// <K63> =   190;		// <I3E>
++	// <K64> =   191;		// <I3F>
++	// <K65> =   192;		// <I40>
++	// <K66> =   193;		// <I41>
++	// <K67> =   198;		// <I46>
++	// <K68> =   199;		// <I47>
++	// <K69> =   200;		// <I48>
++	// <K6A> =   201;		// <I49>
++	// <K6B> =   203;		// <I4B>
++	// <K6C> =   204;		// <I4C>
++	// <K6D> =   205;		// <I4D>
++	// <K6E> =   206;		// <I4E>
++	// <K6F> =   207;		// <I4F>
++	// alias <K70> = <HKTG>;	// <I50>
++	// <K71> =   209;		// <I51>
++	// <K72> =   210;		// <I52>
++	// alias <K73> = <AB11>;	// <I53>
++	// <K74> =   219;		// <I5B>
++	// <K75> =   220;		// <I5C>
++	// <K76> =   221;		// <I5D>
++
++	// Solaris compatibility
++
++	// alias <LMTA> = <LWIN>;
++	// alias <RMTA> = <RWIN>;
++	// alias <COMP> = <MENU>;
++	// alias <POWR> = <I0C>;
++	// alias <MUTE> = <I0D>;
++	// alias <VOL-> = <I0E>;
++	// alias <VOL+> = <I0F>;
++	// alias <HELP> = <I10>;
++	// alias <STOP> = <I11>;
++	// alias <AGAI> = <I12>;
++	// alias <PROP> = <I13>;
++	// alias <UNDO> = <I14>;
++	// alias <FRNT> = <I15>;
++	// alias <COPY> = <I16>;
++	// alias <OPEN> = <I17>;
++	// alias <PAST> = <I18>;
++	// alias <FIND> = <I19>;
++	// alias <CUT>  = <I1A>;
++
++	// Other codes never generated.  The XFree86 ddx never generates
++	// these codes.
++	// Thus we can use them as fake keys
++	// <MDSW> =    93; // <U5D>
++	// <LVL3> =   124; // <U7C>
++	// <ALT>  =   125; // <U7D>
++	// <META> =   156; // <I1C>
++	// <SUPR> =   127; // <U7F>
++	// <HYPR> =   128; // <U80>
++
++	indicator 1 = "Caps Lock";
++	indicator 2 = "Num Lock";
++	indicator 3 = "Scroll Lock";
++
++	alias <ALGR> = <RALT>;
++};
+Index: xkbdata-X11R7.0-1.0.1/keymap/Makefile.am
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/keymap/Makefile.am	2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/keymap/Makefile.am	2006-02-26 21:39:35.000000000 -0500
+@@ -4,6 +4,7 @@
+ dist_xkbdata_keymap_DATA = \
+ 	amiga \
+ 	ataritt \
++	evdev \
+ 	macintosh \
+ 	README \
+ 	sony \
+Index: xkbdata-X11R7.0-1.0.1/keymap/evdev
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkbdata-X11R7.0-1.0.1/keymap/evdev	2006-02-26 21:37:54.000000000 -0500
+@@ -0,0 +1,362 @@
++// $XFree86: xc/programs/xkbcomp/keymap/evdev,v 3.30 2003/04/03 16:34:49 dawes Exp $
++
++
++default xkb_keymap "us" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "us(pc105)"		};
++    xkb_geometry	{ include "pc"			};
++};
++
++// "ar" addition by Arabeyes Team, <support@arabeyes.org>
++xkb_keymap "ar" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+ar"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++xkb_keymap "be"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+be"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "bg"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+bg"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
++xkb_keymap "br"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "us(pc101)+br"	};
++    xkb_geometry 	{ include "pc(abnt2)"		};
++};
++// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
++// are designed to replace old czechoslovakian and czsk keyboards
++// and their prog variants. Those are now obsolete and should not be used anymore.
++xkb_keymap "cz" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+cz"	};
++    xkb_geometry	{ include "pc"			};
++};
++xkb_keymap "cz_qwerty" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+cz_qwerty"	};
++    xkb_geometry	{ include "pc"			};
++};
++xkb_keymap "de"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+de"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "de_CH"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+de_CH"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "dk"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+dk"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "dvorak" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+dvorak"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++xkb_keymap "en_US" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols 	{ include "en_US(pc105)"	};
++    xkb_geometry 	{ include "pc"			};
++};
++xkb_keymap "es"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+es"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "fr"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+fr"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "fr-latin9" {
++    xkb_keycodes        { include "evdev"             };
++    xkb_types           { include "default"             };
++    xkb_compatibility   { include "default"             };
++    xkb_symbols         { include "en_US(pc105)+fr-latin9" };
++    xkb_geometry        { include "pc"           	};
++};
++xkb_keymap "fr_CA"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+ca"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "fr_CH"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+fr_CH"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "gb"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+gb"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "hr"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+hr"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "it"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+it"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "jp106" {
++    xkb_keycodes	{ include "evdev(jp106)"	};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "jp(jp106)"		};
++    xkb_geometry	{ include "pc(jp106)"		};
++};
++xkb_keymap "lt"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+lt"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "lt_std"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+lt_std"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "lv"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+lv"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "mk" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+mk"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++xkb_keymap "mt" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+mt"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++xkb_keymap "mt_us" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+mt_us"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++xkb_keymap "no"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+no"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "pl"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+pl"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "pt"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+pt"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++// ro: additions by Cristian Gafton, <gafton@redhat.com>
++xkb_keymap "ro" {
++    xkb_keycodes	{ include "evdev"			};
++    xkb_types		{ include "default"			};
++    xkb_compatibility	{ include "default"			};
++    xkb_symbols		{ include "en_US(pc101)+ro(pc101)"	};
++    xkb_geometry	{ include "pc(pc101)"			};
++};
++xkb_keymap "ro_microsoft" {
++    xkb_keycodes	{ include "evdev"			};
++    xkb_types		{ include "default"			};
++    xkb_compatibility	{ include "default"			};
++    xkb_symbols		{ include "en_US(pc105)+ro(pc105)"	};
++    xkb_geometry	{ include "pc(pc105)"			};
++};
++xkb_keymap "ru"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+ru"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "se_FI"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+fi"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "se_SE"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+se"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "sl" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+si"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++xkb_keymap "sl_SI" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+si"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
++// are designed to replace old czechoslovakian and czsk keyboards
++// and their prog variants. Those are now obsolete and should not be used anymore.
++xkb_keymap "sk" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+sk"	};
++    xkb_geometry	{ include "pc"			};
++};
++xkb_keymap "sk_qwerty" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+sk_qwerty"	};
++    xkb_geometry	{ include "pc"			};
++};
++// Additions by Emil Soleyman-Zomalan, <emil@nishra.com>
++xkb_keymap "syr" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default" 		};
++    xkb_symbols		{ include "en_US(pc105)+syr"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};    
++xkb_keymap "th"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+th"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "th_tis"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+th_tis"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "th_pat"	{
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+th_pat"	};
++    xkb_geometry 	{ include "pc(pc102)"		};
++};
++xkb_keymap "tr" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+tr"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++xkb_keymap "uk" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+uk)"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++xkb_keymap "us_flexpro" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "us(pc105)"		};
++    xkb_geometry	{ include "keytronic(FlexPro)"	};
++};
++// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
++// us_intl means standard us keyboard plus dead_keys symbols
++// these keyboards are very popular in Brazil
++xkb_keymap "us_intl" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "us(pc101)+us_intl"	};
++    xkb_geometry	{ include "pc"			};
++};
++xkb_keymap "us_microsoft" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "us(pc105)"		};
++    xkb_geometry	{ include "microsoft"		};
++};
++
++xkb_keymap "uz" {
++    xkb_keycodes	{ include "evdev"		};
++    xkb_types		{ include "default"		};
++    xkb_compatibility	{ include "default"		};
++    xkb_symbols		{ include "en_US(pc105)+uz"	};
++    xkb_geometry	{ include "pc(pc102)"		};
++};
++
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg	2006-02-26 20:18:18.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg	2006-02-26 21:37:54.000000000 -0500
+@@ -52,6 +52,7 @@
+   pc98		=	xfree98(pc98)
+   abnt2		=	xfree86(abnt2)
+   jp106		=	xfree86(jp106)
++  evdev         =       evdev
+   *		=	xfree86
+ 
+ ! layout[1]	=	keycodes
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/02_xkb_symbols_euro_support.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/02_xkb_symbols_euro_support.diff
@@ -0,0 +1,72 @@
+$Id: 013a_xkb_symbols_euro_support.diff 396 2005-07-22 21:45:02Z dnusinow $
+
+This patch by Mike A. Harris.
+
+Not submitted upstream yet.
+
+Index: xc/programs/xkbcomp/symbols/hu
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/hu	2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/hu	2005-06-26 12:12:46.000000000 +0800
+@@ -246,6 +246,8 @@
+                         [        backslash                   ]       };
+     key <AD02> {        [                w, W                ],
+                         [              bar                   ]       };
++    key <AD07> {        [                u, U                ],
++                        [         EuroSign                   ]       };
+     key <AD08> {        [                i, I                ],
+                         [           Iacute                   ]       };
+     key <AD12> {        [           uacute, Uacute           ],
+Index: xc/programs/xkbcomp/symbols/hu_US
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/hu_US	2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/hu_US	2005-06-26 12:12:46.000000000 +0800
+@@ -44,6 +44,8 @@
+     key <AD02> {        [         w,    W               ],
+                         [       bar                     ]       };
+     key <AD06> {        [         z,    Z               ]       };
++    key <AD07> {        [         u,    U               ],
++                        [  EuroSign                     ]       };
+     key <AD08> {        [         i,    I               ],
+                         [    Iacute                     ]       };
+ //    key <AD11> {      [ odoubleacute, Odoubleacute    ],
+Index: xc/programs/xkbcomp/symbols/pl
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/pl	2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/pl	2005-06-26 12:12:46.000000000 +0800
+@@ -25,6 +25,8 @@
+ 			[	  lstroke,	   Lstroke	]	};
+     key	<AB06> {	[	                            	],	
+ 			[          nacute,          Nacute	]	};
++    key	<AD07> {	[	                        	],	
++			[        EuroSign               	]	};
+     key	<AD09> {	[	                        	],	
+ 			[          oacute,       Oacute        	]	};
+     key <AC02> {	[	         			],
+Index: xc/programs/xkbcomp/symbols/pl2
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/pl2	2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/pl2	2005-06-26 12:12:46.000000000 +0800
+@@ -45,7 +45,8 @@
+     key <AD04> { [ r,			R		]	};
+     key <AD05> { [ t,			T		]	};
+     key <AD06> { [ z,			Z		]	};
+-    key <AD07> { [ u,			U		]	};
++    key <AD07> { [ u,			U		],
++                 [ EuroSign             ]   };
+     key <AD08> { [ i,			I		]	};
+     key <AD09> { [ o,			O		]	};
+     key <AD10> { [ p,			P		]	};
+Index: xc/programs/xkbcomp/symbols/tr
+===================================================================
+--- xc.orig/programs/xkbcomp/symbols/tr	2005-06-26 06:51:37.000000000 +0800
++++ xc/programs/xkbcomp/symbols/tr	2005-06-26 12:12:46.000000000 +0800
+@@ -37,6 +37,8 @@
+     key <AE11> {	[  asterisk,	question 	],
+ 			[ backslash			]	};
+     key <AE12> {	[     minus,	underscore	]	};
++    key <AD03> {	[         e,	E		],
++			[  EuroSign			]	};
+     key <AD08> {	[  idotless,    I		]	};
+     key <AD11> {	[    gbreve,    Gbreve		]	};
+     key <AD12> {	[ udiaeresis,	Udiaeresis	],
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/08_implement_grp:sclk_toggle.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/08_implement_grp:sclk_toggle.diff
@@ -0,0 +1,75 @@
+$Id: 084_xkb_implement_grp:sclk_toggle.diff 1169 2006-02-06 03:08:41Z dnusinow $
+
+Provide XKB configuration option for Scroll Lock to be used as a group
+toggle key.
+
+This patch by Michal Kaspar.
+
+Not submitted upstream.
+
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg	2006-02-26 21:37:54.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg	2006-02-26 21:51:14.000000000 -0500
+@@ -908,6 +908,7 @@
+   grp:menu_toggle	=	+group(menu_toggle)
+   grp:lwin_toggle	=	+group(lwin_toggle)
+   grp:rwin_toggle	=	+group(rwin_toggle)
++  grp:sclk_toggle	=	+group(sclk_toggle)
+   grp:lshift_toggle	=	+group(lshift_toggle)
+   grp:rshift_toggle	=	+group(rshift_toggle)
+   grp:lctrl_toggle	=	+group(lctrl_toggle)
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.lst
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.lst	2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.lst	2006-02-26 21:51:14.000000000 -0500
+@@ -357,6 +357,7 @@
+   grp:menu_toggle      Menu key changes group.
+   grp:lwin_toggle      Left Win-key changes group.
+   grp:rwin_toggle      Right Win-key changes group.
++  grp:sclk_toggle  Scroll Lock 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.
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.xml
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.xml	2006-02-26 20:17:40.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.xml	2006-02-26 21:51:14.000000000 -0500
+@@ -7191,6 +7191,14 @@
+       </option>
+       <option>
+         <configItem>
++          <name>grp:sclk_toggle</name>
++          <description>Scroll Lock changes group</description>
++          <description xml:lang="bg">Scroll Lock сменя групата</description>
++          <description xml:lang="ru">Scroll Lock меняет группу</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>
+Index: xkbdata-X11R7.0-1.0.1/symbols/group
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/symbols/group	2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/symbols/group	2006-02-26 21:51:14.000000000 -0500
+@@ -215,6 +215,18 @@
+     };
+ };
+ 
++// using the group(sclk_toggle) map, pressing the Scroll Lock key
++// toggles groups.
++partial modifier_keys
++xkb_symbols "sclk_toggle" {
++  virtual_modifiers AltGr;
++  key <SCLK> {
++    virtualMods= AltGr,
++    symbols[Group1] = [ ISO_Next_Group ]
++    };
++};
++
++
+ // Both Ctrls pressed together toggle group
+ partial modifier_keys
+ xkb_symbols "ctrls_toggle" {
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/po.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/po.diff
@@ -0,0 +1,1978 @@
+Downloaded from http://www.iro.umontreal.ca/translation/maint/xkeyboard-config/hu.po
+2006-10-13
+
+Copied po/sl.po from CVS, the version in the Free TP does not produce valid XML files.
+2006-10-20
+
+Index: xkb-data/po/hu.po
+===================================================================
+--- xkb-data.orig/po/hu.po
++++ xkb-data/po/hu.po
+@@ -1,45 +1,43 @@
+ # translation of xkeyboard-config to Hungarian
+ # Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the xkeyboard-config package.
++#
+ # Andras Timar <timar@fsf.hu>, 2004.
+-# Szilveszter Farkas <Szilveszter.Farkas@gmail.com>, 2006
++# Szilveszter Farkas <Szilveszter.Farkas@gmail.com>, 2006.
+ # Gabor Kelemen <kelemeng@gnome.hu>, 2006.
+-#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: xkeyboard-config 0.9\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2006-10-02 19:47+0100\n"
+-"PO-Revision-Date: 2006-10-02 18:10+0000\n"
++"POT-Creation-Date: 2006-10-01 23:44+0100\n"
++"PO-Revision-Date: 2006-10-13 15:38+0200\n"
+ "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+ "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: KBabel 1.10.2\n"
++"X-Generator: KBabel 1.11.2\n"
++"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+ 
+ #: ../rules/base.xml.in.h:1
+ msgid "(F)"
+ msgstr "(F)"
+ 
+ #: ../rules/base.xml.in.h:2
+-#, fuzzy
+ msgid "(Legacy) Alternative"
+-msgstr "Alternatív"
++msgstr "(Hagyományos) Alternatív"
+ 
+ #: ../rules/base.xml.in.h:3
+-#, fuzzy
+ msgid "(Legacy) Alternative, Sun dead keys"
+-msgstr "Alternatív, Sun halott billentyűk"
++msgstr "(Hagyományos) Alternatív, Sun halott billentyűk"
+ 
+ #: ../rules/base.xml.in.h:4
+-#, fuzzy
+ msgid "(Legacy) Alternative, eliminate dead keys"
+-msgstr "Alternatív, halott billentyűk tiltása"
++msgstr "(Hagyományos) Alternatív, halott billentyűk tiltása"
+ 
+ #: ../rules/base.xml.in.h:5
+ msgid "101/104 key Compatible"
+-msgstr ""
++msgstr "101/104 gomb kompatibilis"
+ 
+ #: ../rules/base.xml.in.h:6
+ msgid "101/qwerty/comma/Dead keys"
+@@ -114,9 +112,8 @@
+ msgstr "A4Tech KBS-8"
+ 
+ #: ../rules/base.xml.in.h:24
+-#, fuzzy
+ msgid "A4Tech Wireless Desktop RFKB-23"
+-msgstr "Dexxa Wireless Desktop billentyűzet"
++msgstr "A4Tech Wireless Desktop RFKB-23"
+ 
+ #: ../rules/base.xml.in.h:25
+ msgid "ACPI Standard"
+@@ -128,11 +125,11 @@
+ 
+ #: ../rules/base.xml.in.h:27
+ msgid "Acer C300"
+-msgstr ""
++msgstr "Acer C300"
+ 
+ #: ../rules/base.xml.in.h:28
+ msgid "Acer Ferrari 4000"
+-msgstr ""
++msgstr "Acer Ferrari 4000"
+ 
+ #: ../rules/base.xml.in.h:29
+ msgid "Acer TravelMate 800"
+@@ -160,7 +157,7 @@
+ 
+ #: ../rules/base.xml.in.h:35
+ msgid "Adding the nobreakspace keysym to space key"
+-msgstr ""
++msgstr "Nem törhető szóköz szimbólum hozzáadása a szóköz billentyűhöz"
+ 
+ #: ../rules/base.xml.in.h:36
+ msgid "Advance Scorpius KI"
+@@ -168,7 +165,7 @@
+ 
+ #: ../rules/base.xml.in.h:37
+ msgid "Afg"
+-msgstr ""
++msgstr "Afg"
+ 
+ #: ../rules/base.xml.in.h:38
+ msgid "Afghanistan"
+@@ -195,9 +192,8 @@
+ msgstr "Az Alt a jobb Win billentyűhöz van rendelve és a Super a menühöz."
+ 
+ #: ../rules/base.xml.in.h:44
+-#, fuzzy
+ msgid "Alt+CapsLock changes group."
+-msgstr "A Shift+CapsLock kombináció megváltoztatja a csoportot."
++msgstr "Az Alt+CapsLock megváltoztatja a csoportot."
+ 
+ #: ../rules/base.xml.in.h:45
+ msgid "Alt+Ctrl changes group."
+@@ -220,9 +216,8 @@
+ msgstr "Alternatív"
+ 
+ #: ../rules/base.xml.in.h:50
+-#, fuzzy
+ msgid "Alternative Eastern"
+-msgstr "Alternatív"
++msgstr "Alternatív keleti"
+ 
+ #: ../rules/base.xml.in.h:51
+ msgid "Alternative international (former us_intl)"
+@@ -237,13 +232,12 @@
+ msgstr "Alternatív, halott billentyűk tiltása"
+ 
+ #: ../rules/base.xml.in.h:54
+-#, fuzzy
+ msgid "Alternative, latin-9 only"
+-msgstr "Alternatív, halott billentyűk tiltása"
++msgstr "Alternatív, csak latin-9"
+ 
+ #: ../rules/base.xml.in.h:55
+ msgid "And"
+-msgstr ""
++msgstr "And"
+ 
+ #: ../rules/base.xml.in.h:56
+ msgid "Andorra"
+@@ -255,11 +249,11 @@
+ 
+ #: ../rules/base.xml.in.h:58
+ msgid "Apple"
+-msgstr ""
++msgstr "Apple"
+ 
+ #: ../rules/base.xml.in.h:59
+ msgid "Apple Laptop"
+-msgstr ""
++msgstr "Apple Laptop"
+ 
+ #: ../rules/base.xml.in.h:60
+ msgid "Ara"
+@@ -314,9 +308,8 @@
+ msgstr "BTC 9001AH"
+ 
+ #: ../rules/base.xml.in.h:73
+-#, fuzzy
+ msgid "BTC 9019U"
+-msgstr "BTC 9001AH"
++msgstr "BTC 9019U"
+ 
+ #: ../rules/base.xml.in.h:74
+ msgid "Ban"
+@@ -384,8 +377,7 @@
+ 
+ #: ../rules/base.xml.in.h:90
+ msgid "Both Win-keys switch group while pressed."
+-msgstr ""
+-"A két Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
++msgstr "A két Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+ 
+ #: ../rules/base.xml.in.h:91
+ msgid "Bra"
+@@ -405,7 +397,7 @@
+ 
+ #: ../rules/base.xml.in.h:95
+ msgid "Buckwalter"
+-msgstr ""
++msgstr "Buckwalter"
+ 
+ #: ../rules/base.xml.in.h:96
+ msgid "Bulgaria"
+@@ -432,18 +424,12 @@
+ msgstr "A CapsLock LED-je mutassa a másik csoportot."
+ 
+ #: ../rules/base.xml.in.h:102
+-#, fuzzy
+ msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+-msgstr ""
+-"A CapsLock Shiftként működik zárolással. A Shift megszakítja a "
+-"nagybetűsítést."
++msgstr "A CapsLock Shiftként működik zárolással. A Shift szünetelteti a nagybetűsítést."
+ 
+ #: ../rules/base.xml.in.h:103
+-#, fuzzy
+ msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+-msgstr ""
+-"A CapsLock Shiftként működik zárolással. A Shift nem szakítja meg a "
+-"nagybetűsítést."
++msgstr "A CapsLock Shiftként működik zárolással. A Shift nem befolyásolja a nagybetűsítést."
+ 
+ #: ../rules/base.xml.in.h:104
+ msgid "CapsLock just locks the Shift modifier."
+@@ -466,19 +452,16 @@
+ msgstr "A CapsLock átváltja az ábécé szerinti karakterek nagybetűsítését."
+ 
+ #: ../rules/base.xml.in.h:109
+-#, fuzzy
+ msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+-msgstr "A CapsLock belső nagybetűkre váltást használ. A Shift megszakítja."
++msgstr "A CapsLock belső nagybetűkre váltást használ. A Shift szünetelteti a nagybetűsítést."
+ 
+ #: ../rules/base.xml.in.h:110
+-#, fuzzy
+ msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+-msgstr ""
+-"A CapsLock belső nagybetűkre váltást használ. A Shift nem szakítja meg."
++msgstr "A CapsLock belső nagybetűkre váltást használ. A Shift nem befolyásolja a nagybetűsítést."
+ 
+ #: ../rules/base.xml.in.h:111
+ msgid "Catalan variant with middle-dot L"
+-msgstr ""
++msgstr "Katalán változat középső pontos L karakterrel"
+ 
+ #: ../rules/base.xml.in.h:112
+ msgid "Che"
+@@ -494,7 +477,7 @@
+ 
+ #: ../rules/base.xml.in.h:115
+ msgid "Cherry CyBo@rd USB-Hub"
+-msgstr ""
++msgstr "Cherry CyBo@rd USB-Hub"
+ 
+ #: ../rules/base.xml.in.h:116
+ msgid "Cherry CyMotion Master Linux"
+@@ -509,9 +492,8 @@
+ msgstr "Chicony KB-9885"
+ 
+ #: ../rules/base.xml.in.h:119
+-#, fuzzy
+ msgid "Classic Dvorak"
+-msgstr "Dvorak-féle"
++msgstr "Klasszikus Dvorak"
+ 
+ #: ../rules/base.xml.in.h:120
+ msgid "CloGaelach"
+@@ -543,7 +525,7 @@
+ 
+ #: ../rules/base.xml.in.h:127
+ msgid "Congo, Democratic Republic of the"
+-msgstr ""
++msgstr "Kongói Demokratikus Köztársaság"
+ 
+ #: ../rules/base.xml.in.h:128
+ msgid "Croatia"
+@@ -579,7 +561,7 @@
+ 
+ #: ../rules/base.xml.in.h:136
+ msgid "DRC"
+-msgstr ""
++msgstr "DRC"
+ 
+ #: ../rules/base.xml.in.h:137
+ msgid "DTK2000"
+@@ -595,7 +577,7 @@
+ 
+ #: ../rules/base.xml.in.h:140
+ msgid "Default numpad keys."
+-msgstr ""
++msgstr "Alapértelmezett numerikus billentyűk."
+ 
+ #: ../rules/base.xml.in.h:141
+ msgid "Dell"
+@@ -607,7 +589,7 @@
+ 
+ #: ../rules/base.xml.in.h:143
+ msgid "Dell Latitude series laptop"
+-msgstr ""
++msgstr "Dell Latitude sorozat laptop"
+ 
+ #: ../rules/base.xml.in.h:144
+ msgid "Dell USB Multimedia Keybard"
+@@ -646,9 +628,8 @@
+ msgstr "Dvorak, lengyel idézőjelek az idézőjel billentyűn"
+ 
+ #: ../rules/base.xml.in.h:153
+-#, fuzzy
+ msgid "Eastern"
+-msgstr "eszperantó"
++msgstr "Keleti"
+ 
+ #: ../rules/base.xml.in.h:154
+ msgid "Eliminate dead keys"
+@@ -660,7 +641,7 @@
+ 
+ #: ../rules/base.xml.in.h:156
+ msgid "Epo"
+-msgstr ""
++msgstr "Epo"
+ 
+ #: ../rules/base.xml.in.h:157
+ msgid "Esp"
+@@ -680,7 +661,7 @@
+ 
+ #: ../rules/base.xml.in.h:161
+ msgid "Evdev-managed keyboard"
+-msgstr ""
++msgstr "Evdev által felügyelt billentyűzet"
+ 
+ #: ../rules/base.xml.in.h:162
+ msgid "Everex STEPnote"
+@@ -731,9 +712,8 @@
+ msgstr "Francia"
+ 
+ #: ../rules/base.xml.in.h:174
+-#, fuzzy
+ msgid "French (Macintosh)"
+-msgstr "Macintosh"
++msgstr "Francia (Macintosh)"
+ 
+ #: ../rules/base.xml.in.h:175
+ msgid "French (legacy)"
+@@ -753,7 +733,7 @@
+ 
+ #: ../rules/base.xml.in.h:179
+ msgid "Fula"
+-msgstr ""
++msgstr "Fula"
+ 
+ #: ../rules/base.xml.in.h:180
+ msgid "GBr"
+@@ -792,9 +772,8 @@
+ msgstr "Genius Comfy KB-21e-Scroll"
+ 
+ #: ../rules/base.xml.in.h:189
+-#, fuzzy
+ msgid "Genius KB-19e NB"
+-msgstr "Genius Comfy KB-12e"
++msgstr "Genius KB-19e NB"
+ 
+ #: ../rules/base.xml.in.h:190
+ msgid "Geo"
+@@ -805,9 +784,8 @@
+ msgstr "Grúzia"
+ 
+ #: ../rules/base.xml.in.h:192
+-#, fuzzy
+ msgid "German (Macintosh)"
+-msgstr "Macintosh"
++msgstr "Német (Macintosh)"
+ 
+ #: ../rules/base.xml.in.h:193
+ msgid "German, Sun dead keys"
+@@ -823,7 +801,7 @@
+ 
+ #: ../rules/base.xml.in.h:196
+ msgid "Gha"
+-msgstr ""
++msgstr "Gha"
+ 
+ #: ../rules/base.xml.in.h:197
+ msgid "Ghana"
+@@ -919,7 +897,7 @@
+ 
+ #: ../rules/base.xml.in.h:220
+ msgid "IBM (LST 1205-92)"
+-msgstr ""
++msgstr "IBM (LST 1205-92)"
+ 
+ #: ../rules/base.xml.in.h:221
+ msgid "IBM Rapid Access"
+@@ -938,9 +916,8 @@
+ msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+ 
+ #: ../rules/base.xml.in.h:225
+-#, fuzzy
+ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
++msgstr "IBM ThinkPad 560Z/600/600E/A22E, nemzetközi"
+ 
+ #: ../rules/base.xml.in.h:226
+ msgid "ISO Alternate"
+@@ -952,7 +929,7 @@
+ 
+ #: ../rules/base.xml.in.h:228
+ msgid "Igbo"
+-msgstr ""
++msgstr "Igbo"
+ 
+ #: ../rules/base.xml.in.h:229
+ msgid "Ind"
+@@ -976,7 +953,7 @@
+ 
+ #: ../rules/base.xml.in.h:234
+ msgid "Iraq"
+-msgstr ""
++msgstr "Irak"
+ 
+ #: ../rules/base.xml.in.h:235
+ msgid "Ireland"
+@@ -992,7 +969,7 @@
+ 
+ #: ../rules/base.xml.in.h:238
+ msgid "Irq"
+-msgstr ""
++msgstr "Irq"
+ 
+ #: ../rules/base.xml.in.h:239
+ msgid "Isl"
+@@ -1020,7 +997,7 @@
+ 
+ #: ../rules/base.xml.in.h:245
+ msgid "Japan (PC-98xx Series)"
+-msgstr ""
++msgstr "Japán (PC-98xx sorozat)"
+ 
+ #: ../rules/base.xml.in.h:246
+ msgid "Japanese 106-key"
+@@ -1036,11 +1013,11 @@
+ 
+ #: ../rules/base.xml.in.h:249
+ msgid "Kashubian"
+-msgstr ""
++msgstr "Kasub"
+ 
+ #: ../rules/base.xml.in.h:250
+ msgid "Kaz"
+-msgstr ""
++msgstr "Kaz"
+ 
+ #: ../rules/base.xml.in.h:251
+ msgid "Kazakh with Russian"
+@@ -1060,40 +1037,39 @@
+ 
+ #: ../rules/base.xml.in.h:255
+ msgid "Khm"
+-msgstr ""
++msgstr "Khm"
+ 
+ #: ../rules/base.xml.in.h:256
+ msgid "Kor"
+-msgstr ""
++msgstr "Kor"
+ 
+ #: ../rules/base.xml.in.h:257
+ msgid "Korea, Republic of"
+-msgstr ""
++msgstr "Koreai köztársaság"
+ 
+ #: ../rules/base.xml.in.h:258
+-#, fuzzy
+ msgid "Korean 106-key"
+-msgstr "Japán 106 gombos"
++msgstr "Koreai 106 gombos"
+ 
+ #: ../rules/base.xml.in.h:259
+ msgid "Kotoistus"
+-msgstr ""
++msgstr "Kotoistus"
+ 
+ #: ../rules/base.xml.in.h:260
+ msgid "Kurdish, (F)"
+-msgstr ""
++msgstr "Kurd, (F)"
+ 
+ #: ../rules/base.xml.in.h:261
+ msgid "Kurdish, Arabic-Latin"
+-msgstr ""
++msgstr "Kurd, arab-latin"
+ 
+ #: ../rules/base.xml.in.h:262
+ msgid "Kurdish, Latin Alt-Q"
+-msgstr ""
++msgstr "Kurd, latin Alt-Q"
+ 
+ #: ../rules/base.xml.in.h:263
+ msgid "Kurdish, Latin Q"
+-msgstr ""
++msgstr "Kurd, latin Q"
+ 
+ #: ../rules/base.xml.in.h:264
+ msgid "Kyr"
+@@ -1152,18 +1128,16 @@
+ msgstr "Latin qwerty"
+ 
+ #: ../rules/base.xml.in.h:278
+-#, fuzzy
+ msgid "Latin with guillemets"
+-msgstr "Latin »hegyes« idézőjelekkel"
++msgstr "Latin, »csúcsos« idézőjelekkel"
+ 
+ #: ../rules/base.xml.in.h:279
+ msgid "Latvia"
+ msgstr "Lettország"
+ 
+ #: ../rules/base.xml.in.h:280
+-#, fuzzy
+ msgid "Left Alt is swapped with left Win-key."
+-msgstr "A Meta a bal Win billentyűhöz van rendelve."
++msgstr "A bal Alt fel van cserélve a bal Win billentyűvel."
+ 
+ #: ../rules/base.xml.in.h:281
+ msgid "Left Alt key changes group."
+@@ -1171,8 +1145,7 @@
+ 
+ #: ../rules/base.xml.in.h:282
+ msgid "Left Alt key switches group while pressed."
+-msgstr ""
+-"A bal Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
++msgstr "A bal Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+ 
+ #: ../rules/base.xml.in.h:283
+ msgid "Left Ctrl key changes group."
+@@ -1187,14 +1160,12 @@
+ msgstr "A bal Win billentyű megváltoztatja a csoportot."
+ 
+ #: ../rules/base.xml.in.h:286
+-#, fuzzy
+ msgid "Left Win-key is Compose."
+-msgstr "A jobb Win billentyű a kombináló (Compose)."
++msgstr "A bal Win billentyű a kombináló (Compose)."
+ 
+ #: ../rules/base.xml.in.h:287
+ msgid "Left Win-key switches group while pressed."
+-msgstr ""
+-"A bal Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
++msgstr "A bal Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+ 
+ #: ../rules/base.xml.in.h:288
+ msgid "Left handed Dvorak"
+@@ -1213,9 +1184,8 @@
+ msgstr "Logitech Cordless Desktop"
+ 
+ #: ../rules/base.xml.in.h:292
+-#, fuzzy
+ msgid "Logitech Cordless Desktop LX-300"
+-msgstr "Logitech Cordless Desktop"
++msgstr "Logitech Cordless Desktop LX-300"
+ 
+ #: ../rules/base.xml.in.h:293
+ msgid "Logitech Cordless Desktop Navigator"
+@@ -1258,9 +1228,8 @@
+ msgstr "Logitech Ultra-X billentyűzet"
+ 
+ #: ../rules/base.xml.in.h:303
+-#, fuzzy
+ msgid "Logitech diNovo Keyboard"
+-msgstr "Logitech Access billentyűzet"
++msgstr "Logitech diNovo billentyűzet"
+ 
+ #: ../rules/base.xml.in.h:304
+ msgid "Logitech iTouch"
+@@ -1299,14 +1268,12 @@
+ msgstr "Macintosh Old"
+ 
+ #: ../rules/base.xml.in.h:313
+-#, fuzzy
+ msgid "Macintosh, Sun dead keys"
+-msgstr "Német, Sun halott billentyűk"
++msgstr "Macintosh, Sun halott billentyűk"
+ 
+ #: ../rules/base.xml.in.h:314
+-#, fuzzy
+ msgid "Macintosh, eliminate dead keys"
+-msgstr "Német, halott billentyűk tiltása"
++msgstr "Macintosh, halott billentyűk tiltása"
+ 
+ #: ../rules/base.xml.in.h:315
+ msgid "Make CapsLock an additional Ctrl."
+@@ -1330,7 +1297,7 @@
+ 
+ #: ../rules/base.xml.in.h:320
+ msgid "Maltese keyboard with US layout"
+-msgstr ""
++msgstr "Máltai billentyűzet egyesült államokbeli kiosztással"
+ 
+ #: ../rules/base.xml.in.h:321
+ msgid "Mao"
+@@ -1442,15 +1409,15 @@
+ 
+ #: ../rules/base.xml.in.h:348
+ msgid "Neostyle"
+-msgstr ""
++msgstr "Neostyle"
+ 
+ #: ../rules/base.xml.in.h:349
+ msgid "Nep"
+-msgstr ""
++msgstr "Nep"
+ 
+ #: ../rules/base.xml.in.h:350
+ msgid "Nepal"
+-msgstr ""
++msgstr "Nepál"
+ 
+ #: ../rules/base.xml.in.h:351
+ msgid "Netherlands"
+@@ -1458,7 +1425,7 @@
+ 
+ #: ../rules/base.xml.in.h:352
+ msgid "Nigeria"
+-msgstr ""
++msgstr "Nigéria"
+ 
+ #: ../rules/base.xml.in.h:353
+ msgid "Nld"
+@@ -1489,9 +1456,8 @@
+ msgstr "A NumLock LED-je mutassa a másik csoportot."
+ 
+ #: ../rules/base.xml.in.h:360
+-#, fuzzy
+ msgid "Numpad keys work as with Mac."
+-msgstr "A Shift+numerikus billentyűk úgy működjenek, mint az MS Windowsban."
++msgstr "A numerikus billentyűk úgy működjenek, mint Macen."
+ 
+ #: ../rules/base.xml.in.h:361
+ msgid "Ogham"
+@@ -1510,13 +1476,12 @@
+ msgstr "Orija"
+ 
+ #: ../rules/base.xml.in.h:365
+-#, fuzzy
+ msgid "Ossetian"
+-msgstr "Orosz"
++msgstr "Oszét"
+ 
+ #: ../rules/base.xml.in.h:366
+ msgid "Ossetian, Winkeys"
+-msgstr ""
++msgstr "Oszét, win gombok"
+ 
+ #: ../rules/base.xml.in.h:367
+ msgid "PC-98xx Series"
+@@ -1532,7 +1497,7 @@
+ 
+ #: ../rules/base.xml.in.h:370
+ msgid "Pashto"
+-msgstr ""
++msgstr "Pastu"
+ 
+ #: ../rules/base.xml.in.h:371
+ msgid "Pattachote"
+@@ -1575,10 +1540,8 @@
+ msgstr "A Menü billentyűvel lehet a harmadik szintet választani."
+ 
+ #: ../rules/base.xml.in.h:381
+-#, fuzzy
+-msgid ""
+-"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+-msgstr "A jobb Win billentyűvel lehet a harmadik szintet választani."
++msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
++msgstr "A jobb Alt billentyűvel lehet a harmadik szintet választani, a Shift+jobb Alt a Multi_Key."
+ 
+ #: ../rules/base.xml.in.h:382
+ msgid "Press Right Alt key to choose 3rd level."
+@@ -1626,8 +1589,7 @@
+ 
+ #: ../rules/base.xml.in.h:393
+ msgid "R-Alt switches group while pressed."
+-msgstr ""
+-"A jobb Alt billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
++msgstr "A jobb Alt billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+ 
+ #: ../rules/base.xml.in.h:394
+ msgid "Right Alt is Compose."
+@@ -1647,9 +1609,7 @@
+ 
+ #: ../rules/base.xml.in.h:398
+ msgid "Right Ctrl key switches group while pressed."
+-msgstr ""
+-"A jobb Ctrl billentyű lenyomva tartása mellett lehet a csoportok közt "
+-"váltani."
++msgstr "A jobb Ctrl billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+ 
+ #: ../rules/base.xml.in.h:399
+ msgid "Right Ctrl key works as Right Alt."
+@@ -1669,8 +1629,7 @@
+ 
+ #: ../rules/base.xml.in.h:403
+ msgid "Right Win-key switches group while pressed."
+-msgstr ""
+-"A jobb Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
++msgstr "A jobb Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani."
+ 
+ #: ../rules/base.xml.in.h:404
+ msgid "Right handed Dvorak"
+@@ -1718,7 +1677,7 @@
+ 
+ #: ../rules/base.xml.in.h:415
+ msgid "SCG"
+-msgstr ""
++msgstr "SCG"
+ 
+ #: ../rules/base.xml.in.h:416
+ msgid "SILVERCREST Multimedia Wireless Keyboard"
+@@ -1786,19 +1745,19 @@
+ 
+ #: ../rules/base.xml.in.h:432
+ msgid "Space key output nobreakspace at fourth level."
+-msgstr ""
++msgstr "A szóköz nem törhető szóközt ad a negyedik szinten."
+ 
+ #: ../rules/base.xml.in.h:433
+ msgid "Space key output nobreakspace at second level."
+-msgstr ""
++msgstr "A szóköz nem törhető szóközt ad a második szinten."
+ 
+ #: ../rules/base.xml.in.h:434
+ msgid "Space key output nobreakspace at third level."
+-msgstr ""
++msgstr "A szóköz nem törhető szóközt ad a harmadik szinten."
+ 
+ #: ../rules/base.xml.in.h:435
+ msgid "Space key output space at any level."
+-msgstr ""
++msgstr "A szóköz nem törhető szóközt ad bármely szinten."
+ 
+ #: ../rules/base.xml.in.h:436
+ msgid "Spain"
+@@ -1806,8 +1765,7 @@
+ 
+ #: ../rules/base.xml.in.h:437
+ msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
+-msgstr ""
+-"A speciális billentyűket (Ctrl+Alt+&lt;billentyű&gt;) a kiszolgáló kezeli."
++msgstr "A speciális billentyűket (Ctrl+Alt+&lt;billentyű&gt;) a kiszolgáló kezeli."
+ 
+ #: ../rules/base.xml.in.h:438
+ msgid "SrL"
+@@ -1857,7 +1815,7 @@
+ 
+ #: ../rules/base.xml.in.h:451
+ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+-msgstr ""
++msgstr "Két billentyű kódjának felcserélése, ha a kernel rosszul észleli a Mac billentyűzetet."
+ 
+ #: ../rules/base.xml.in.h:452
+ msgid "Swe"
+@@ -2036,9 +1994,8 @@
+ msgstr "Szlovén billentyűkombinációk használata"
+ 
+ #: ../rules/base.xml.in.h:496
+-#, fuzzy
+ msgid "Use guillemets for quotes"
+-msgstr "»Csúcsos« idézőjelek használata"
++msgstr "»Csúcsos« idézőjelek használata idézetekhez"
+ 
+ #: ../rules/base.xml.in.h:497
+ msgid "Use keyboard LED to show alternative group."
+@@ -2062,11 +2019,11 @@
+ 
+ #: ../rules/base.xml.in.h:502
+ msgid "Wang model 724 azerty"
+-msgstr ""
++msgstr "Wang 724-es modell, azerty"
+ 
+ #: ../rules/base.xml.in.h:503
+ msgid "Western"
+-msgstr ""
++msgstr "Nyugati"
+ 
+ #: ../rules/base.xml.in.h:504
+ msgid "Winbook Model XP5"
+@@ -2081,7 +2038,6 @@
+ msgstr "Az &lt;\\|&gt; billentyűvel"
+ 
+ #: ../rules/base.xml.in.h:507
+-#, fuzzy
+ msgid "With guillemets"
+ msgstr "»Csúcsos« idézőjelekkel"
+ 
+@@ -2091,7 +2047,7 @@
+ 
+ #: ../rules/base.xml.in.h:509
+ msgid "Yoruba"
+-msgstr ""
++msgstr "Joruba"
+ 
+ #: ../rules/base.xml.in.h:510
+ msgid "Z and ZHE swapped"
+@@ -2099,7 +2055,7 @@
+ 
+ #: ../rules/base.xml.in.h:511
+ msgid "Zar"
+-msgstr ""
++msgstr "Zar"
+ 
+ #: ../rules/base.xml.in.h:512
+ msgid "azerty"
+@@ -2132,18 +2088,3 @@
+ #: ../rules/base.xml.in.h:519
+ msgid "qwertz"
+ msgstr "qwertz"
+-
+-#~ msgid "Logitech Deluxe Access Keyboard"
+-#~ msgstr "Logitech Deluxe Access billentyűzet"
+-
+-#~ msgid "Logitech iTouch keyboard Internet Navigator"
+-#~ msgstr "Logitech iTouch Keyboard Internet Navigator"
+-
+-#~ msgid "Power G5"
+-#~ msgstr "Power G5"
+-
+-#~ msgid "US keyboard with Maltian letters"
+-#~ msgstr "US billentyűzet máltai betűkkel"
+-
+-#~ msgid "si1452"
+-#~ msgstr "si1452"
+Index: xkb-data/po/sl.po
+===================================================================
+--- xkb-data.orig/po/sl.po
++++ xkb-data/po/sl.po
+@@ -1,21 +1,19 @@
+-# -*- mode:po; coding:utf-8; -*- Slovenian message catalogue for xkeyboard-config-0.6.
++# -*- mode:po; coding:utf-8; -*- Slovenian message catalogue for xkeyboard-config-0.9.
+ # Copyright (C) 2005 Free Software Foundation, Inc.
+-# Matej Urbančič <matej.urban@gmail.com>, 2005.
++# Matej Urbančič <matej.urban@gmail.com>, 2006.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: xkeyboard-config-0.6\n"
++"Project-Id-Version: xkeyboard-config-0.9\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2006-10-02 19:47+0100\n"
+-"PO-Revision-Date: 2005-09-30 13:58+0100\n"
++"POT-Creation-Date: 2006-10-01 23:44+0100\n"
++"PO-Revision-Date: 2006-10-17 11:15+0100\n"
+ "Last-Translator: Matej Urbančič <matej.urban@gmail.com>\n"
+ "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+-"%100==4 ? 3 : 0);\n"
+-"X-Poedit-Language: Slovenian\n"
++"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+ "X-Poedit-Country: SLOVENIA\n"
+ "X-Poedit-SourceCharset: utf-8\n"
+ 
+@@ -24,23 +22,20 @@
+ msgstr "(F)"
+ 
+ #: ../rules/base.xml.in.h:2
+-#, fuzzy
+ msgid "(Legacy) Alternative"
+-msgstr "Alternativna"
++msgstr "(Podedovano) Alternativna"
+ 
+ #: ../rules/base.xml.in.h:3
+-#, fuzzy
+ msgid "(Legacy) Alternative, Sun dead keys"
+-msgstr "Alternativna, Sun mrtve tipke."
++msgstr "(Podedovano) Alternativna, Sun mrtve tipke"
+ 
+ #: ../rules/base.xml.in.h:4
+-#, fuzzy
+ msgid "(Legacy) Alternative, eliminate dead keys"
+-msgstr "Alternativno, izloči mrtve tipke"
++msgstr "(Podedovano) Alternativno, izloči mrtve tipke"
+ 
+ #: ../rules/base.xml.in.h:5
+ msgid "101/104 key Compatible"
+-msgstr ""
++msgstr "Kompatibilna 101/104 tipke"
+ 
+ #: ../rules/base.xml.in.h:6
+ msgid "101/qwerty/comma/Dead keys"
+@@ -115,9 +110,8 @@
+ msgstr "A4Tech KBS-8"
+ 
+ #: ../rules/base.xml.in.h:24
+-#, fuzzy
+ msgid "A4Tech Wireless Desktop RFKB-23"
+-msgstr "Dexxa Wireless Desktop Tipkovnica"
++msgstr "A4Tech Wireless Desktop RFKB-23"
+ 
+ #: ../rules/base.xml.in.h:25
+ msgid "ACPI Standard"
+@@ -129,11 +123,11 @@
+ 
+ #: ../rules/base.xml.in.h:27
+ msgid "Acer C300"
+-msgstr ""
++msgstr "Acer C300"
+ 
+ #: ../rules/base.xml.in.h:28
+ msgid "Acer Ferrari 4000"
+-msgstr ""
++msgstr "Acer Ferrari 4000"
+ 
+ #: ../rules/base.xml.in.h:29
+ msgid "Acer TravelMate 800"
+@@ -161,7 +155,7 @@
+ 
+ #: ../rules/base.xml.in.h:35
+ msgid "Adding the nobreakspace keysym to space key"
+-msgstr ""
++msgstr "Dodajanje brezpresledni znak preslednici"
+ 
+ #: ../rules/base.xml.in.h:36
+ msgid "Advance Scorpius KI"
+@@ -169,16 +163,15 @@
+ 
+ #: ../rules/base.xml.in.h:37
+ msgid "Afg"
+-msgstr ""
++msgstr "Afg"
+ 
+ #: ../rules/base.xml.in.h:38
+-#, fuzzy
+ msgid "Afghanistan"
+-msgstr "Pakistan"
++msgstr "Afghanistan"
+ 
+ #: ../rules/base.xml.in.h:39
+ msgid "Akan"
+-msgstr ""
++msgstr "Akan"
+ 
+ #: ../rules/base.xml.in.h:40
+ msgid "Alb"
+@@ -197,12 +190,10 @@
+ msgstr "Alt določi na desno Win tipko in Super na Menu tipko."
+ 
+ #: ../rules/base.xml.in.h:44
+-#, fuzzy
+ msgid "Alt+CapsLock changes group."
+ msgstr "Shift+CapsLock zamenjata skupino."
+ 
+ #: ../rules/base.xml.in.h:45
+-#, fuzzy
+ msgid "Alt+Ctrl changes group."
+ msgstr "Alt+Ctrl zamenjata skupino."
+ 
+@@ -223,9 +214,8 @@
+ msgstr "Alternativna"
+ 
+ #: ../rules/base.xml.in.h:50
+-#, fuzzy
+ msgid "Alternative Eastern"
+-msgstr "Alternativna"
++msgstr "Alternativno vzhodno"
+ 
+ #: ../rules/base.xml.in.h:51
+ msgid "Alternative international (former us_intl)"
+@@ -240,19 +230,16 @@
+ msgstr "Alternativno, izloči mrtve tipke"
+ 
+ #: ../rules/base.xml.in.h:54
+-#, fuzzy
+ msgid "Alternative, latin-9 only"
+-msgstr "Alternativno, izloči mrtve tipke"
++msgstr "Alternativno, latinsko-9"
+ 
+ #: ../rules/base.xml.in.h:55
+-#, fuzzy
+ msgid "And"
+-msgstr "IND"
++msgstr "And"
+ 
+ #: ../rules/base.xml.in.h:56
+-#, fuzzy
+ msgid "Andorra"
+-msgstr "ARA"
++msgstr "Andora"
+ 
+ #: ../rules/base.xml.in.h:57
+ msgid "Apostrophe (') variant"
+@@ -260,11 +247,11 @@
+ 
+ #: ../rules/base.xml.in.h:58
+ msgid "Apple"
+-msgstr ""
++msgstr "Apple"
+ 
+ #: ../rules/base.xml.in.h:59
+ msgid "Apple Laptop"
+-msgstr ""
++msgstr "Apple Laptop"
+ 
+ #: ../rules/base.xml.in.h:60
+ msgid "Ara"
+@@ -319,9 +306,8 @@
+ msgstr "BTC 9001AH"
+ 
+ #: ../rules/base.xml.in.h:73
+-#, fuzzy
+ msgid "BTC 9019U"
+-msgstr "BTC 9001AH"
++msgstr "BTC 9019U"
+ 
+ #: ../rules/base.xml.in.h:74
+ msgid "Ban"
+@@ -409,7 +395,7 @@
+ 
+ #: ../rules/base.xml.in.h:95
+ msgid "Buckwalter"
+-msgstr ""
++msgstr "Buckwalter"
+ 
+ #: ../rules/base.xml.in.h:96
+ msgid "Bulgaria"
+@@ -417,7 +403,7 @@
+ 
+ #: ../rules/base.xml.in.h:97
+ msgid "Cambodia"
+-msgstr ""
++msgstr "Kambodža"
+ 
+ #: ../rules/base.xml.in.h:98
+ msgid "Can"
+@@ -428,24 +414,20 @@
+ msgstr "Kanada"
+ 
+ #: ../rules/base.xml.in.h:100
+-#, fuzzy
+ msgid "Caps Lock is Compose."
+-msgstr "Menu deluje kot "
++msgstr "CapsLock je pred-tipka (Compose)"
+ 
+ #: ../rules/base.xml.in.h:101
+ msgid "CapsLock LED shows alternative group."
+ msgstr "CapsLock LED kaže alternativno skupino."
+ 
+ #: ../rules/base.xml.in.h:102
+-#, fuzzy
+ msgid "CapsLock acts as Shift with locking. Shift \"pauses\" CapsLock."
+ msgstr "CapsLock se obnaša kot zaklenjena Shift tipka. Shift prekine CapsLock."
+ 
+ #: ../rules/base.xml.in.h:103
+-#, fuzzy
+ msgid "CapsLock acts as Shift with locking. Shift doesn't affect CapsLock."
+-msgstr ""
+-"CapsLock se obnaša kot Shift z zaklepanjem. Shift ne prekliče CapsLock tipke."
++msgstr "CapsLock se obnaša kot Shift z zaklepanjem. Shift ne prekliče CapsLock tipke."
+ 
+ #: ../rules/base.xml.in.h:104
+ msgid "CapsLock just locks the Shift modifier."
+@@ -468,19 +450,16 @@
+ msgstr "CapsLock izmenjuje velikost črk (velike in male črke)."
+ 
+ #: ../rules/base.xml.in.h:109
+-#, fuzzy
+ msgid "CapsLock uses internal capitalization. Shift \"pauses\" CapsLock."
+ msgstr "CapsLock uporablja notranjo kapitalizacijo. Shift prekliče CapsLock."
+ 
+ #: ../rules/base.xml.in.h:110
+-#, fuzzy
+ msgid "CapsLock uses internal capitalization. Shift doesn't affect CapsLock."
+-msgstr ""
+-"CapsLock uporablja notranjo kapitalizacijo. Shift ne prekliče CapsLock."
++msgstr "CapsLock uporablja notranjo kapitalizacijo. Shift ne prekliče CapsLock."
+ 
+ #: ../rules/base.xml.in.h:111
+ msgid "Catalan variant with middle-dot L"
+-msgstr ""
++msgstr "Katalanska varianta z L s srednjo piko"
+ 
+ #: ../rules/base.xml.in.h:112
+ msgid "Che"
+@@ -495,9 +474,8 @@
+ msgstr "Cherry Blue Line CyBo@rd (druga izbira)"
+ 
+ #: ../rules/base.xml.in.h:115
+-#, fuzzy
+ msgid "Cherry CyBo@rd USB-Hub"
+-msgstr "Cherry Blue Line CyBo@rd"
++msgstr "Cherry CyBo@rd USB-Hub"
+ 
+ #: ../rules/base.xml.in.h:116
+ msgid "Cherry CyMotion Master Linux"
+@@ -512,7 +490,6 @@
+ msgstr "Chicony KB-9885"
+ 
+ #: ../rules/base.xml.in.h:119
+-#, fuzzy
+ msgid "Classic Dvorak"
+ msgstr "Dvorak nabor"
+ 
+@@ -546,29 +523,25 @@
+ 
+ #: ../rules/base.xml.in.h:127
+ msgid "Congo, Democratic Republic of the"
+-msgstr ""
++msgstr "Kongo, Demokratična Republika"
+ 
+ #: ../rules/base.xml.in.h:128
+ msgid "Croatia"
+ msgstr "Hrvaška"
+ 
+ #: ../rules/base.xml.in.h:129
+-#, fuzzy
+ msgid "Ctrl key at bottom left"
+ msgstr "Ctrl tipka leži levo spodaj"
+ 
+ #: ../rules/base.xml.in.h:130
+-#, fuzzy
+ msgid "Ctrl key at left of 'A'"
+ msgstr "Tipka Ctrl je levo of tipke 'A'"
+ 
+ #: ../rules/base.xml.in.h:131
+-#, fuzzy
+ msgid "Ctrl key position"
+ msgstr "Položaj Ctrl Tipke"
+ 
+ #: ../rules/base.xml.in.h:132
+-#, fuzzy
+ msgid "Ctrl+Shift changes group."
+ msgstr "Ctrl+Shift zamenjata skupino."
+ 
+@@ -586,7 +559,7 @@
+ 
+ #: ../rules/base.xml.in.h:136
+ msgid "DRC"
+-msgstr ""
++msgstr "DRC"
+ 
+ #: ../rules/base.xml.in.h:137
+ msgid "DTK2000"
+@@ -602,7 +575,7 @@
+ 
+ #: ../rules/base.xml.in.h:140
+ msgid "Default numpad keys."
+-msgstr ""
++msgstr "Privzete tipke številčnice"
+ 
+ #: ../rules/base.xml.in.h:141
+ msgid "Dell"
+@@ -614,12 +587,11 @@
+ 
+ #: ../rules/base.xml.in.h:143
+ msgid "Dell Latitude series laptop"
+-msgstr ""
++msgstr "Dell Latitude serijski laptop"
+ 
+ #: ../rules/base.xml.in.h:144
+-#, fuzzy
+ msgid "Dell USB Multimedia Keybard"
+-msgstr "Super Power Multimedijska tipkovnica"
++msgstr "Dell USB Multimedia tipkovnica"
+ 
+ #: ../rules/base.xml.in.h:145
+ msgid "Denmark"
+@@ -654,9 +626,8 @@
+ msgstr "Dvorak, Poljska - narekovaj na quotemark tipki"
+ 
+ #: ../rules/base.xml.in.h:153
+-#, fuzzy
+ msgid "Eastern"
+-msgstr "EST"
++msgstr "Vzhodni"
+ 
+ #: ../rules/base.xml.in.h:154
+ msgid "Eliminate dead keys"
+@@ -667,9 +638,8 @@
+ msgstr "Ennyah DKB-1008"
+ 
+ #: ../rules/base.xml.in.h:156
+-#, fuzzy
+ msgid "Epo"
+-msgstr "ESP"
++msgstr "Epo"
+ 
+ #: ../rules/base.xml.in.h:157
+ msgid "Esp"
+@@ -677,7 +647,7 @@
+ 
+ #: ../rules/base.xml.in.h:158
+ msgid "Esperanto"
+-msgstr ""
++msgstr "Esperanto"
+ 
+ #: ../rules/base.xml.in.h:159
+ msgid "Est"
+@@ -689,16 +659,15 @@
+ 
+ #: ../rules/base.xml.in.h:161
+ msgid "Evdev-managed keyboard"
+-msgstr ""
++msgstr "Evdev tipkovnica"
+ 
+ #: ../rules/base.xml.in.h:162
+ msgid "Everex STEPnote"
+ msgstr "Everex STEPnote"
+ 
+ #: ../rules/base.xml.in.h:163
+-#, fuzzy
+ msgid "Ewe"
+-msgstr "SWE"
++msgstr "Ewe"
+ 
+ #: ../rules/base.xml.in.h:164
+ msgid "Extended"
+@@ -741,9 +710,8 @@
+ msgstr "Francoska"
+ 
+ #: ../rules/base.xml.in.h:174
+-#, fuzzy
+ msgid "French (Macintosh)"
+-msgstr "Macintosh"
++msgstr "Francosko (Macintosh)"
+ 
+ #: ../rules/base.xml.in.h:175
+ msgid "French (legacy)"
+@@ -763,7 +731,7 @@
+ 
+ #: ../rules/base.xml.in.h:179
+ msgid "Fula"
+-msgstr ""
++msgstr "Fula"
+ 
+ #: ../rules/base.xml.in.h:180
+ msgid "GBr"
+@@ -771,7 +739,7 @@
+ 
+ #: ../rules/base.xml.in.h:181
+ msgid "Ga"
+-msgstr ""
++msgstr "Ga"
+ 
+ #: ../rules/base.xml.in.h:182
+ msgid "Generic 101-key PC"
+@@ -790,9 +758,8 @@
+ msgstr "Splošna tipkovnica s 105 tipkami (Intl) PC"
+ 
+ #: ../rules/base.xml.in.h:186
+-#, fuzzy
+ msgid "Genius Comfy KB-12e"
+-msgstr "Genius Comfy KB-21e-Scroll"
++msgstr "Genius Comfy KB-12e"
+ 
+ #: ../rules/base.xml.in.h:187
+ msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+@@ -803,9 +770,8 @@
+ msgstr "Genius Comfy KB-21e-Scroll"
+ 
+ #: ../rules/base.xml.in.h:189
+-#, fuzzy
+ msgid "Genius KB-19e NB"
+-msgstr "Genius Comfy KB-21e-Scroll"
++msgstr "Genius KB-19e NB"
+ 
+ #: ../rules/base.xml.in.h:190
+ msgid "Geo"
+@@ -816,9 +782,8 @@
+ msgstr "Gruzija"
+ 
+ #: ../rules/base.xml.in.h:192
+-#, fuzzy
+ msgid "German (Macintosh)"
+-msgstr "Macintosh"
++msgstr "Nemško (Macintosh)"
+ 
+ #: ../rules/base.xml.in.h:193
+ msgid "German, Sun dead keys"
+@@ -833,13 +798,12 @@
+ msgstr "Nemčija"
+ 
+ #: ../rules/base.xml.in.h:196
+-#, fuzzy
+ msgid "Gha"
+-msgstr "THA"
++msgstr "Gha"
+ 
+ #: ../rules/base.xml.in.h:197
+ msgid "Ghana"
+-msgstr ""
++msgstr "Gana"
+ 
+ #: ../rules/base.xml.in.h:198
+ msgid "Gre"
+@@ -867,7 +831,7 @@
+ 
+ #: ../rules/base.xml.in.h:204
+ msgid "Hausa"
+-msgstr ""
++msgstr "Hausa"
+ 
+ #: ../rules/base.xml.in.h:205
+ msgid "Hewlett-Packard Internet Keyboard"
+@@ -931,7 +895,7 @@
+ 
+ #: ../rules/base.xml.in.h:220
+ msgid "IBM (LST 1205-92)"
+-msgstr ""
++msgstr "IBM (LST 1205-92)"
+ 
+ #: ../rules/base.xml.in.h:221
+ msgid "IBM Rapid Access"
+@@ -950,9 +914,8 @@
+ msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+ 
+ #: ../rules/base.xml.in.h:225
+-#, fuzzy
+ msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
++msgstr "IBM ThinkPad 560Z/600/600E/A22E, Intl"
+ 
+ #: ../rules/base.xml.in.h:226
+ msgid "ISO Alternate"
+@@ -964,7 +927,7 @@
+ 
+ #: ../rules/base.xml.in.h:228
+ msgid "Igbo"
+-msgstr ""
++msgstr "Igbo"
+ 
+ #: ../rules/base.xml.in.h:229
+ msgid "Ind"
+@@ -987,9 +950,8 @@
+ msgstr "Iran"
+ 
+ #: ../rules/base.xml.in.h:234
+-#, fuzzy
+ msgid "Iraq"
+-msgstr "Iran"
++msgstr "Iraq"
+ 
+ #: ../rules/base.xml.in.h:235
+ msgid "Ireland"
+@@ -1004,9 +966,8 @@
+ msgstr "IRN"
+ 
+ #: ../rules/base.xml.in.h:238
+-#, fuzzy
+ msgid "Irq"
+-msgstr "ISR"
++msgstr "Irq"
+ 
+ #: ../rules/base.xml.in.h:239
+ msgid "Isl"
+@@ -1033,9 +994,8 @@
+ msgstr "Japonska"
+ 
+ #: ../rules/base.xml.in.h:245
+-#, fuzzy
+ msgid "Japan (PC-98xx Series)"
+-msgstr "PC-98xx Serije"
++msgstr "Japonska (PC-98xx Serija)"
+ 
+ #: ../rules/base.xml.in.h:246
+ msgid "Japanese 106-key"
+@@ -1051,24 +1011,23 @@
+ 
+ #: ../rules/base.xml.in.h:249
+ msgid "Kashubian"
+-msgstr ""
++msgstr "Kasubija"
+ 
+ #: ../rules/base.xml.in.h:250
+ msgid "Kaz"
+-msgstr ""
++msgstr "Kaz"
+ 
+ #: ../rules/base.xml.in.h:251
+ msgid "Kazakh with Russian"
+-msgstr ""
++msgstr "Kazahstanščina z Rusščino"
+ 
+ #: ../rules/base.xml.in.h:252
+-#, fuzzy
+ msgid "Kazakhstan"
+-msgstr "Pakistan"
++msgstr "Kazakhstan"
+ 
+ #: ../rules/base.xml.in.h:253
+ msgid "Keypad"
+-msgstr ""
++msgstr "Tipkovna plošča"
+ 
+ #: ../rules/base.xml.in.h:254
+ msgid "Keytronic FlexPro"
+@@ -1076,41 +1035,39 @@
+ 
+ #: ../rules/base.xml.in.h:255
+ msgid "Khm"
+-msgstr ""
++msgstr "Khm"
+ 
+ #: ../rules/base.xml.in.h:256
+-#, fuzzy
+ msgid "Kor"
+-msgstr "NOR"
++msgstr "Kor"
+ 
+ #: ../rules/base.xml.in.h:257
+ msgid "Korea, Republic of"
+-msgstr ""
++msgstr "Koreja, Republika"
+ 
+ #: ../rules/base.xml.in.h:258
+-#, fuzzy
+ msgid "Korean 106-key"
+-msgstr "Japonska tipkovnica s 106 tipkami"
++msgstr "Korejska tipkovnica s 106 tipkami"
+ 
+ #: ../rules/base.xml.in.h:259
+ msgid "Kotoistus"
+-msgstr ""
++msgstr "Kotoistus"
+ 
+ #: ../rules/base.xml.in.h:260
+ msgid "Kurdish, (F)"
+-msgstr ""
++msgstr "Kurdščina, (F)"
+ 
+ #: ../rules/base.xml.in.h:261
+ msgid "Kurdish, Arabic-Latin"
+-msgstr ""
++msgstr "Kurdščina, Arabska-Latinska"
+ 
+ #: ../rules/base.xml.in.h:262
+ msgid "Kurdish, Latin Alt-Q"
+-msgstr ""
++msgstr "Kurdska, Latinska Alt-Q"
+ 
+ #: ../rules/base.xml.in.h:263
+ msgid "Kurdish, Latin Q"
+-msgstr ""
++msgstr "Kurdščina, Latinsko Q"
+ 
+ #: ../rules/base.xml.in.h:264
+ msgid "Kyr"
+@@ -1141,14 +1098,12 @@
+ msgstr "Laptop/notebook Compaq (eg. Presario) Internet Tipkovnica"
+ 
+ #: ../rules/base.xml.in.h:271
+-#, fuzzy
+ msgid "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+-msgstr "Laptop/notebook Dell Inspiron 8xxxw"
++msgstr "Laptop/notebook Dell Inspiron 6xxx/8xxx"
+ 
+ #: ../rules/base.xml.in.h:272
+-#, fuzzy
+ msgid "Laptop/notebook eMachines m68xx"
+-msgstr "Laptop/notebook Dell Inspiron 8xxxw"
++msgstr "Laptop/notebook eMachines m68xx"
+ 
+ #: ../rules/base.xml.in.h:273
+ msgid "Latin"
+@@ -1171,7 +1126,6 @@
+ msgstr "Latinski qwerty"
+ 
+ #: ../rules/base.xml.in.h:278
+-#, fuzzy
+ msgid "Latin with guillemets"
+ msgstr "Latinska z dvojnimi &lt;&gt; (Guillemots)"
+ 
+@@ -1180,9 +1134,8 @@
+ msgstr "Latvija"
+ 
+ #: ../rules/base.xml.in.h:280
+-#, fuzzy
+ msgid "Left Alt is swapped with left Win-key."
+-msgstr "Meta funkcionalnost prevzame leva Win tipka."
++msgstr "Levi Alt zamenja leva Win tipka."
+ 
+ #: ../rules/base.xml.in.h:281
+ msgid "Left Alt key changes group."
+@@ -1205,9 +1158,8 @@
+ msgstr "Leva Win tipka zamenja skupino."
+ 
+ #: ../rules/base.xml.in.h:286
+-#, fuzzy
+ msgid "Left Win-key is Compose."
+-msgstr "Desna Win tipka je pred-tipka (Compose)"
++msgstr "Leva Win tipka je pred-tipka (Compose)"
+ 
+ #: ../rules/base.xml.in.h:287
+ msgid "Left Win-key switches group while pressed."
+@@ -1215,7 +1167,7 @@
+ 
+ #: ../rules/base.xml.in.h:288
+ msgid "Left handed Dvorak"
+-msgstr ""
++msgstr "Levoročni Dvorak"
+ 
+ #: ../rules/base.xml.in.h:289
+ msgid "Lithuania"
+@@ -1230,9 +1182,8 @@
+ msgstr "Logitech Cordless Desktop"
+ 
+ #: ../rules/base.xml.in.h:292
+-#, fuzzy
+ msgid "Logitech Cordless Desktop LX-300"
+-msgstr "Logitech Cordless Desktop"
++msgstr "Logitech Cordless Desktop LX-300"
+ 
+ #: ../rules/base.xml.in.h:293
+ msgid "Logitech Cordless Desktop Navigator"
+@@ -1275,9 +1226,8 @@
+ msgstr "Logitech Ultra-X Tipkovnica"
+ 
+ #: ../rules/base.xml.in.h:303
+-#, fuzzy
+ msgid "Logitech diNovo Keyboard"
+-msgstr "Logitech Access Tipkovnica"
++msgstr "Logitech diNovo Tipkovnica"
+ 
+ #: ../rules/base.xml.in.h:304
+ msgid "Logitech iTouch"
+@@ -1288,14 +1238,12 @@
+ msgstr "Logitech iTouch Brezžična Tipkovnica (model Y-RB6)"
+ 
+ #: ../rules/base.xml.in.h:306
+-#, fuzzy
+ msgid "Logitech iTouch Internet Navigator Keyboard SE"
+-msgstr "Logitech Internet NavigatorTipkovnica"
++msgstr "Logitech Internet NavigatorTipkovnica SE"
+ 
+ #: ../rules/base.xml.in.h:307
+-#, fuzzy
+ msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+-msgstr "Logitech Internet NavigatorTipkovnica"
++msgstr "Logitech Internet NavigatorTipkovnica SE (USB)"
+ 
+ #: ../rules/base.xml.in.h:308
+ msgid "Ltu"
+@@ -1306,7 +1254,6 @@
+ msgstr "LVA"
+ 
+ #: ../rules/base.xml.in.h:310
+-#, fuzzy
+ msgid "Macedonia"
+ msgstr "Makedonija"
+ 
+@@ -1319,24 +1266,20 @@
+ msgstr "Macintosh Old"
+ 
+ #: ../rules/base.xml.in.h:313
+-#, fuzzy
+ msgid "Macintosh, Sun dead keys"
+-msgstr "Nemška, Sun mrtve tipke"
++msgstr "Macintosh, Sun mrtve tipke"
+ 
+ #: ../rules/base.xml.in.h:314
+-#, fuzzy
+ msgid "Macintosh, eliminate dead keys"
+-msgstr "Francoska, izloči mrtve tipke"
++msgstr "Macintosh, izloči mrtve tipke"
+ 
+ #: ../rules/base.xml.in.h:315
+-#, fuzzy
+ msgid "Make CapsLock an additional Ctrl."
+ msgstr "CapsLock je dodatna Ctrl tipka."
+ 
+ #: ../rules/base.xml.in.h:316
+-#, fuzzy
+ msgid "Mal"
+-msgstr "Malta"
++msgstr "Mal"
+ 
+ #: ../rules/base.xml.in.h:317
+ msgid "Malayalam"
+@@ -1344,7 +1287,7 @@
+ 
+ #: ../rules/base.xml.in.h:318
+ msgid "Maldives"
+-msgstr ""
++msgstr "Maldivi"
+ 
+ #: ../rules/base.xml.in.h:319
+ msgid "Malta"
+@@ -1352,7 +1295,7 @@
+ 
+ #: ../rules/base.xml.in.h:320
+ msgid "Maltese keyboard with US layout"
+-msgstr ""
++msgstr "Malteška tipkovnica z US naborom"
+ 
+ #: ../rules/base.xml.in.h:321
+ msgid "Mao"
+@@ -1412,8 +1355,7 @@
+ 
+ #: ../rules/base.xml.in.h:335
+ msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+-msgstr ""
+-"Microsoft Natural Tipkovnica Pro USB / Microsoft Internet Tipkovnica Pro"
++msgstr "Microsoft Natural Tipkovnica Pro USB / Microsoft Internet Tipkovnica Pro"
+ 
+ #: ../rules/base.xml.in.h:336
+ msgid "Microsoft Office Keyboard"
+@@ -1452,9 +1394,8 @@
+ msgstr "Večjezično"
+ 
+ #: ../rules/base.xml.in.h:345
+-#, fuzzy
+ msgid "Multilingual, first part"
+-msgstr "Večjezično, drugi del"
++msgstr "Večjezično, prvi del"
+ 
+ #: ../rules/base.xml.in.h:346
+ msgid "Multilingual, second part"
+@@ -1466,15 +1407,15 @@
+ 
+ #: ../rules/base.xml.in.h:348
+ msgid "Neostyle"
+-msgstr ""
++msgstr "Neostil"
+ 
+ #: ../rules/base.xml.in.h:349
+ msgid "Nep"
+-msgstr ""
++msgstr "Nep"
+ 
+ #: ../rules/base.xml.in.h:350
+ msgid "Nepal"
+-msgstr ""
++msgstr "Nepal"
+ 
+ #: ../rules/base.xml.in.h:351
+ msgid "Netherlands"
+@@ -1482,7 +1423,7 @@
+ 
+ #: ../rules/base.xml.in.h:352
+ msgid "Nigeria"
+-msgstr ""
++msgstr "Nigerija"
+ 
+ #: ../rules/base.xml.in.h:353
+ msgid "Nld"
+@@ -1513,9 +1454,8 @@
+ msgstr "NumLock LED kaže alternativno skupino."
+ 
+ #: ../rules/base.xml.in.h:360
+-#, fuzzy
+ msgid "Numpad keys work as with Mac."
+-msgstr "Shift in številčnica delujeta kot pod MS Okni."
++msgstr "Številčnica deluje kot pod MacOS."
+ 
+ #: ../rules/base.xml.in.h:361
+ msgid "Ogham"
+@@ -1534,13 +1474,12 @@
+ msgstr "Oriya (Indija)"
+ 
+ #: ../rules/base.xml.in.h:365
+-#, fuzzy
+ msgid "Ossetian"
+-msgstr "Rusija"
++msgstr "Osetija"
+ 
+ #: ../rules/base.xml.in.h:366
+ msgid "Ossetian, Winkeys"
+-msgstr ""
++msgstr "Osetijščina, Wintipke"
+ 
+ #: ../rules/base.xml.in.h:367
+ msgid "PC-98xx Series"
+@@ -1556,7 +1495,7 @@
+ 
+ #: ../rules/base.xml.in.h:370
+ msgid "Pashto"
+-msgstr ""
++msgstr "Pašto"
+ 
+ #: ../rules/base.xml.in.h:371
+ msgid "Pattachote"
+@@ -1599,17 +1538,14 @@
+ msgstr "Pritisni menu tipko za izbiro tretjega nivoja."
+ 
+ #: ../rules/base.xml.in.h:381
+-#, fuzzy
+-msgid ""
+-"Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
+-msgstr "Pritisni desno Alt tipko za izbiro tretjega nivoja."
++msgid "Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key."
++msgstr "Pritisni desno Alt tipko za izbiro tretjega nivoja, Shift+Desni Alt predstavlja kombinacijo."
+ 
+ #: ../rules/base.xml.in.h:382
+ msgid "Press Right Alt key to choose 3rd level."
+ msgstr "Pritisni desno Alt tipko za izbiro tretjega nivoja."
+ 
+ #: ../rules/base.xml.in.h:383
+-#, fuzzy
+ msgid "Press Right Ctrl to choose 3rd level."
+ msgstr "Pritisni desno Ctrl tipko za izbiro tretjega nivoja."
+ 
+@@ -1626,13 +1562,12 @@
+ msgstr "Pritisni katerokoli Win tipko za izbiro tretjega nivoja."
+ 
+ #: ../rules/base.xml.in.h:387
+-#, fuzzy
+ msgid "Pro"
+-msgstr "POL"
++msgstr "Pro"
+ 
+ #: ../rules/base.xml.in.h:388
+ msgid "Pro Keypad"
+-msgstr ""
++msgstr "Pro Tipkovnica"
+ 
+ #: ../rules/base.xml.in.h:389
+ msgid "Probhat"
+@@ -1675,9 +1610,8 @@
+ msgstr "Desni Ctrl zamenja skupine ob stisku."
+ 
+ #: ../rules/base.xml.in.h:399
+-#, fuzzy
+ msgid "Right Ctrl key works as Right Alt."
+-msgstr "Desna Ctrl tipka deluje kot desna Alt."
++msgstr "Desna Ctrl tipka deluje kot desni Alt."
+ 
+ #: ../rules/base.xml.in.h:400
+ msgid "Right Shift key changes group."
+@@ -1697,7 +1631,7 @@
+ 
+ #: ../rules/base.xml.in.h:404
+ msgid "Right handed Dvorak"
+-msgstr ""
++msgstr "Desnoročni Dvorak"
+ 
+ #: ../rules/base.xml.in.h:405
+ msgid "Romania"
+@@ -1737,15 +1671,15 @@
+ 
+ #: ../rules/base.xml.in.h:414
+ msgid "Russian with Kazakh"
+-msgstr ""
++msgstr "Ruščina s Kazahstanščino"
+ 
+ #: ../rules/base.xml.in.h:415
+ msgid "SCG"
+-msgstr ""
++msgstr "SCG"
+ 
+ #: ../rules/base.xml.in.h:416
+ msgid "SILVERCREST Multimedia Wireless Keyboard"
+-msgstr ""
++msgstr "SILVERCREST Multimedia Wireless tipkovnica"
+ 
+ #: ../rules/base.xml.in.h:417
+ msgid "SK-1300"
+@@ -1781,7 +1715,7 @@
+ 
+ #: ../rules/base.xml.in.h:425
+ msgid "Serbia and Montenegro"
+-msgstr ""
++msgstr "Srbija in Črna gora"
+ 
+ #: ../rules/base.xml.in.h:426
+ msgid "Shift with numpad keys works as in MS Windows."
+@@ -1801,27 +1735,27 @@
+ 
+ #: ../rules/base.xml.in.h:430
+ msgid "South Africa"
+-msgstr ""
++msgstr "Južna Afrika"
+ 
+ #: ../rules/base.xml.in.h:431
+ msgid "Southern Uzbek"
+-msgstr ""
++msgstr "Južno uzbeško"
+ 
+ #: ../rules/base.xml.in.h:432
+ msgid "Space key output nobreakspace at fourth level."
+-msgstr ""
++msgstr "Preslednica izpiše brezpresledni znak v četrti stopnji."
+ 
+ #: ../rules/base.xml.in.h:433
+ msgid "Space key output nobreakspace at second level."
+-msgstr ""
++msgstr "Preslednica izpiše brezpresledni znak v drugi stopnji."
+ 
+ #: ../rules/base.xml.in.h:434
+ msgid "Space key output nobreakspace at third level."
+-msgstr ""
++msgstr "Preslednica izpiše brezpresledni znak v tretji stopnji."
+ 
+ #: ../rules/base.xml.in.h:435
+ msgid "Space key output space at any level."
+-msgstr ""
++msgstr "Preslednica izpiše brezpresledni znak na vsaki stopnji."
+ 
+ #: ../rules/base.xml.in.h:436
+ msgid "Spain"
+@@ -1874,13 +1808,12 @@
+ msgstr "SVN"
+ 
+ #: ../rules/base.xml.in.h:450
+-#, fuzzy
+ msgid "Swap Ctrl and CapsLock."
+ msgstr "Zamenjaj Ctrl in CapsLock tipki."
+ 
+ #: ../rules/base.xml.in.h:451
+ msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
+-msgstr ""
++msgstr "Zamenjaj tipkovne kode dveh tipk ob napačni zaznavi Mac tipkovnic."
+ 
+ #: ../rules/base.xml.in.h:452
+ msgid "Swe"
+@@ -1939,9 +1872,8 @@
+ msgstr "Tamilski Unicode"
+ 
+ #: ../rules/base.xml.in.h:466
+-#, fuzzy
+ msgid "Tatar"
+-msgstr "Malta"
++msgstr "Tatar"
+ 
+ #: ../rules/base.xml.in.h:467
+ msgid "Telugu"
+@@ -1984,9 +1916,8 @@
+ msgstr "TUR"
+ 
+ #: ../rules/base.xml.in.h:477
+-#, fuzzy
+ msgid "Turkey"
+-msgstr "TUR"
++msgstr "Turčija"
+ 
+ #: ../rules/base.xml.in.h:478
+ msgid "Typewriter"
+@@ -1997,19 +1928,16 @@
+ msgstr "U.S. Angleška"
+ 
+ #: ../rules/base.xml.in.h:480
+-#, fuzzy
+ msgid "US keyboard with Bosnian digraphs"
+-msgstr "US tipkovnica s Romunskimi črkami"
++msgstr "US tipkovnica s Bosanskimi digrafi"
+ 
+ #: ../rules/base.xml.in.h:481
+-#, fuzzy
+ msgid "US keyboard with Bosnian letters"
+-msgstr "US tipkovnica s Romunskimi črkami"
++msgstr "US tipkovnica s Bosanskimi črkami"
+ 
+ #: ../rules/base.xml.in.h:482
+-#, fuzzy
+ msgid "US keyboard with Croatian digraphs"
+-msgstr "US tipkovnica s Hrvaškimi črkami "
++msgstr "US tipkovnica s Hrvaškimi digrafi"
+ 
+ #: ../rules/base.xml.in.h:483
+ msgid "US keyboard with Croatian letters"
+@@ -2020,14 +1948,12 @@
+ msgstr "US tipkovnica s Latvijskimi črkami"
+ 
+ #: ../rules/base.xml.in.h:485
+-#, fuzzy
+ msgid "US keyboard with Slovenian digraphs"
+-msgstr "US tipkovnica s Romunskimi črkami"
++msgstr "US tipkovnica s Slovenskimi digrafi"
+ 
+ #: ../rules/base.xml.in.h:486
+-#, fuzzy
+ msgid "US keyboard with Slovenian letters"
+-msgstr "US tipkovnica s Romunskimi črkami"
++msgstr "US tipkovnica s Slovenskimi črkami"
+ 
+ #: ../rules/base.xml.in.h:487
+ msgid "USA"
+@@ -2055,19 +1981,19 @@
+ 
+ #: ../rules/base.xml.in.h:493
+ msgid "Use Bosnian digraphs"
+-msgstr ""
++msgstr "Uporabi bosanske digrafe"
+ 
+ #: ../rules/base.xml.in.h:494
+ msgid "Use Croatian digraphs"
+-msgstr ""
++msgstr "Uporabi hrvaške digrafe"
+ 
+ #: ../rules/base.xml.in.h:495
+ msgid "Use Slovenian digraphs"
+-msgstr ""
++msgstr "Uporabi slovenske digrafe"
+ 
+ #: ../rules/base.xml.in.h:496
+ msgid "Use guillemets for quotes"
+-msgstr ""
++msgstr "Dvojni &lt;&gt; (guillemets) namesto navednic"
+ 
+ #: ../rules/base.xml.in.h:497
+ msgid "Use keyboard LED to show alternative group."
+@@ -2091,11 +2017,11 @@
+ 
+ #: ../rules/base.xml.in.h:502
+ msgid "Wang model 724 azerty"
+-msgstr ""
++msgstr "Wang model 724 azerty"
+ 
+ #: ../rules/base.xml.in.h:503
+ msgid "Western"
+-msgstr ""
++msgstr "Zahodni"
+ 
+ #: ../rules/base.xml.in.h:504
+ msgid "Winbook Model XP5"
+@@ -2110,7 +2036,6 @@
+ msgstr "Z &lt;\\|&gt; tipkami"
+ 
+ #: ../rules/base.xml.in.h:507
+-#, fuzzy
+ msgid "With guillemets"
+ msgstr "Z dvojnimi &lt;&gt; (Guillemots)"
+ 
+@@ -2120,7 +2045,7 @@
+ 
+ #: ../rules/base.xml.in.h:509
+ msgid "Yoruba"
+-msgstr ""
++msgstr "Joruba"
+ 
+ #: ../rules/base.xml.in.h:510
+ msgid "Z and ZHE swapped"
+@@ -2128,7 +2053,7 @@
+ 
+ #: ../rules/base.xml.in.h:511
+ msgid "Zar"
+-msgstr ""
++msgstr "Zar"
+ 
+ #: ../rules/base.xml.in.h:512
+ msgid "azerty"
+@@ -2162,25 +2087,6 @@
+ msgid "qwertz"
+ msgstr "qwertz"
+ 
+-#, fuzzy
+-#~ msgid "Macintosh layout"
+-#~ msgstr "Macintosh Old"
+-
+-#~ msgid "Logitech Deluxe Access Keyboard"
+-#~ msgstr "Logitech Deluxe Access Tipkovnica"
+-
+-#~ msgid "Logitech iTouch keyboard Internet Navigator"
+-#~ msgstr "Logitech iTouch tipkovnica Internet Navigator"
+-
+-#~ msgid "Turkish"
+-#~ msgstr "Turško"
+-
+-#~ msgid "US keyboard with Maltian letters"
+-#~ msgstr "US tipkovnica s Malteškimi črkami"
+-
+-#~ msgid "si1452"
+-#~ msgstr "si1452"
+-
+ #~ msgid "\"Standard\""
+ #~ msgstr "\"Standard\""
+ 
+@@ -2190,6 +2096,12 @@
+ #~ msgid "Div"
+ #~ msgstr "DIV"
+ 
++#~ msgid "Logitech Deluxe Access Keyboard"
++#~ msgstr "Logitech Deluxe Access Tipkovnica"
++
++#~ msgid "Logitech iTouch keyboard Internet Navigator"
++#~ msgstr "Logitech iTouch tipkovnica Internet Navigator"
++
+ #~ msgid "Serbian"
+ #~ msgstr "Srbsko"
+ 
+@@ -2198,3 +2110,12 @@
+ 
+ #~ msgid "Tamil INSCRIPT"
+ #~ msgstr "Tamilski Inskript"
++
++#~ msgid "Turkish"
++#~ msgstr "Turško"
++
++#~ msgid "US keyboard with Maltian letters"
++#~ msgstr "US tipkovnica s Malteškimi črkami"
++
++#~ msgid "si1452"
++#~ msgstr "si1452"
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/cvs.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/cvs.diff
@@ -0,0 +1 @@
+No patch yet.
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/11_uk_macintosh_problems.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/11_uk_macintosh_problems.diff
@@ -0,0 +1,50 @@
+$Id: 090_xkb_fix_uk_macintosh_problems.diff 396 2005-07-22 21:45:02Z dnusinow $
+
+Fix a few problems with the U.K. Macintosh keyboard layout:
+  * Map <TLDE> key to "section, plusminus".
+  * Map <LSGT> key to "quoteleft, asciitilde".
+  * Map AltGr+<AE02> to "EuroSign".
+  * Include group(switch) symbols so that the already-defined mapping
+    of AltGr+<AE03) to "numbersign" can be used.
+
+Also see Debian #201737.
+
+This patch by Branden Robinson.  Thanks to Mark Brown, Frank Murphy, and
+Sebastien Bacher for their assistance.
+
+Not submitted to XFree86.
+
+diff -ruN xc-old/programs/xkbcomp/symbols/macintosh/gb xc/programs/xkbcomp/symbols/macintosh/gb
+--- xc-old/programs/xkbcomp/symbols/macintosh/gb	2004-04-23 19:54:54.000000000 +0000
++++ xc/programs/xkbcomp/symbols/macintosh/gb	2004-10-26 11:40:11.728581296 +0000
+@@ -1,19 +1,20 @@
+ // $XConsortium: gb /main/3 1996/08/31 12:19:51 kaleb $
+ // $XFree86: xc/programs/xkbcomp/symbols/gb,v 3.3 1996/12/23 07:13:25 dawes Exp $
+-partial default alphanumeric_keys 
+-xkb_symbols "basic" {
+ 
+-    // Describes the differences between a very simple en_US
+-    // keyboard and a very simple U.K. keyboard layout
++partial default alphanumeric_keys
++xkb_symbols "basic" {
+ 
++    // Describe the differences between a U.S. Extended Macintosh keyboard
++    // and a U.K. Extended Macintosh keyboard.
+ 
+-    name[Group1]= "Great Britain";
++    name[Group1]="Great Britain";
+ 
+-    key <AE03> {	[               3,        sterling     	],
++    key <TLDE> {	[	  section,	plusminus	]	};
++    key <AE02> {	[],
++			[	 EuroSign			]	};
++    key <AE03> {	[		3,	sterling	],
+ 			[      numbersign			]	};
++    key <LSGT> {	[	quoteleft,	asciitilde	]	};
+ 
+-    // End alphanumeric section
+-    
++    include "group(switch)"
+ };
+-
+-
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/09_enable_ca_variants.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/09_enable_ca_variants.diff
@@ -0,0 +1,16 @@
+Remove these definitions because they take precedence over variants
+which can then not be selected.  (closes: #347496)
+
+Index: xc/programs/xkbcomp/rules/xorg
+===================================================================
+--- xc/programs/xkbcomp/rules/xorg.orig	2006-02-05 21:59:24.000000000 -0500
++++ xc/programs/xkbcomp/rules/xorg	2006-02-05 21:59:26.000000000 -0500
+@@ -314,8 +314,6 @@
+  $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
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/01_cymotion_master_and_ibm_space_saver.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/01_cymotion_master_and_ibm_space_saver.diff
@@ -0,0 +1,76 @@
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.xml
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.xml	2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.xml	2006-02-26 18:28:52.000000000 -0500
+@@ -619,6 +619,18 @@
+     </model>
+     <model>
+       <configItem>
++        <name>ibm_space_saver</name>
++        <description>IBM Space Saver</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>
+Index: xkbdata-X11R7.0-1.0.1/symbols/inet
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/symbols/inet	2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/symbols/inet	2006-02-26 18:28:52.000000000 -0500
+@@ -353,6 +353,48 @@
+ 
+ // Cherry Blue Line CyBo@rd (alternate option)
+ partial alphanumeric_keys
++xkb_symbols "cherryblueb" {
++    name[Group1]= "Cherry CyMotion Master XPress";
++
++    key <I0B>	{	[ XF86ScrollUp		]	};
++    key <I12>   {       [ XF86ScrollDown        ]       };
++    key <I17>   {       [ XF86Cut               ]       };
++    key <I0A>   {       [ XF86Copy              ]       };
++    key <I18>   {       [ XF86Paste             ]       };
++    key <I71>   {       [ XF86Book              ]       };
++    key <I2C>   {       [ XF86Book              ]       };
++    key <I72>   {       [ XF86Book              ]       };
++    key <I07>   {       [ XF86Forward           ]       };
++    key <I08>   {       [ XF86Back              ]       };
++    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
++    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
++    key <I20>   {       [ XF86AudioMute         ]       };
++    key <I6D>   {       [ XF86AudioMedia        ]       };
++    key <I67>   {       [ XF86AudioRewind       ]       };
++    key <I10>   {       [ XF86Back              ]       };
++    key <I19>   {       [ XF86Forward           ]       };
++    key <I70>   {       [ XF86Eject             ]       };
++    key <I32>   {       [ XF86Finance           ]       };
++    key <I6A>   {       [ XF86Back              ]       };
++    key <I69>   {       [ XF86Forward           ]       };
++    key <I68>   {       [ XF86Stop              ]       };
++    key <FK16>  {       [ XF86Reload            ]       };
++    key <I65>   {       [ XF86Search            ]       };
++    key <I66>   {       [ XF86MyComputer        ]       };
++    key <I02>   {       [ XF86HomePage          ]       };
++    key <I6C>   {       [ XF86Mail              ]       };
++    key <PRSC>  {       [ XF86Terminal          ]       };
++    key <I21>   {       [ XF86Calculator        ]       };
++    key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
++    key <I26>   {       [ XF86AudioMute         ]       };
++    key <I25>   {       [ XF86AudioLowerVolume  ]       };
++    key <XFER>  {       [ XF86Go                ]       };
++    key <I24>   {       [ XF86AudioStop                 ] };
++    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
++    key <I63>   {       [ XF86Standby                   ] };
++};
++
++partial alphanumeric_keys
+ xkb_symbols "cherrybluea" {
+     key <I6A>	{	[ XF86Back		]	};
+     key <I69>	{	[ XF86Forward		]	};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/16_brazilian_keypad_separator.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/16_brazilian_keypad_separator.diff
@@ -0,0 +1,32 @@
+$Id: 099p_xkb_brazilian_fix_keypad_separator.diff 689 2005-10-19 22:11:30Z dnusinow $
+
+This patch by Denis Barbier, based on a report from Rafael Ávila de
+Espíndola.
+
+Not submitted to XFree86.
+
+Index: xc/programs/xkbcomp/symbols/br
+===================================================================
+--- xc/programs/xkbcomp/symbols/br.orig	2005-10-18 19:45:33.000000000 -0400
++++ xc/programs/xkbcomp/symbols/br	2005-10-18 22:10:11.000000000 -0400
+@@ -61,7 +61,7 @@
+                         [          degree,    questiondown	]       };
+ 
+     key <KPPT> {	[  KP_Decimal				]	};
+-    key <KPDL> {	[  KP_Delete,	comma			]	};
++    key <KPDL> {	[  KP_Delete,	KP_Separator		]	};
+ 
+     // begin modifier mappings
+     
+Index: xc/programs/xkbcomp/symbols/pc/br
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/br.orig	2005-10-18 19:45:33.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/br	2005-10-18 22:10:33.000000000 -0400
+@@ -42,6 +42,7 @@
+     key <AB11>	{ [     slash,   question,       degree, questiondown ]	};
+ 
+     key <KPPT>	{ [ KP_Decimal ]	};
++	key <KPDL> { [ KP_Delete, KP_Separator ]   };
+ 
+     include "keypad(comma)"
+ 
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff
@@ -0,0 +1,22 @@
+$Id: 082_xkb_AE12_apostrophe_on_pc_de_nodeadkeys.diff 689 2005-10-19 22:11:30Z dnusinow $
+
+German keyboards using the "nodeadkeys" variant should produce an
+apostrophe, not an acute accent, when <AE12> is pressed.  This change is
+also consistent with the existing xc/programs/xkbcomp/symbols/de file.
+See Debian bug #241127.
+
+This patch by Andreas Metzler.
+
+Index: xc/programs/xkbcomp/symbols/pc/de
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/de.orig	2005-10-18 19:45:33.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/de	2005-10-18 21:32:56.000000000 -0400
+@@ -42,7 +42,7 @@
+     name[Group1]="Germany - Eliminate dead keys";
+ 
+     key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
+-    key <AE12>	{ [     acute,      grave,      cedilla,      cedilla ]	};
++    key <AE12>	{ [apostrophe,      grave,      cedilla,      cedilla ]	};
+     key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};
+     key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};
+     key <AC10>	{ [odiaeresis, Odiaeresis,  doubleacute,  doubleacute ]	};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/06_AB10_minus_underscore.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/06_AB10_minus_underscore.diff
@@ -0,0 +1,42 @@
+$Id: 081_xkb_fix_AB10_minus_underscore_on_hr.diff 396 2005-07-22 21:45:02Z dnusinow $
+
+Fix the latin(type3) PC keyboard map to override the AB10 key definition
+inherited from the basic layout, mapping the key to "minus, underscore"
+rather than "slash, question".  This enables the al (Albanian), hr
+(Croatian), pl2 (Polish QWERTZ), si (Slovenian), and yu (Yugoslavian)
+layouts to inherit this key mapping (though al overrides it).  See Debian
+#236604.
+
+This patch by Branden Robinson; tested by Josip Rodin.
+
+diff -urN xc/programs/xkbcomp/symbols~/pc/latin xc/programs/xkbcomp/symbols/pc/latin
+--- xc/programs/xkbcomp/symbols~/pc/latin	2003-01-25 21:01:48.000000000 -0500
++++ xc/programs/xkbcomp/symbols/pc/latin	2004-03-30 17:08:27.000000000 -0500
+@@ -108,13 +108,14 @@
+     key <AC05>	{ [         g,          G, bracketright,          ENG ]	};
+     key <AC08>	{ [         k,          K,      lstroke,    ampersand ]	};
+ 
+-    key <AB01>	{ [         y,          Y, guillemotleft,         less ]	};
++    key <AB01>	{ [         y,          Y, guillemotleft,        less ]	};
+     key <AB04>	{ [         v,          V,           at,        grave ]	};
+     key <AB05>	{ [         b,          B,    braceleft,   apostrophe ]	};
+     key <AB06>	{ [         n,          N,   braceright,   braceright ]	};
+     key <AB07>	{ [         m,          M,      section,    masculine ]	};
+     key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};
+     key <AB09>	{ [    period,      colon,      greater,     division ]	};
++    key <AB10>	{ [     minus, underscore, dead_belowdot, dead_abovedot ] };
+ };
+ 
+ // Another one Latin common layout
+diff -urN xc/programs/xkbcomp/symbols~/pc/si xc/programs/xkbcomp/symbols/pc/si
+--- xc/programs/xkbcomp/symbols~/pc/si	2003-02-04 20:38:36.000000000 -0500
++++ xc/programs/xkbcomp/symbols/pc/si	2004-03-30 17:08:27.000000000 -0500
+@@ -33,8 +33,6 @@
+     key <AC10>	{ [    ccaron,     Ccaron,   dead_acute, dead_doubleacute ] };
+     key <AC11>	{ [    cacute,     Cacute,       ssharp,   dead_caron ]	};
+ 
+-    key <AB10>	{ [     minus, underscore, dead_belowdot, dead_abovedot ] };
+-
+     key <TLDE>	{ [dead_cedilla, dead_diaeresis, notsign,     notsign ]	};
+ 
+     key <BKSL>	{ [    zcaron,     Zcaron,     currency,   dead_breve ]	};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/uz.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/uz.diff
@@ -0,0 +1,86 @@
+
+Fix Uzbek layout standard compliance.
+
+Backported from http://webcvs.freedesktop.org/xkeyboard-config/xkeyboard-config/symbols/uz?r1=1.5&r2=1.6&view=patch
+
+Index: xkb-data/symbols/uz
+===================================================================
+--- xkb-data/symbols/uz	2004/12/22 21:51:19	1.5
++++ xkb-data/symbols/uz	2007/02/25 21:38:32	1.6
+@@ -1,4 +1,4 @@
+-// $XKeyboardConfig: xkbdesc/symbols/uz,v 1.4 2004/10/09 17:26:16 svu Exp $
++// $XKeyboardConfig: xkbdesc/symbols/uz,v 1.5 2004/12/22 21:51:19 svu Exp $
+ // Uzbek standard keyboard
+ //
+ // Mashrab Kuvatov <kmashrab@uni-bremen.de>
+@@ -19,16 +19,27 @@
+ // Cyrillic_ha       to key <AD09> (english 'o'),
+ // Cyrillic_hardsign to key <AD10> (english 'p'). 
+ //
++// Feb 25, 2007. Mashrab Kuvatov <kmashrab@uni-bremen.de>
++//
++// Made cyrillic and latin variants. Default is cyrillic.
++// Cyrillic variant is standard compliant. The standard
++// was accepted by the official body of Uzbekistan. See
++// http://www.uznet.net/index.php?option=com_content&task=view&id=288&Itemid=58
++//
++// Latin variant is somewhat experimental, since there is no
++// official standard for it. It is a copy of "us" layout, where
++// apostrophe is replaced with U02BB.
++// 
+ // $XFree86: xc/programs/xkbcomp/symbols/uz,v 1.2 2003/06/21 13:01:59 pascal Exp $
+ 
+ partial default alphanumeric_keys 
+-xkb_symbols "basic" {
++xkb_symbols "cyrillic" {
+ 
+     name[Group1]= "Uzbekistan";
+ 
+     key	<AE01> {	[		1,	    exclam 	]	};
+     key	<AE02> {	[		2,        quotedbl	]	};
+-    key	<AE03> {	[		3,      numbersign	]	};
++    key	<AE03> {	[		3,      numerosign	]	};
+     key	<AE04> {	[		4,       semicolon 	]	};
+     key	<AE05> {	[		5,	   percent 	]	};
+     key	<AE06> {	[		6,	     colon	]	};
+@@ -42,8 +53,8 @@
+ 
+ key.type[group1]="ALPHABETIC";
+ 
+-    key	<AE11> {	[ Byelorussian_shortu, Byelorussian_SHORTU ]	};
+-    key	<AE12> {	[Cyrillic_ka_descender, Cyrillic_KA_descender ]	};
++    key	<AE11> {	[Cyrillic_ghe_bar, Cyrillic_GHE_bar     ]	};
++    key	<AE12> {	[Cyrillic_ha_descender, Cyrillic_HA_descender ]	};
+     key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+     key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+     key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+@@ -53,12 +64,12 @@
+     key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+     key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+     key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
+-    key	<AD09> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
+-    key	<AD10> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN    ]	};
+-    key	<AD11> {	[Cyrillic_ghe_bar, Cyrillic_GHE_bar     ]	};
+-    key	<AD12> {	[Cyrillic_ha_descender, Cyrillic_HA_descender ]	};
++    key	<AD09> {	[ Byelorussian_shortu, Byelorussian_SHORTU ]	};
++    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE      ]	};
++    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA      ]	};
++    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN ]	};
+     key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+-    key	<AC02> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
++    key	<AC02> {	[Cyrillic_ka_descender, Cyrillic_KA_descender ]	};
+     key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+     key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
+     key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+@@ -80,3 +91,11 @@
+ 
+     // End alphanumeric section
+ };
++
++partial alphanumeric_keys
++xkb_symbols "latin" {
++    include "us"
++    name[Group1]= "Uzbekistan - Latin";
++    key <AC11>  { [0x010002BB, quotedbl] };
++};
++
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/17_tr_fix_eacute.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/17_tr_fix_eacute.diff
@@ -0,0 +1,15 @@
+$Id: 099q_xkb_tr_fix_eacute.diff 189 2005-06-11 00:04:27Z branden $
+
+Index: xc/programs/xkbcomp/symbols/pc/tr
+===================================================================
+--- xc/programs/xkbcomp/symbols/pc/tr.orig	2005-10-18 19:45:33.000000000 -0400
++++ xc/programs/xkbcomp/symbols/pc/tr	2005-10-18 22:13:13.000000000 -0400
+@@ -49,7 +49,7 @@
+     key <AC10>	{ [  scedilla,   Scedilla,        acute,   dead_acute ]	};
+     key <AC11>	{ type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", 
+                   [ i,  Iabovedot,   apostrophe,   dead_caron ]	};
+-    key <TLDE>	{ [  quotedbl,  backslash,    plusminus,       degree ]	};
++    key <TLDE>	{ [  quotedbl,     eacute,    plusminus,       degree ]	};
+ 
+     key <BKSL>	{ [     comma,  semicolon,        grave,   dead_grave ]	};
+     key <LSGT>	{ [      less,    greater,          bar,    brokenbar ]	};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/revert_bz8572.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/revert_bz8572.diff
@@ -0,0 +1,63 @@
+debian/patches/revert_bz8572.diff: New patch to revert changes
+  introduced in BZ8572, they cause trouble with Ctrl-Alt-F*
+  combinations.  This seems to be an X server bug, but this
+  patch is added until this issue is fixed.  Closes: #392911.
+
+Fixed in CVS.
+
+Index: xkb-data/symbols/level3
+===================================================================
+--- xkb-data.orig/symbols/level3
++++ xkb-data/symbols/level3
+@@ -14,7 +14,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <RALT> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ partial modifier_keys
+@@ -66,7 +66,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <RCTL> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ // using the level(menu_switch) map, the Menu key temporarily
+@@ -77,7 +77,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <MENU> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ // using the level3(win_switch) map, the either Windows' logo key
+@@ -96,7 +96,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <LWIN> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ // using the level(rwin_switch) map, the right Windows' logo key
+@@ -109,7 +109,7 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <RWIN> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
+ // using the level3(enter_switch) map, the Enter key on the keypad
+@@ -121,5 +121,5 @@
+     type[Group1]="ONE_LEVEL",
+     symbols[Group1] = [ ISO_Level3_Shift ]
+     };
+-  modifier_map Mod5   { <KPEN> };
++  modifier_map Mod5   { ISO_Level3_Shift };
+ };
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/compatibility.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/compatibility.diff
@@ -0,0 +1,132 @@
+Add backward compatibility rules.
+This patch can be dropped after etch.
+
+Submitted upstream: https://bugs.freedesktop.org/show_bug.cgi?id=8321
+
+Index: xkb-data/rules/base.ml1_s.part
+===================================================================
+--- xkb-data.orig/rules/base.ml1_s.part
++++ xkb-data/rules/base.ml1_s.part
+@@ -5,5 +5,5 @@
+   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])
+-  *		*			=	pc+%l[1]%(v[1])
++ $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l[1]%(v[1])
++  *		*			=	pc(pc105)+%l[1]%(v[1])
+Index: xkb-data/rules/base.ml_s.part
+===================================================================
+--- xkb-data.orig/rules/base.ml_s.part
++++ xkb-data/rules/base.ml_s.part
+@@ -7,14 +7,14 @@
+   sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
+   sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
+   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
+-  abnt2		br			=	pc+br
++  abnt2		br			=	pc(pc105)+br
+   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)
+-  *		jp			=	pc+jp(latin)+jp:2
+-  *	   	$nonlatin		=	pc+us+%l%(v):2
+-  *		*			=	pc+%l%(v)
++ $macs		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
++ $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
++  *		jp			=	pc(pc105)+jp(latin)+jp:2
++  *	   	$nonlatin		=	pc(pc105)+us+%l%(v):2
++  *		*			=	pc(pc105)+%l%(v)
+Index: xkb-data/rules/compat/ml1_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/ml1_s.sh
++++ xkb-data/rules/compat/ml1_s.sh
+@@ -5,9 +5,9 @@
+ > $OUTFILE
+ 
+ awk '{ 
+-  printf "  *		%s			=	pc+%s%%(v[1])\n", $1, $2; 
++  printf "  *		%s			=	pc(pc105)+%s%%(v[1])\n", $1, $2; 
+ }' < layoutRename.lst >> $OUTFILE
+ 
+ awk '{ 
+-  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
++  printf "  *		%s(%s)			=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/rules/compat/ml1v1_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/ml1v1_s.sh
++++ xkb-data/rules/compat/ml1v1_s.sh
+@@ -5,5 +5,5 @@
+ > $OUTFILE
+ 
+ awk '{ 
+-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
++  printf "  *		%s		%s		=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/rules/compat/ml1v_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/ml1v_s.sh
++++ xkb-data/rules/compat/ml1v_s.sh
+@@ -5,5 +5,5 @@
+ > $OUTFILE
+ 
+ awk '{ 
+-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
++  printf "  *		%s		%s		=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/rules/compat/ml_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/ml_s.sh
++++ xkb-data/rules/compat/ml_s.sh
+@@ -5,9 +5,9 @@
+ > $OUTFILE
+ 
+ awk '{ 
+-  printf "  *		%s			=	pc+%s\n", $1, $2; 
++  printf "  *		%s			=	pc(pc105)+%s\n", $1, $2; 
+ }' < layoutRename.lst >> $OUTFILE
+ 
+ awk '{ 
+-  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
++  printf "  *		%s(%s)			=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/rules/compat/mlv_s.sh
+===================================================================
+--- xkb-data.orig/rules/compat/mlv_s.sh
++++ xkb-data/rules/compat/mlv_s.sh
+@@ -5,5 +5,5 @@
+ > $OUTFILE
+ 
+ awk '{ 
+-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
++  printf "  *		%s		%s		=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
+ }' < variantRename.lst >> $OUTFILE
+Index: xkb-data/symbols/pc
+===================================================================
+--- xkb-data.orig/symbols/pc
++++ xkb-data/symbols/pc
+@@ -143,3 +143,20 @@
+     key <RGHT> {	[  Right		]	};
+ };
+ 
++// Compatibility with previous versions
++partial hidden
++xkb_symbols "basic" {
++    include "pc"
++};
++partial hidden
++xkb_symbols "pc101" {
++    include "pc"
++};
++partial hidden
++xkb_symbols "pc102" {
++    include "pc"
++};
++partial hidden
++xkb_symbols "pc104" {
++    include "pc"
++};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/18_riscpc_keycodes.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/18_riscpc_keycodes.diff
@@ -0,0 +1,155 @@
+$Id: 300_riscpc_xkb_keycodes.diff 1169 2006-02-06 03:08:41Z dnusinow $
+
+Add support for RiscPC keycodes.  See Debian #141392.
+
+This patch by Phil Blundell.
+
+Not submitted to XFree86 upstream.
+
+Index: xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/keycodes/Makefile.am	2006-02-28 21:02:18.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/keycodes/Makefile.am	2006-02-28 21:10:50.000000000 -0500
+@@ -12,6 +12,7 @@
+ 	macintosh \
+ 	powerpcps2 \
+ 	README \
++	riscpc \
+ 	sony \
+ 	sun \
+ 	xfree86 \
+Index: xkbdata-X11R7.0-1.0.1/keycodes/riscpc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkbdata-X11R7.0-1.0.1/keycodes/riscpc	2006-02-28 21:10:15.000000000 -0500
+@@ -0,0 +1,130 @@
++// XFree86 codes for RiscPC
++
++default xkb_keycodes "xfree86" {
++    minimum = 8;
++    maximum = 127;
++
++    <TLDE>  =  24;
++    <AE01>  =  25;
++    <AE02>  =  26;
++    <AE03>  =  27;
++    <AE04>  =  28;
++    <AE05>  =  29;
++    <AE06>  =  30;
++    <AE07>  =  31;
++    <AE08>  =  32;
++    <AE09>  =  33;
++    <AE10>  =  34;
++    <AE11>  =  35;
++    <AE12>  =  36;
++    <BKSP>  =  38;
++
++    <TAB>   =  46;
++    <AD01>  =  47;
++    <AD02>  =  48;
++    <AD03>  =  49;
++    <AD04>  =  50;
++    <AD05>  =  51;
++    <AD06>  =  52;
++    <AD07>  =  53;
++    <AD08>  =  54;
++    <AD09>  =  55;
++    <AD10>  =  56;
++    <AD11>  =  57;
++    <AD12>  =  58;
++    <RTRN>  =  79;
++
++    <CAPS>  =  101;
++    <AC01>  =  68;
++    <AC02>  =  69;
++    <AC03>  =  70;
++    <AC04>  =  71;
++    <AC05>  =  72;
++    <AC06>  =  73;
++    <AC07>  =  74;
++    <AC08>  =  75;
++    <AC09>  =  76;
++    <AC10>  =  77;
++    <AC11>  =  78;
++
++    <LFSH>  =  84;
++    <BKSL>  =  37;
++    <LSGT>  =  59;
++    <AB01>  =  86;
++    <AB02>  =  87;
++    <AB03>  =  88;
++    <AB04>  =  89;
++    <AB05>  =  90;
++    <AB06>  =  91;
++    <AB07>  =  92;
++    <AB08>  =  93;
++    <AB09>  =  94;
++    <AB10>  =  95;
++    <RTSH>  =  96;
++
++    <LALT>  =  102;
++    <LCTL>  =  67;
++    <SPCE>  =  103;
++    //<RCTL>  =  54;
++    <RALT>  = 127;
++
++    <PRSC>  =  21;
++    //<SYRQ>  =  22;
++    <SCLK>  =  22;
++    //<PAUS>  =  31;
++    <BRK>   =  23;
++
++    <INS>   =  39;
++    <HOME>  =  40;
++    <PGUP>  =  41;
++    <DELE>  =  60;
++    <END>   =  61;
++    <PGDN>  =  62;
++
++    <UP>    =  97;
++    <LEFT>  = 106;
++    <DOWN>  = 107;
++    <RGHT>  = 108;
++
++    <NMLK>  =  42;
++    <KPDV>  =  43;
++    <KPMU>  =  44;
++    <KPSU>  =  45;
++
++    <KP7>   =  63;
++    <KP8>   =  64;
++    <KP9>   =  65;
++    <KPAD>  =  83;
++
++    <KP4>   =  80;
++    <KP5>   =  81;
++    <KP6>   =  82;
++
++    <KP1>   =  98;
++    <KP2>   =  99;
++    <KP3>   = 100;
++    <KPEN>  = 111;
++
++    <KP0>   = 109;
++    <KPDL>  = 110;
++
++    <ESC>     =   8;
++    <FK01>    =   9;
++    <FK02>    =  10;
++    <FK03>    =  11;
++    <FK04>    =  12;
++    <FK05>    =  13;
++    <FK06>    =  14;
++    <FK07>    =  15;
++    <FK08>    =  16;
++    <FK09>    =  17;
++    <FK10>    =  18;
++    <FK11>    =  19;
++    <FK12>    =  20;
++
++    indicator 1 = "Caps Lock";
++    indicator 2 = "Num Lock";
++    indicator 3 = "Scroll Lock";
++
++    alias <ALGR> = <RALT>;
++};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/compat-misc.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/compat-misc.diff
@@ -0,0 +1,18 @@
+
+Fix typo.
+
+Backported from http://webcvs.freedesktop.org/xkeyboard-config/xkeyboard-config/compat/misc?r1=1.3&r2=1.5&view=patch
+
+Index: xkb-data/symbols/uz
+===================================================================
+--- misc	2007/02/26 22:28:27	1.4
++++ misc	2007/02/26 23:26:17	1.5
+@@ -58,7 +58,7 @@
+     };
+ 
+     interpret Meta_R	{
+-	action = SetMods(modifiers=Alt);
++	action = SetMods(modifiers=Meta);
+     };
+ 
+     // Sets the "Super" virtual modifier
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/04_czech_include_location.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/04_czech_include_location.diff
@@ -0,0 +1,31 @@
+Index: xkbdata-X11R7.0-1.0.1/symbols/pc/cz
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/symbols/pc/cz	2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/symbols/pc/cz	2006-02-26 20:21:39.000000000 -0500
+@@ -78,7 +78,7 @@
+ 
+ // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+ xkb_symbols "bksl" {
+-    include "cz(basic)"
++    include "pc/cz(basic)"
+     name[Group1]= "Czechia - With <\|> key";
+ 
+     key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+@@ -91,7 +91,7 @@
+     // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
+     // 2001 by Kamil Toman <ktoman@email.cz>
+     
+-    include "cz(basic)"
++    include "pc/cz(basic)"
+     name[Group1]= "Czechia - qwerty";
+ 
+     key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
+@@ -100,7 +100,7 @@
+ 
+ // Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+ xkb_symbols "qwerty_bksl" {
+-    include "cz(qwerty)"
++    include "pc/cz(qwerty)"
+ 
+     name[Group1]= "Czechia - qwerty, extended Backslash";
+ 
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/19_sun_loads_srvr_ctrl.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/19_sun_loads_srvr_ctrl.diff
@@ -0,0 +1,65 @@
+$Id: 101b_xkb_sun_loads_srvr_ctrl.diff 395 2005-07-22 21:34:44Z dnusinow $
+
+This patch by Denis Barbier
+
+Add support for standard Ctrl+Alt sequences to Sun keyboards.
+Closes: #236086, #274607, #286268
+
+Not submitted to XFree86.
+
+diff -ruN xc-old/programs/xkbcomp/symbols/sun/se xc/programs/xkbcomp/symbols/sun/se
+--- xc-old/programs/xkbcomp/symbols/sun/se	2004-04-23 19:54:56.000000000 +0000
++++ xc/programs/xkbcomp/symbols/sun/se	2004-10-27 05:00:16.426625176 +0000
+@@ -93,6 +93,9 @@
+     key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
+     // End "four keys up on the right"
+ 
++    // Override these settings by default xfree86 Ctrl+Alt combinations
++    include "srvr_ctrl(xfree86)"
++
+     // Begin modifier mappings
+     modifier_map Shift  { Shift_R };
+     modifier_map Mod1	{ Meta_L, Meta_R };
+@@ -182,6 +185,9 @@
+     key <KPDL> { [  KP_Delete,	KP_Decimal ]				};
+     // End "Keypad" section, 
+ 
++    // Override these settings by default xfree86 Ctrl+Alt combinations
++    include "srvr_ctrl(xfree86)"
++
+     // Begin modifier mappings
+     modifier_map Shift	{ Shift_R };
+     modifier_map Mod1	{ Alt_L };
+diff -ruN xc-old/programs/xkbcomp/symbols/sun/us xc/programs/xkbcomp/symbols/sun/us
+--- xc-old/programs/xkbcomp/symbols/sun/us	2004-04-23 19:54:56.000000000 +0000
++++ xc/programs/xkbcomp/symbols/sun/us	2004-10-27 05:00:16.427625024 +0000
+@@ -99,6 +99,9 @@
+     key <KPDL> { [  KP_Delete,	KP_Decimal ]	};
+     // End "Keypad" section
+ 
++    // Override these settings by default xfree86 Ctrl+Alt combinations
++    include "srvr_ctrl(xfree86)"
++
+ 
+     // begin modifier mappings
+     modifier_map Shift 	{ Shift_R };
+@@ -217,6 +220,9 @@
+     key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
+     key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
+ 
++    // Override these settings by default xfree86 Ctrl+Alt combinations
++    include "srvr_ctrl(xfree86)"
++
+     // begin modifier mappings
+     modifier_map Shift  { Shift_R };
+     modifier_map Mod1	{ Alt_L };
+@@ -323,6 +329,9 @@
+     key <CUT>  { [ SunCut      ],      [ F20           ]       };
+     key <HELP> { [ Help                ]       };
+ 
++    // Override these settings by default xfree86 Ctrl+Alt combinations
++    include "srvr_ctrl(xfree86)"
++
+     // begin modifier mappings
+     modifier_map Shift { Shift_R };
+     modifier_map Mod1  { Meta_L, Meta_R };
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/14_dead_diaresis.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/14_dead_diaresis.diff
@@ -0,0 +1,21 @@
+$Id: 094_xkb_fix_dead_diaresis.diff 1027 2006-01-06 23:19:46Z barbier $
+
+Fix unknown keysym.
+
+This patch by Denis Barbier.
+
+Not submitted upstream to X.Org.
+
+Index: xorg-x11/xc/programs/xkbcomp/symbols/pc/de
+===================================================================
+--- xorg-x11.orig/xc/programs/xkbcomp/symbols/pc/de	2006-01-06 23:06:44.000000000 +0100
++++ xorg-x11/xc/programs/xkbcomp/symbols/pc/de	2006-01-06 23:11:32.000000000 +0100
+@@ -140,7 +140,7 @@
+     key <AE12> { [ less, greater, dead_grave ] };
+ 
+     key <AD01> { [ udiaeresis, Udiaeresis, at ] };
+-    key <AD02> { [ comma, semicolon, dead_diaresis ] };
++    key <AD02> { [ comma, semicolon, dead_diaeresis ] };
+     key <AD03> { [ period, colon ] };
+     key <AD08> { [ c, C, copyright, Cacute ] };
+     key <AD09> { [ t, T, trademark ] };
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/bz8668.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/bz8668.diff
@@ -0,0 +1,53 @@
+Fixed in CVS.
+
+Index: xkb-data/symbols/macintosh_vndr/us
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/us
++++ xkb-data/symbols/macintosh_vndr/us
+@@ -22,9 +22,7 @@
+     key <AE10> {	[	  0,	parenright	]	};
+     key <AE11> {	[     minus,	underscore	]	};
+     key <AE12> {	[     equal,	plus		]	};
+-    key <BKSP> {	[ BackSpace			]	};
+ 
+-    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
+     key <AD01> {	[	  q,	Q 		]	};
+     key <AD02> {	[	  w,	W		]	};
+     key <AD03> {	[	  e,	E		]	};
+@@ -39,7 +37,6 @@
+     key <AD12> {	[ bracketright,	braceright	]	};
+     key <BKSL> {	[ backslash,	bar		]	};
+ 
+-    key <CAPS> {	[	Caps_Lock		]	};
+     key <AC01> {	[	  a,	A 		]	};
+     key <AC02> {	[	  s,	S		]	};
+     key <AC03> {	[	  d,	D		]	};
+@@ -51,7 +48,6 @@
+     key <AC09> {	[	  l,	L		]	};
+     key <AC10> {	[ semicolon,	colon		]	};
+     key <AC11> {	[ quoteright,	quotedbl	]	};
+-    key <RTRN> {	[ Return			]	};
+ 
+     key <AB01> {	[	  z,	Z 		]	};
+     key <AB02> {	[	  x,	X		]	};
+@@ -67,7 +63,6 @@
+     key <SPCE> {	[  space			]	};
+     // End alphanumeric section
+ 
+-    key <NMLK> {	[  Num_Lock,	Pointer_EnableKeys	]	};
+ 
+     include "keypad"
+ 
+@@ -111,6 +106,12 @@
+     key <RGHT> {	[  Right	]	};
+     // End "Editing" section
+ 
++    key <BKSP> {	[ BackSpace			]	};
++    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
++    key <RTRN> {	[ Return	]	};
++    key <CAPS> {	[ Caps_Lock	]	};
++    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
++
+     // Begin "Modifier" section
+     key <LFSH> {	[  Shift_L	]	};
+     key <RTSH> {	[  Shift_R	]	};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/12_implement_compose:caps.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/12_implement_compose:caps.diff
@@ -0,0 +1,65 @@
+$Id: 091_xkb_implement_compose:caps.diff 1169 2006-02-06 03:08:41Z dnusinow $
+
+Implement option to place Compose key ("Multi_key") on <CAPS> key.  See
+Debian #251310 #345796
+
+This patch by Andrew Suffield and Branden Robinson.
+
+Not submitted to XFree86.
+
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg	2006-02-26 21:55:08.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg	2006-02-26 21:58:03.000000000 -0500
+@@ -940,6 +940,7 @@
+   compose:rwin		=	+compose(rwin)
+   compose:menu		=	+compose(menu)
+   compose:rctrl		=	+compose(rctrl)
++  compose:caps     =   +compose(caps)
+   srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
+   eurosign:e		=	+eurosign(e)
+   eurosign:5		=	+eurosign(5)
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.lst
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.lst	2006-02-26 21:55:08.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.lst	2006-02-26 21:58:03.000000000 -0500
+@@ -403,6 +403,7 @@
+   compose:rwin         Right Win-key is Compose.
+   compose:menu         Menu is Compose.
+   compose:rctrl        Right Ctrl is Compose.
++  compose:caps     Caps Lock is Compose
+   compat               Miscellaneous compatibility options
+   numpad:microsoft     Shift with numpad keys works as in MS Windows.
+   srvrkeys:none        Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.xml
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.xml	2006-02-26 21:55:08.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.xml	2006-02-26 21:58:03.000000000 -0500
+@@ -7934,6 +7934,14 @@
+           <description xml:lang="vi">Thêm ký hiệu đồng Euro vào phím 2.</description>
+         </configItem>
+       </option>
++      <option>
++        <configItem>
++          <name>compose:caps</name>
++          <description>Caps Lock is Compose</description>
++          <description xml:lang="bg">Клавиша Caps Lock фунцкионира като Compose</description>
++          <description xml:lang="ru">Клавиша Caps Lock соответствует клавише Compose</description>
++        </configItem>
++      </option>
+     </group>
+   </optionList>
+ </xkbConfigRegistry>
+Index: xkbdata-X11R7.0-1.0.1/symbols/compose
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/symbols/compose	2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/symbols/compose	2006-02-26 21:58:03.000000000 -0500
+@@ -22,3 +22,8 @@
+ xkb_symbols "rctrl" {
+     key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
+ };
++
++partial modifier_keys
++xkb_symbols "caps" {
++    key <CAPS>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
++};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/03_drop_rules_xorg_duplicates.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/03_drop_rules_xorg_duplicates.diff
@@ -0,0 +1,64 @@
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg	2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg	2006-02-26 20:18:18.000000000 -0500
+@@ -943,59 +943,6 @@
+   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)
+ 
+ ! option	=	compat
+   grp_led:num		=	+lednum(group_lock)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/obsolete_merged-upstream/10_ralt_switch_multikey.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/obsolete_merged-upstream/10_ralt_switch_multikey.diff
@@ -0,0 +1,63 @@
+The lv3:ralt_switch_multikey option was available in previous releases
+and has even been the default, so keep it.
+
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg	2006-02-26 21:53:38.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg	2006-02-26 21:55:08.000000000 -0500
+@@ -915,6 +915,7 @@
+   lv3:switch		=	+level3(switch)
+   lv3:ralt_switch	=	+level3(ralt_switch)
+   lv3:lalt_switch	=	+level3(lalt_switch)
++  lv3:ralt_switch_multikey =	+level3(ralt_switch_multikey)
+   lv3:alt_switch	=	+level3(alt_switch)
+   lv3:menu_switch	=	+level3(menu_switch)
+   lv3:win_switch	=	+level3(win_switch)
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.lst
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.lst	2006-02-26 21:51:14.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.lst	2006-02-26 21:55:08.000000000 -0500
+@@ -371,6 +371,7 @@
+   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
+   ctrl                 Control key position
+   ctrl:nocaps          Make CapsLock an additional Control.
+   ctrl:swapcaps        Swap Control and CapsLock.
+Index: xkbdata-X11R7.0-1.0.1/rules/xorg.xml
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/rules/xorg.xml	2006-02-26 21:51:14.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/rules/xorg.xml	2006-02-26 21:55:08.000000000 -0500
+@@ -7356,6 +7356,12 @@
+           <description xml:lang="vi">Nhấn phím Alt bên phải để chọn ngôn ngữ thứ 3.</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>
+     </group>
+     <group allowMultipleSelection="false">
+       <!-- Tweaking the position of the "Ctrl" key -->
+Index: xkbdata-X11R7.0-1.0.1/symbols/level3
+===================================================================
+--- xkbdata-X11R7.0-1.0.1.orig/symbols/level3	2006-01-26 21:46:48.000000000 -0500
++++ xkbdata-X11R7.0-1.0.1/symbols/level3	2006-02-26 21:55:08.000000000 -0500
+@@ -18,6 +18,14 @@
+   modifier_map Mod5   { ISO_Level3_Shift };
+ };
+ 
++partial modifier_keys
++xkb_symbols "ralt_switch_multikey" {
++  key <RALT> {
++    type[Group1]="TWO_LEVEL",
++    symbols[Group1] = [ ISO_Level3_Shift, Multi_key ]
++    };
++};
++
+ // using the level(alt_switch) map, either Alt key temporarily chooses
+ // the third shift level.  (Mostly be used to imitate Mac OS functionality.)
+ partial modifier_keys
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/send-upstream/001_keypad_comma.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/send-upstream/001_keypad_comma.diff
@@ -0,0 +1,29 @@
+Index: xkb-data/rules/base.o_s.part
+===================================================================
+--- xkb-data.orig/rules/base.o_s.part	2007-09-18 17:03:25.000000000 +0200
++++ xkb-data/rules/base.o_s.part	2007-09-18 17:03:37.000000000 +0200
+@@ -66,6 +66,7 @@
+   keypad:legacy_wang         =	+keypad(legacy_wang)
+   keypad:oss_wang         =	+keypad(oss_wang)
+   keypad:future_wang         =	+keypad(future_wang)
++  keypad:comma          =       +keypad(comma)
+   nbsp:none             =	+nbsp(none)
+   nbsp:level2           =	+nbsp(level2)
+   nbsp:level3           =	+nbsp(level3)
+Index: xkb-data/rules/base.xml.in
+===================================================================
+--- xkb-data.orig/rules/base.xml.in	2007-09-18 17:03:25.000000000 +0200
++++ xkb-data/rules/base.xml.in	2007-09-18 17:03:37.000000000 +0200
+@@ -3618,6 +3618,12 @@
+       </option>
+       <option>
+         <configItem>
++          <name>keypad:comma</name>
++          <_description>Force standard comma keypad</_description>
++       </configItem>
++      </option>
++      <option>
++        <configItem>
+           <name>keypad:oss</name>
+           <_description>Keypad with unicode additions (arrows and math operators)</_description>
+        </configItem>
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/send-upstream/002_add_asus6000.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/send-upstream/002_add_asus6000.diff
@@ -0,0 +1,1303 @@
+Index: xkb-data/rules/base
+===================================================================
+--- xkb-data.orig/rules/base	2007-07-21 20:08:12.000000000 +0200
++++ xkb-data/rules/base	2007-07-21 20:08:33.000000000 +0200
+@@ -797,6 +797,7 @@
+   grp:lctrl_toggle	=	+group(lctrl_toggle)
+   grp:rctrl_toggle	=	+group(rctrl_toggle)
+   grp:lalt_toggle	=	+group(lalt_toggle)
++  grp:sclk_toggle	=	+group(sclk_toggle)
+   lv3:switch		=	+level3(switch)
+   lv3:ralt_switch	=	+level3(ralt_switch)
+   lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
+@@ -807,6 +808,7 @@
+   lv3:win_switch	=	+level3(win_switch)
+   lv3:lwin_switch	=	+level3(lwin_switch)
+   lv3:rwin_switch	=	+level3(rwin_switch)
++  lv3:enter_switch	=	+level3(enter_switch)
+   caps:capslock		=	+capslock(capslock)
+   caps:shiftlock	=	+capslock(shiftlock)
+   caps:grouplock	=	+capslock(grouplock)
+@@ -830,7 +832,7 @@
+   keypad:legacy_wang         =	+keypad(legacy_wang)
+   keypad:oss_wang         =	+keypad(oss_wang)
+   keypad:future_wang         =	+keypad(future_wang)
+-  keypad:comma         =       +keypad(comma)
++  keypad:comma          =       +keypad(comma)
+   nbsp:none             =	+nbsp(none)
+   nbsp:level2           =	+nbsp(level2)
+   nbsp:level3           =	+nbsp(level3)
+Index: xkb-data/rules/base.xml.in
+===================================================================
+--- xkb-data.orig/rules/base.xml.in	2007-07-21 20:08:12.000000000 +0200
++++ xkb-data/rules/base.xml.in	2007-07-21 20:08:12.000000000 +0200
+@@ -138,6 +138,12 @@
+     <model>
+       <configItem>
+         <name>azonaRF2300</name>
++        <_description>Asus A6000 series Keyboard</_description>
++      </configItem>
++    </model>
++    <model>
++      <configItem>
++        <name>asus_6000</name>
+         <_description>Azona RF2300 wireless Internet Keyboard</_description>
+         <vendor>Azona</vendor>
+       </configItem>
+Index: xkb-data/symbols/inet
+===================================================================
+--- xkb-data.orig/symbols/inet	2007-07-21 20:08:12.000000000 +0200
++++ xkb-data/symbols/inet	2007-07-21 20:08:12.000000000 +0200
+@@ -229,6 +229,22 @@
+     key <I74>   {       [ XF86Launch4           ]       };
+ };
+ 
++// Asus
++
++// Asus A6000 series Keyboard
++partial alphanumeric_keys
++xkb_symbols "asus_6000" {
++  key <I20>   {       [ XF86AudioMute         ]       };
++  key <I2E>   {       [ XF86AudioLowerVolume  ]       };
++  key <I30>   {       [ XF86AudioRaiseVolume  ]       };
++  key <I6C>   {       [ XF86Mail              ]       };
++  key <I32>   {       [ XF86WWW               ]       };
++  key <I10>   {       [ XF86AudioPrev         ]       };
++  key <I19>   {       [ XF86AudioNext         ]       };
++  key <I24>   {       [ XF86AudioStop         ]       };
++  key <I22>   {       [ XF86AudioPlay         ]       };
++};
++
+ // Azona
+ 
+ // Azona RF2300 wireless Internet Keyboard
+Index: xkb-data/symbols/symbols.dir
+===================================================================
+--- xkb-data.orig/symbols/symbols.dir	2007-07-21 20:08:04.000000000 +0200
++++ xkb-data/symbols/symbols.dir	2007-07-21 20:08:18.000000000 +0200
+@@ -3,394 +3,616 @@
+ --p----- a------- af(ps)
+ --p----- a------- af(uz)
+ -dp----- a------- al(basic)
+--dp----- a------- ba(basic)
+---p----- a------- ba(us)
+---p----- a------- ba(alternatequotes)
+---p----- a------- ba(unicode)
+---p----- a------- ba(unicodeus)
++--p----- -m------ altwin(alt_super_win)
++--p----- -m------ altwin(hyper_win)
++--p----- -m------ altwin(left_meta_win)
++--p----- -m------ altwin(menu)
++--p----- -m------ altwin(meta_alt)
++--p----- -m------ altwin(meta_win)
++--p----- -m------ altwin(super_win)
++--p----- -m------ altwin(swap_lalt_lwin)
+ -dp----- a------- am(basic)
+--------- -------- am(phonetic)
+---p----- a------- am(phonetic-alt)
+ --p----- a------- am(eastern)
+---p----- a------- am(western)
+ --p----- a------- am(eastern-alt)
++-------- -------- am(phonetic)
++--p----- a------- am(western)
++--p----- a------- ara(azerty)
++--p----- a------- ara(azerty_digits)
++-dp----- a------- ara(basic)
++--p----- a------- ara(buckwalter)
++--p----- a------- ara(digits)
++--p----- a------- ara(qwerty)
++--p----- a------- ara(qwerty_digits)
++--p----- a------- az(cyrillic)
++-dp----- a------- az(latin)
++--p----- a------- ba(alternatequotes)
++-dp----- a------- ba(basic)
++--p----- a------- ba(unicode)
++--p----- a------- ba(unicodeus)
++--p----- a------- ba(us)
+ -dp----- a------- bd(basic)
+ -------- -------- bd(probhat)
++--p----- a------- be(Sundeadkeys)
+ -dp----- a------- be(basic)
+ --p----- a------- be(iso-alternate)
+---p----- a------- be(sundeadkeys)
+---p----- a------- be(Sundeadkeys)
+ --p----- a------- be(nodeadkeys)
++--p----- a------- be(sundeadkeys)
+ --p----- a------- be(wang)
+ -dp----- a------- bg(bds)
+ --p----- a------- bg(phonetic)
++-d------ -------- br(abnt2)
++--p----- a------- br(nodeadkeys)
++-dp----- a------- bt(basic)
++-dp----- a------- by(basic)
++--p----- a------- by(latin)
++--p----- a------- by(winkeys)
+ -dp----- -------- ca(fr)
+ -------- -------- ca(fr-dvorak)
+ --p----- -------- ca(fr-legacy)
++-------- a------- ca(ike)
+ --p----- -------- ca(multi)
+ --p----- -------- ca(multi-2gr)
+--------- a------- ca(ike)
+ --p----- -------- ca(multix)
+--dp----- a------- az(latin)
+---p----- a------- az(cyrillic)
++hdp----- -m------ capslock(capslock)
++h-p----- -m------ capslock(grouplock)
++h-p----- -m------ capslock(shiftlock)
+ -dp----- a------- cd(basic)
+--d------ -------- br(abnt2)
+---p----- a------- br(nodeadkeys)
+ -dp----- a------- ch(basic)
+ --p----- a------- ch(de)
+ --p----- a------- ch(de_Sundeadkeys)
+---p----- a------- ch(de_sundeadkeys)
++--p----- a------- ch(de_mac)
+ --p----- a------- ch(de_nodeadkeys)
++--p----- a------- ch(de_sundeadkeys)
+ --p----- a------- ch(fr)
+ --p----- a------- ch(fr_Sundeadkeys)
+---p----- a------- ch(fr_sundeadkeys)
+---p----- a------- ch(fr_nodeadkeys)
+---p----- a------- ch(de_mac)
+ --p----- a------- ch(fr_mac)
+--dp----- a------- bt(basic)
+--dp----- a------- by(basic)
+---p----- a------- by(winkeys)
+---p----- a------- by(latin)
+--d------ -------- de(basic)
+---p----- a------- de(nodeadkeys)
+---p----- a------- de(deadgraveacute)
+---p----- a------- de(deadacute)
+---p----- a------- de(ro)
+---p----- a------- de(ro_nodeadkeys)
+---p----- a------- de(dvorak)
+---p----- a------- de(Sundeadkeys)
+---p----- a------- de(sundeadkeys)
+---p----- a------- de(neo)
+---p----- a------- de(mac)
+---p----- a------- de(mac_nodeadkeys)
++--p----- a------- ch(fr_nodeadkeys)
++--p----- a------- ch(fr_sundeadkeys)
++--p----- -m------ compose(caps)
++--p----- -m------ compose(lwin)
++--p----- -m------ compose(menu)
++--p----- -m------ compose(ralt)
++--p----- -m------ compose(rctrl)
++--p----- -m------ compose(rwin)
++-------- -------- cs(alternatequotes)
+ -dp----- a------- cs(basic)
+---p----- a------- cs(latin)
+---p----- a------- cs(yz)
+ h-p----- a------- cs(common)
+ h-p----- a------- cs(cyralpha)
+ h-p----- a------- cs(latalpha)
+-h-p----- a------- cs(twoletter)
+-h-p----- a------- cs(level3)
++--p----- a------- cs(latin)
++-------- -------- cs(latinalternatequotes)
+ --p----- a------- cs(latinunicode)
+---p----- a------- cs(latinyz)
+ --p----- a------- cs(latinunicodeyz)
+--------- -------- cs(alternatequotes)
+--------- -------- cs(latinalternatequotes)
+--dp----- a------- dk(basic)
+---p----- a------- dk(nodeadkeys)
+---p----- a------- dk(mac)
+---p----- a------- dk(mac_nodeadkeys)
++--p----- a------- cs(latinyz)
++h-p----- a------- cs(level3)
++h-p----- a------- cs(twoletter)
++--p----- a------- cs(yz)
++--p----- -m------ ctrl(ctrl_aa)
++--p----- -m------ ctrl(ctrl_ac)
++--p----- -m------ ctrl(ctrl_ra)
++--p----- -m------ ctrl(nocaps)
++--p----- -m------ ctrl(swapcaps)
+ -dp----- a------- cz(basic)
+ -------- -------- cz(bksl)
+ --p----- a------- cz(qwerty)
+ -------- -------- cz(qwerty_bksl)
++--p----- a------- de(Sundeadkeys)
++-d------ -------- de(basic)
++--p----- a------- de(deadacute)
++--p----- a------- de(deadgraveacute)
++--p----- a------- de(dvorak)
++--p----- a------- de(mac)
++--p----- a------- de(mac_nodeadkeys)
++--p----- a------- de(neo)
++--p----- a------- de(nodeadkeys)
++--p----- a------- de(ro)
++--p----- a------- de(ro_nodeadkeys)
++--p----- a------- de(sundeadkeys)
++-d------ -------- digital_vndr/lk(common)
++-------- -------- digital_vndr/lk(lk401)
++-------- -------- digital_vndr/pc(pc)
++-------- -------- digital_vndr/pc(pc104)
++-------- -------- digital_vndr/us(lk44x)
++-------- -------- digital_vndr/us(pc104)
++-------- -------- digital_vndr/us(pcxal)
++-------- -------- digital_vndr/us(pcxalaa)
++-------- -------- digital_vndr/us(pcxalfa)
++-------- -------- digital_vndr/us(pcxalga)
++-------- -------- digital_vndr/us(pcxalka)
++-------- -------- digital_vndr/us(unix)
++-------- -------- digital_vndr/us(us)
++-------- -------- digital_vndr/us(vt105)
++-------- -------- digital_vndr/us(vt105-dp)
++-------- -------- digital_vndr/us(vt105-tw)
++-------- -------- digital_vndr/us(vt108)
++-------- -------- digital_vndr/us(vt108-dp)
++-------- -------- digital_vndr/us(vt108-tw)
++-------- -------- digital_vndr/vt(vt105)
++-------- -------- digital_vndr/vt(vt108)
++-dp----- a------- dk(basic)
++--p----- a------- dk(mac)
++--p----- a------- dk(mac_nodeadkeys)
++--p----- a------- dk(nodeadkeys)
+ -dp----- a------- ee(basic)
+---p----- a------- ee(nodeadkeys)
+ --p----- a------- ee(dvorak)
+--dp----- a------- es(basic)
++--p----- a------- ee(nodeadkeys)
++-dp----- a------- epo(basic)
+ --p----- a------- es(Sundeadkeys)
+---p----- a------- es(sundeadkeys)
+---p----- a------- es(nodeadkeys)
+---p----- a------- es(dvorak)
++-dp----- a------- es(basic)
+ --p----- a------- es(cat)
++--p----- a------- es(dvorak)
+ --p----- a------- es(mac)
++--p----- a------- es(nodeadkeys)
++--p----- a------- es(sundeadkeys)
++--p----- -------- eurosign(2)
++--p----- -------- eurosign(5)
++--p----- -------- eurosign(e)
+ -dp----- a------- fi(basic)
+ --p----- a------- fi(fi)
++--p----- a------- fi(kotoistus)
++--p----- a------- fi(mac)
+ --p----- a------- fi(nodeadkeys)
+ -------- -------- fi(smi)
+--------- -------- fi(kotoistus)
+---p----- a------- fi(mac)
+--dp----- a------- gb(basic)
+---p----- a------- gb(intl)
+---p----- a------- gb(dvorak)
+---p----- a------- gb(mac)
+ -dp----- a------- fo(basic)
+ --p----- a------- fo(nodeadkeys)
+--dp----- a------- ge(basic)
+---p----- a------- ge(qwerty)
+---p----- a------- ge(azerty_tskapo)
+---p----- a------- ge(ergonomic)
+---p----- a------- ge(mess)
+---p----- a------- ge(ru)
+--dp----- a------- fr(basic)
+ --p----- a------- fr(Sundeadkeys)
+---p----- a------- fr(sundeadkeys)
+---p----- a------- fr(nodeadkeys)
+---p----- a------- fr(oss)
+---p----- a------- fr(oss_latin9)
+---p----- a------- fr(oss_Sundeadkeys)
+---p----- a------- fr(oss_sundeadkeys)
+---p----- a------- fr(oss_nodeadkeys)
++-dp----- a------- fr(basic)
++--p----- a------- fr(dvorak)
+ --p----- a------- fr(latin9)
+ --p----- a------- fr(latin9_Sundeadkeys)
+---p----- a------- fr(latin9_sundeadkeys)
+ --p----- a------- fr(latin9_nodeadkeys)
+---p----- a------- fr(bepo)
+---p----- a------- fr(bepo_latin9)
+---p----- a------- fr(dvorak)
++--p----- a------- fr(latin9_sundeadkeys)
+ --p----- a------- fr(mac)
+--dp----- a------- gh(basic)
++--p----- a------- fr(nodeadkeys)
++--p----- a------- fr(oss)
++--p----- a------- fr(oss_Sundeadkeys)
++--p----- a------- fr(oss_latin9)
++--p----- a------- fr(oss_nodeadkeys)
++--p----- a------- fr(oss_sundeadkeys)
++--p----- a------- fr(sundeadkeys)
++-------- -------- fujitsu_vndr/jp
++-------- -------- fujitsu_vndr/us
++-dp----- a------- gb(basic)
++--p----- a------- gb(dvorak)
++--p----- a------- gb(intl)
++--p----- a------- gb(mac)
++-dp----- a------- ge(basic)
++--p----- a------- ge(la)
++--p----- a------- ge(ru)
+ --p----- a------- gh(akan)
+---p----- a------- gh(ga)
++-dp----- a------- gh(basic)
+ --p----- a------- gh(ewe)
+ --p----- a------- gh(fula)
+---p----- a------- gh(hausa)
++--p----- a------- gh(ga)
+ --p----- a------- gh(generic)
+--dp----- a---g--- gr(basic)
++--p----- a------- gh(hausa)
+ h-p----- a---g--- gr(bare)
++-dp----- a---g--- gr(basic)
+ --p----- a---g--- gr(extended)
+---p----- a---g--- gr(polytonic)
+ --p----- a---g--- gr(nodeadkeys)
+--dp----- a------- ie(basic)
+---p----- a------- ie(CloGaelach)
+---p----- a------- ie(UnicodeExpert)
+---p----- a------- ie(ogam)
+---p----- a------- ie(ogam_is434)
+--dp----- a------- hr(basic)
+---p----- a------- hr(us)
++--p----- a---g--- gr(polytonic)
++--p----- -m------ group(alt_caps_toggle)
++--p----- -m------ group(alt_shift_toggle)
++--p----- -m------ group(alts_toggle)
++--p----- -m------ group(caps_toggle)
++--p----- -m------ group(ctrl_alt_toggle)
++--p----- -m------ group(ctrl_shift_toggle)
++--p----- -m------ group(ctrls_toggle)
++--p----- -m------ group(lalt_toggle)
++--p----- -m------ group(lctrl_toggle)
++--p----- -m------ group(lshift_toggle)
++--p----- -m------ group(lswitch)
++--p----- -m------ group(lwin_switch)
++--p----- -m------ group(lwin_toggle)
++--p----- -m------ group(menu_toggle)
++--p----- -m------ group(rctrl_switch)
++--p----- -m------ group(rctrl_toggle)
++--p----- -m------ group(rshift_toggle)
++--p----- -m------ group(rwin_switch)
++--p----- -m------ group(rwin_toggle)
++--p----- -m------ group(sclk_toggle)
++--p----- -m------ group(shift_caps_toggle)
++--p----- -m------ group(shifts_toggle)
++--p----- -m------ group(switch)
++--p----- -m------ group(toggle)
++--p----- -m------ group(win_switch)
++-------- -------- hp_vndr/us(hil)
+ --p----- a------- hr(alternatequotes)
++-dp----- a------- hr(basic)
+ --p----- a------- hr(unicode)
+ --p----- a------- hr(unicodeus)
+--dp----- -------- hu(basic)
+---p----- -------- hu(standard)
+---p----- -------- hu(nodeadkeys)
+---p----- -------- hu(qwerty)
+---p----- -------- hu(101_qwertz_comma_dead)
+---p----- -------- hu(101_qwertz_comma_nodead)
+---p----- -------- hu(101_qwertz_dot_dead)
+---p----- -------- hu(101_qwertz_dot_nodead)
++--p----- a------- hr(us)
+ --p----- -------- hu(101_qwerty_comma_dead)
+ --p----- -------- hu(101_qwerty_comma_nodead)
+ --p----- -------- hu(101_qwerty_dot_dead)
+ --p----- -------- hu(101_qwerty_dot_nodead)
+---p----- -------- hu(102_qwertz_comma_dead)
+---p----- -------- hu(102_qwertz_comma_nodead)
+---p----- -------- hu(102_qwertz_dot_dead)
+---p----- -------- hu(102_qwertz_dot_nodead)
++--p----- -------- hu(101_qwertz_comma_dead)
++--p----- -------- hu(101_qwertz_comma_nodead)
++--p----- -------- hu(101_qwertz_dot_dead)
++--p----- -------- hu(101_qwertz_dot_nodead)
+ --p----- -------- hu(102_qwerty_comma_dead)
+ --p----- -------- hu(102_qwerty_comma_nodead)
+ --p----- -------- hu(102_qwerty_dot_dead)
+ --p----- -------- hu(102_qwerty_dot_nodead)
+-h-p----- a------- hu(def_102)
++--p----- -------- hu(102_qwertz_comma_dead)
++--p----- -------- hu(102_qwertz_comma_nodead)
++--p----- -------- hu(102_qwertz_dot_dead)
++--p----- -------- hu(102_qwertz_dot_nodead)
++-dp----- -------- hu(basic)
+ h-p----- a------- hu(def_101)
+-h-p----- a------- hu(def_qwertz)
+-h-p----- a------- hu(def_qwerty)
+-h-p----- --k----- hu(def_dot)
++h-p----- a------- hu(def_102)
++h-p----- a------- hu(def_common)
+ h-p----- a------- hu(def_dead)
++h-p----- --k----- hu(def_dot)
+ h-p----- a------- hu(def_nodead)
+-h-p----- a------- hu(def_common)
++h-p----- a------- hu(def_qwerty)
++h-p----- a------- hu(def_qwertz)
++--p----- -------- hu(nodeadkeys)
++--p----- -------- hu(qwerty)
++--p----- -------- hu(standard)
++--p----- a------- ie(CloGaelach)
++--p----- a------- ie(UnicodeExpert)
++-dp----- a------- ie(basic)
++--p----- a------- ie(ogam)
++--p----- a------- ie(ogam_is434)
+ -dp----- a------- il(basic)
+ --p----- a------- il(lyx)
+ --p----- a------- il(phonetic)
+---p----- a------- il(biblical)
+--dp----- a------- in(deva)
+ --p----- a------- in(ben)
+ -------- -------- in(ben_probhat)
++-dp----- a------- in(deva)
+ --p----- a------- in(guj)
++--p----- a------- in(guru)
+ --p----- a------- in(kan)
+ --p----- a------- in(mal)
+ --p----- a------- in(ori)
+ --p----- a------- in(tam)
+---p----- a------- in(tam_unicode)
+---p----- a------- in(tam_TSCII)
+ --p----- a------- in(tam_TAB)
++--p----- a------- in(tam_TSCII)
++--p----- a------- in(tam_unicode)
+ --p----- a------- in(tel)
+ --p----- a------- in(urd)
+---p----- a------- in(guru)
++--p----- a------- inet(a4_rfkb23)
++--p----- a------- inet(a4techKB21)
++--p----- a------- inet(a4techKBS8)
++--p----- a------- inet(acer_c300)
++--p----- a------- inet(acer_ferrari4k)
++-------- -------- inet(acer_tm_800)
++--p----- a------- inet(acpi)
++--p----- a------- inet(airkey)
++--p----- -------- inet(apple)
++--p----- a------- inet(armada)
++--p----- a------- inet(azonaRF2300)
++--p----- a------- inet(brother)
++--p----- a------- inet(btc5090)
++--p----- a------- inet(btc5113rf)
++--p----- a------- inet(btc5126t)
++--p----- a------- inet(btc9000)
++--p----- a------- inet(btc9000a)
++-------- -------- inet(btc9001ah)
++--p----- a------- inet(btc9019u)
++--p----- a------- inet(cherryblue)
++--p----- a------- inet(cherrybluea)
++--p----- a------- inet(cherryblueb)
++--p----- a------- inet(cherrycyboard)
++--p----- a------- inet(chicony)
++--p----- a------- inet(chicony9885)
++--p----- a------- inet(compaqeak8)
++--p----- a------- inet(compaqik13)
++--p----- a------- inet(compaqik18)
++--p----- a------- inet(compaqik7)
++--p----- a------- inet(cymotionlinux)
++--p----- a------- inet(dell)
++--p----- a------- inet(dellusbmm)
++--p----- a------- inet(dexxa)
++--p----- a------- inet(diamond)
++--p----- a------- inet(dinovo)
++--p----- a------- inet(dtk2000)
++--p----- a------- inet(emachines)
++--p----- a------- inet(ennyah_dkb1008)
++--p----- a------- inet(evdev)
++--p----- a------- inet(genius)
++--p----- a------- inet(geniuscomfy)
++--p----- a------- inet(geniuscomfy2)
++--p----- a------- inet(geniuskb19e)
++--p----- a------- inet(gyration)
++--p----- a------- inet(honeywell_euroboard)
++--p----- a------- inet(hp2501)
++--p----- a------- inet(hp2505)
++--p----- a------- inet(hp500fa)
++--p----- a------- inet(hp5181)
++--p----- a------- inet(hp5185)
++--p----- a------- inet(hp5xx)
++--p----- a------- inet(hpi6)
++--p----- a------- inet(hpxe3gc)
++--p----- a------- inet(hpxe3gf)
++--p----- a------- inet(hpxe4xxx)
++--p----- a------- inet(hpxt1000)
++--p----- a------- inet(hpzt11xx)
++--p----- a------- inet(inspiron)
++--p----- a------- inet(ipaq)
++--p----- a------- inet(itouch)
++--p----- a------- inet(latitude)
++--p----- a------- inet(logiaccess)
++--p----- a------- inet(logicdit)
++--p----- a------- inet(logicdp)
++--p----- a------- inet(logicdpa)
++--p----- a------- inet(logiciink)
++--p----- a------- inet(logicink)
++--p----- a------- inet(logiclx300)
++--p----- a------- inet(logiik)
++--p----- a------- inet(logiinkse)
++--p----- a------- inet(logiinkseusb)
++--p----- a------- inet(logiitc)
++h-p----- a------- inet(logitech_base)
++h-p----- a------- inet(logitech_set3)
++--p----- a------- inet(logiultrax)
++--p----- a------- inet(ltcd)
++--p----- a------- inet(microsoftinet)
++--p----- a------- inet(microsoftmult)
++--p----- a------- inet(microsoftoffice)
++--p----- a------- inet(microsoftpro)
++--p----- a------- inet(microsoftprooem)
++--p----- a------- inet(microsoftprose)
++--p----- a------- inet(microsoftprousb)
++--p----- a------- inet(mx1998)
++--p----- a------- inet(mx2500)
++--p----- a------- inet(mx2750)
++--p----- a------- inet(oretec)
++--p----- a------- inet(presario)
++--p----- a------- inet(propeller)
++--p----- a------- inet(qtronix)
++--p----- a------- inet(rapidaccess)
++--p----- a------- inet(rapidaccess2)
++--p----- a------- inet(rapidaccess2a)
++--p----- a------- inet(samsung4500)
++--p----- a------- inet(samsung4510)
++--p----- a------- inet(scorpius)
++--p----- a------- inet(silvercrest)
++--p----- a------- inet(sk1300)
++--p----- a------- inet(sk2500)
++--p----- a------- inet(sk6200)
++--p----- a------- inet(sk7100)
++-------- -------- inet(sp_inet)
++--p----- a------- inet(sven)
++--p----- a------- inet(symplon)
++--p----- a------- inet(toshiba_s3000)
++--p----- a------- inet(trust)
++--p----- a------- inet(trustda)
++--p----- a------- inet(yahoo)
+ -dp----- a------- iq(basic)
+ --p----- a------- iq(ku)
+---p----- a------- iq(ku_f)
+ --p----- a------- iq(ku_alt)
+ --p----- a------- iq(ku_ara)
++--p----- a------- iq(ku_f)
+ -dp----- a------- ir(basic)
+-h-p----- a------- ir(part_pro)
+-h-p----- a------- ir(part_keypad)
+---p----- a------- ir(pro)
+ --p----- a------- ir(keypad)
+---p----- a------- ir(pro_keypad)
+ --p----- a------- ir(ku)
+---p----- a------- ir(ku_f)
+ --p----- a------- ir(ku_alt)
+ --p----- a------- ir(ku_ara)
+--dp----- a------- is(basic)
++--p----- a------- ir(ku_f)
++h-p----- a------- ir(part_keypad)
++h-p----- a------- ir(part_pro)
++--p----- a------- ir(pro)
++--p----- a------- ir(pro_keypad)
+ --p----- a------- is(Sundeadkeys)
+---p----- a------- is(nodeadkeys)
++-dp----- a------- is(basic)
+ --p----- a------- is(mac)
++--p----- a------- is(nodeadkeys)
+ -dp----- a------- it(basic)
+---p----- a------- it(nodeadkeys)
+ --p----- a------- it(mac)
+--dp----- a------- jp(106)
+-h-p----- a------- jp(common)
+---p----- a------- jp(OADG109A)
+---p----- a------- jp(kana)
++--p----- a------- it(nodeadkeys)
++h-p----- -------- jp(jp106)
++-dp----- -------- jp(latin)
++--p----- --k----- keypad(comma)
++--p----- --k----- keypad(core)
++--p----- --k----- keypad(dot)
++-------- --k----- keypad(legacy)
++--p----- --k----- keypad(legacymath)
++--p----- --k----- keypad(legacynumber)
++-------- --k----- keypad(oss)
++-------- --k----- keypad(oss_latin9)
++--p----- --k----- keypad(ossmath)
++--p----- --k----- keypad(ossmath_latin9)
++--p----- --k----- keypad(ossnumber)
++h-p----- --k----- keypad(overlay)
++h-p----- --k----- keypad(overlay1)
++h-p----- --k----- keypad(overlay2)
++hdp----- --k----- keypad(x11)
+ -dp----- a------- kg(basic)
+ -dp----- a------- kh(basic)
+--dp----- a------- la(basic)
+--d------ a------- kr(kr106)
+--------- a------- kr(kr104)
+ h-p----- ---f---- kr(koreankeys)
+ h-p----- ---f---- kr(koreankeys_raltctl)
+--dp----- a------- lk(sin_phonetic)
+---p----- a------- lk(tam_unicode)
+---p----- a------- lk(tam_TAB)
+--dp----- a------- ma(arabic)
+---p----- a------- ma(french)
+---p----- a------- ma(tifinagh)
+---p----- a------- ma(tifinagh-phonetic)
+---p----- a------- ma(tifinagh-extended)
+---p----- a------- ma(tifinagh-extended-phonetic)
+---p----- a------- ma(tifinagh-alt)
+---p----- a------- ma(tifinagh-alt-phonetic)
++-------- a------- kr(kr104)
++-d------ a------- kr(kr106)
+ -dp----- a------- kz(basic)
+---p----- a------- kz(ruskaz)
+ --p----- a------- kz(kazrus)
++--p----- a------- kz(ruskaz)
++-dp----- a------- la(basic)
++--p----- a------- latam(Sundeadkeys)
++-dp----- a------- latam(basic)
++--p----- a------- latam(nodeadkeys)
++--p----- a------- latam(sundeadkeys)
++-dp----- -------- latin(basic)
++--p----- -------- latin(nodeadkeys)
++--p----- -------- latin(type2)
++--p----- -------- latin(type2_nodeadkeys)
++--p----- -------- latin(type3)
++--p----- -------- latin(type3_nodeadkeys)
++--p----- -------- latin(type4)
++--p----- -------- latin(type4_nodeadkeys)
++--p----- -m------ level3(alt_switch)
++--p----- -m------ level3(enter_switch)
++--p----- -m------ level3(lalt_switch)
++--p----- -m------ level3(lwin_switch)
++--p----- -m------ level3(menu_switch)
++-dp----- -m------ level3(ralt_switch)
++h-p----- -m------ level3(ralt_switch_for_alts_toggle)
++--p----- -m------ level3(ralt_switch_multikey)
++--p----- -m------ level3(rwin_switch)
++--p----- -m------ level3(switch)
++--p----- -m------ level3(win_switch)
++--p----- -m------ level5(rctrl_switch)
++-dp----- a------- lk(sin_phonetic)
++--p----- a------- lk(tam_TAB)
++--p----- a------- lk(tam_unicode)
+ -dp----- am------ lt(basic)
+---p----- am------ lt(us)
+---p----- am------ lt(std)
+ --p----- am------ lt(ibm)
+--dp----- a------- mk(basic)
+---p----- a------- mk(nodeadkeys)
+--dp----- am------ lv(basic)
++--p----- am------ lt(std)
++--p----- am------ lt(us)
+ --p----- am------ lv(apostrophe)
+---p----- am------ lv(tilde)
++-dp----- am------ lv(basic)
+ --p----- am------ lv(fkey)
++--p----- am------ lv(tilde)
++-dp----- -m------ macintosh_vndr/apple(extended)
++--p----- -m------ macintosh_vndr/apple(laptop)
++--p----- -m------ macintosh_vndr/apple(laptop_bad_switch)
++--p----- a------- macintosh_vndr/ch(de)
++--p----- a------- macintosh_vndr/ch(extended)
++--p----- a------- macintosh_vndr/ch(fr)
++--p----- a------- macintosh_vndr/ch(nodeadkeys)
++--p----- a------- macintosh_vndr/de(Sundeadkeys)
++-dp----- a------- macintosh_vndr/de(basic)
++--p----- a------- macintosh_vndr/de(nodeadkeys)
++--p----- a------- macintosh_vndr/de(sundeadkeys)
++--p----- a------- macintosh_vndr/dk(basic)
++-dp----- a------- macintosh_vndr/dk(full)
++--p----- a------- macintosh_vndr/dk(nodeadkeys)
++-dp----- a------- macintosh_vndr/es(basic)
++-dp----- a------- macintosh_vndr/fi(basic)
++--p----- a------- macintosh_vndr/fi(nodeadkeys)
++-------- -------- macintosh_vndr/fr(extended)
++-dp----- a------- macintosh_vndr/gb(basic)
++-dp----- a------- macintosh_vndr/is(basic)
++--p----- a------- macintosh_vndr/is(nodeadkeys)
++-------- -------- macintosh_vndr/it(extended)
++-dp----- a------- macintosh_vndr/latam(basic)
++-dp----- a------- macintosh_vndr/nl(basic)
++-dp----- a------- macintosh_vndr/no(basic)
++--p----- a------- macintosh_vndr/no(nodeadkeys)
++--p----- a------- macintosh_vndr/pt(Sundeadkeys)
++-dp----- a------- macintosh_vndr/pt(basic)
++--p----- a------- macintosh_vndr/pt(nodeadkeys)
++--p----- a------- macintosh_vndr/pt(sundeadkeys)
++-dp----- a------- macintosh_vndr/se(basic)
++--p----- a------- macintosh_vndr/se(nodeadkeys)
++-------- -------- macintosh_vndr/us(extended)
++h------- -------- macintosh_vndr/us(oldmac)
++-dp----- a------- mao(basic)
++-dp----- a------- mk(basic)
++--p----- a------- mk(nodeadkeys)
+ -dp----- a------- mm(basic)
+ -dp----- a------- mn(basic)
+--dp----- a------- ng(basic)
+---p----- a------- ng(yoruba)
+---p----- a------- ng(igbo)
+---p----- a------- ng(hausa)
+ -dp----- a------- mt(basic)
+ --p----- a------- mt(us)
+ -dp----- a------- mv(basic)
+--dp----- a------- nl(basic)
+---p----- a------- nl(std)
+---p----- a------- nl(Sundeadkeys)
+---p----- a------- nl(sundeadkeys)
++--p----- -------- nbsp(level2)
++--p----- -------- nbsp(level3)
++--p----- -------- nbsp(level4)
++--p----- -------- nbsp(none)
++-d------ -------- nec_vndr/jp(pc98)
++-dp----- a------- ng(basic)
++--p----- a------- ng(hausa)
++--p----- a------- ng(igbo)
++--p----- a------- ng(yoruba)
++--p----- a------- nl(Sundeadkeys)
++-dp----- a------- nl(basic)
+ --p----- a------- nl(mac)
++--p----- a------- nl(sundeadkeys)
+ -dp----- a------- no(basic)
+---p----- a------- no(nodeadkeys)
+ --p----- a------- no(dvorak)
+---p----- a------- no(smi)
+---p----- a------- no(smi_nodeadkeys)
+ --p----- a------- no(mac)
+ --p----- a------- no(mac_nodeadkeys)
++--p----- a------- no(nodeadkeys)
++--p----- a------- no(smi)
++--p----- a------- no(smi_nodeadkeys)
+ -dp----- a------- np(basic)
+--dp----- am------ pc(pc105)
+-h-p----- a------- pc(function)
++h-p----- -------- pc(basic)
+ h-p----- a------- pc(editing)
++h-p----- a------- pc(function)
++h-p----- -------- pc(pc101)
++h-p----- -------- pc(pc102)
++h-p----- -------- pc(pc104)
++-dp----- am------ pc(pc105)
+ -dp----- a------- pk(urd)
+ -dp----- a------- pl(basic)
+---p----- a------- pl(qwertz)
++--p----- a------- pl(csb)
+ --p----- a------- pl(dvorak)
+---p----- a------- pl(dvorak_quotes)
+ --p----- a------- pl(dvorak_altquotes)
+---p----- a------- pl(csb)
+--dp----- a------- pt(basic)
++--p----- a------- pl(dvorak_quotes)
++--p----- a------- pl(qwertz)
+ --p----- a------- pt(Sundeadkeys)
+---p----- a------- pt(sundeadkeys)
+---p----- a------- pt(nodeadkeys)
++-dp----- a------- pt(basic)
+ --p----- a------- pt(mac)
+---p----- a------- pt(mac_sundeadkeys)
+ --p----- a------- pt(mac_nodeadkeys)
++--p----- a------- pt(mac_sundeadkeys)
++--p----- a------- pt(nodeadkeys)
++--p----- a------- pt(sundeadkeys)
++--p----- a------- ro(academic)
+ -dp----- a------- ro(basic)
+ --p----- a------- ro(comma)
+ --p----- a------- ro(std)
+---p----- a------- ro(academic)
+ --p----- a------- ro(winkeys)
+--dp----- a------- si(basic)
+---p----- a------- si(us)
+---p----- a------- si(alternatequotes)
+---p----- a------- si(unicode)
+---p----- a------- si(unicodeus)
+ -dp----- a------- ru(basic)
+---p----- a------- ru(winkeys)
+---p----- a------- ru(typewriter)
+---p----- a------- ru(phonetic)
+---p----- a------- ru(tt)
+ --p----- a------- ru(os)
+ --p----- a------- ru(os_winkeys)
++--p----- a------- ru(phonetic)
++--p----- a------- ru(tt)
++--p----- a------- ru(typewriter)
++--p----- a------- ru(winkeys)
++-dp----- a------- se(basic)
++--p----- a------- se(dvorak)
++--p----- a------- se(mac)
++--p----- a------- se(nodeadkeys)
++--p----- a------- se(rus)
++--p----- a------- se(rus_nodeadkeys)
++--p----- a------- se(se)
++-------- -------- se(smi)
++-------- -------- sgi_vndr/jp(alternate106)
++-------- -------- sgi_vndr/jp(jp106)
++--p----- a------- si(alternatequotes)
++-dp----- a------- si(basic)
++--p----- a------- si(unicode)
++--p----- a------- si(unicodeus)
++--p----- a------- si(us)
+ -dp----- a------- sk(basic)
+ -------- -------- sk(bksl)
+ --p----- a------- sk(qwerty)
+ -------- -------- sk(qwerty_bksl)
+--dp----- a------- th(basic)
+---p----- a------- th(pat)
+---p----- a------- th(tis)
+--dp----- a------- tj(basic)
+--dp----- a------- ua(basic)
+---p----- a------- ua(winkeys)
+---p----- a------- ua(typewriter)
+---p----- a------- ua(phonetic)
+---p----- a------- ua(rstu)
+---p----- a------- ua(rstu_ru)
+--dp----- a------- sy(basic)
+---p----- a------- sy(syc)
+---p----- a------- sy(syc_phonetic)
+---p----- a------- sy(ku)
+---p----- a------- sy(ku_f)
+---p----- a------- sy(ku_alt)
+--dp----- -------- tr(basic)
+---p----- -------- tr(f)
+---p----- -------- tr(alt)
+---p----- a------- tr(Sundeadkeys)
+---p----- a------- tr(sundeadkeys)
+---p----- -------- tr(ku)
+---p----- -------- tr(ku_f)
+---p----- -------- tr(ku_alt)
+--dp----- am------ us(basic)
+---p----- a------- us(euro)
+---p----- a------- us(intl)
+---p----- a------- us(alt-intl)
+---p----- a------- us(dvorak)
+---p----- a------- us(dvorak-l)
+---p----- a------- us(dvorak-r)
+---p----- a------- us(dvorak-classic)
+---p----- a------- us(rus)
+---p----- a------- us(mac)
+--dp----- a------- vn(basic)
+--dp----- a------- uz(cyrillic)
+---p----- a------- uz(latin)
+--dp----- am------ za(basic)
+--dp----- a------- ara(basic)
+---p----- a------- ara(qwerty)
+---p----- a------- ara(azerty)
+---p----- a------- ara(digits)
+---p----- a------- ara(qwerty_digits)
+---p----- a------- ara(azerty_digits)
+---p----- a------- ara(buckwalter)
+--dp----- a------- epo(basic)
+---p----- a------- epo(legacy)
+--dp----- a------- mao(basic)
+--------- -------- sun_vndr/de(type4)
++-------- -------- sony_vndr/us(nwp5461)
++--p----- ---f---- srvr_ctrl(fkey2vt)
++--p----- --kf---- srvr_ctrl(no_srvr_keys)
++--p----- --k----- srvr_ctrl(stdkeypad)
++--p----- --kf---- srvr_ctrl(xfree86)
+ -------- -------- sun_vndr/cs(type5)
++-------- -------- sun_vndr/cz(type5)
++-------- -------- sun_vndr/de(type4)
+ -------- -------- sun_vndr/dk(type4)
+ -------- -------- sun_vndr/dk(type5)
+--------- -------- sun_vndr/cz(type5)
+ --p----- -------- sun_vndr/es(type4)
+ --p----- -------- sun_vndr/es(type5)
+ --p----- -------- sun_vndr/es(type6)
+ -------- -------- sun_vndr/fi(basic)
+--------- -------- sun_vndr/gb(type4)
+---p----- -------- sun_vndr/gb(type5)
+---p----- -------- sun_vndr/gb(type6)
+ -------- -------- sun_vndr/fr(type4)
+ -------- -------- sun_vndr/fr(type5)
+ -------- -------- sun_vndr/fr(type6)
++-------- -------- sun_vndr/gb(type4)
++--p----- -------- sun_vndr/gb(type5)
++--p----- -------- sun_vndr/gb(type6)
+ -------- -------- sun_vndr/gr(type5)
+ -dp----- a------- sun_vndr/hu(type5)
+ -------- -------- sun_vndr/it(type4)
+ -------- -------- sun_vndr/it(type5)
+ --p----- -------- sun_vndr/it(type6)
++-------- -------- sun_vndr/jp(J3100)
++-------- -------- sun_vndr/jp(Muhenkan_x86)
+ -------- -------- sun_vndr/jp(basic)
+ -------- -------- sun_vndr/jp(type4)
+ -------- -------- sun_vndr/jp(type5)
+ -------- -------- sun_vndr/jp(type5hobo)
+ --p----- -------- sun_vndr/jp(type6)
+--------- -------- sun_vndr/jp(x86)
+--------- -------- sun_vndr/jp(J3100)
+--------- -------- sun_vndr/jp(Muhenkan_x86)
+ --p----- -------- sun_vndr/jp(type7)
++-------- -------- sun_vndr/jp(x86)
+ -------- -------- sun_vndr/ko(type4)
+ -------- -------- sun_vndr/ko(type5)
+ --p----- -------- sun_vndr/ko(type6)
+@@ -403,322 +625,78 @@
+ -------- -------- sun_vndr/pt(type4)
+ -------- -------- sun_vndr/pt(type5)
+ --p----- -------- sun_vndr/pt(type6)
++-------- -------- sun_vndr/ru(basic)
++--p----- -------- sun_vndr/ru(type6)
+ -------- -------- sun_vndr/se(type4)
+ -------- -------- sun_vndr/se(type5)
+ --p----- -------- sun_vndr/se(type6)
+--------- -------- sun_vndr/ru(basic)
+---p----- -------- sun_vndr/ru(type6)
++-dp----- -------- sun_vndr/solaris(defaults)
++--p----- -------- sun_vndr/solaris(keynames)
++--p----- -------- sun_vndr/solaris(xf86keynames)
+ -------- -------- sun_vndr/sw(type4de)
+ -------- -------- sun_vndr/sw(type4fr)
+--------- -------- sun_vndr/sw(type5fr)
+ -------- -------- sun_vndr/sw(type5de)
++-------- -------- sun_vndr/sw(type5fr)
+ -------- -------- sun_vndr/tr(basic)
+--------- -------- sun_vndr/tr(type6Q)
+ -------- -------- sun_vndr/tr(type6F)
++-------- -------- sun_vndr/tr(type6Q)
++-------- -------- sun_vndr/tuv(type4)
++-------- -------- sun_vndr/tuv(type4basic)
++-------- -------- sun_vndr/tuv(type5)
++-------- -------- sun_vndr/tuv(type5basic)
+ -------- -------- sun_vndr/tw(type4)
+ -------- -------- sun_vndr/tw(type5)
+ --p----- -------- sun_vndr/tw(type6)
++-------- -------- sun_vndr/us(US101A_Sun)
++-------- -------- sun_vndr/us(pc101)
++-------- -------- sun_vndr/us(pc101currency)
++-------- -------- sun_vndr/us(pc102)
++-------- -------- sun_vndr/us(pc104)
+ -------- -------- sun_vndr/us(sunbasic)
+--------- -------- sun_vndr/us(type4basic)
+ -------- -------- sun_vndr/us(type4)
+--------- -------- sun_vndr/us(type5basic)
++-------- -------- sun_vndr/us(type4basic)
+ -------- -------- sun_vndr/us(type5)
+--------- -------- sun_vndr/us(type6)
+--------- -------- sun_vndr/us(type5hobobasic)
++-------- -------- sun_vndr/us(type5basic)
+ -------- -------- sun_vndr/us(type5hobo)
+--------- -------- sun_vndr/us(pc101)
+--------- -------- sun_vndr/us(pc102)
+--------- -------- sun_vndr/us(pc104)
+--------- -------- sun_vndr/us(pc101currency)
+--------- -------- sun_vndr/us(US101A_Sun)
+--------- -------- sun_vndr/tuv(type4basic)
+--------- -------- sun_vndr/tuv(type4)
+--------- -------- sun_vndr/tuv(type5basic)
+--------- -------- sun_vndr/tuv(type5)
++-------- -------- sun_vndr/us(type5hobobasic)
++-------- -------- sun_vndr/us(type6)
+ -------- -------- sun_vndr/usb(sun_usb)
+--dp----- -------- sun_vndr/solaris(defaults)
+---p----- -------- sun_vndr/solaris(keynames)
+---p----- -------- sun_vndr/solaris(xf86keynames)
+---p----- -m------ ctrl(nocaps)
+---p----- -m------ ctrl(swapcaps)
+---p----- -m------ ctrl(ctrl_ac)
+---p----- -m------ ctrl(ctrl_aa)
+---p----- -m------ ctrl(ctrl_ra)
+---p----- a------- inet(evdev)
+---p----- a------- inet(a4techKB21)
+---p----- a------- inet(a4techKBS8)
+---p----- a------- inet(a4_rfkb23)
+---p----- a------- inet(airkey)
+---p----- a------- inet(acer_ferrari4k)
+---p----- a------- inet(azonaRF2300)
+---p----- a------- inet(acpi)
+---p----- a------- inet(scorpius)
+---p----- a------- inet(brother)
+---p----- a------- inet(btc5113rf)
+---p----- a------- inet(btc5126t)
+---p----- a------- inet(btc9000)
+---p----- a------- inet(btc9000a)
+--------- -------- inet(btc9001ah)
+---p----- a------- inet(btc5090)
+---p----- a------- inet(btc9019u)
+---p----- a------- inet(cherryblue)
+---p----- a------- inet(cherryblueb)
+---p----- a------- inet(cherrybluea)
+---p----- a------- inet(cherrycyboard)
+---p----- a------- inet(chicony)
+---p----- a------- inet(chicony9885)
+---p----- a------- inet(compaqeak8)
+---p----- a------- inet(compaqik7)
+---p----- a------- inet(compaqik13)
+---p----- a------- inet(compaqik18)
+---p----- a------- inet(armada)
+---p----- a------- inet(presario)
+---p----- a------- inet(ipaq)
+---p----- a------- inet(dell)
+---p----- a------- inet(geniuskb19e)
+---p----- a------- inet(dellusbmm)
+---p----- a------- inet(inspiron)
+---p----- a------- inet(latitude)
+---p----- a------- inet(precision_m)
+---p----- a------- inet(dell8125)
+---p----- a------- inet(dell8135)
+---p----- a------- inet(dexxa)
+---p----- a------- inet(diamond)
+---p----- a------- inet(dtk2000)
+---p----- a------- inet(ennyah_dkb1008)
+---p----- a------- inet(genius)
+---p----- a------- inet(geniuscomfy)
+---p----- a------- inet(geniuscomfy2)
+---p----- a------- inet(gyration)
+---p----- a------- inet(hpi6)
+---p----- a------- inet(hp2501)
+---p----- a------- inet(hp2505)
+---p----- a------- inet(hp5181)
+---p----- a------- inet(hp5185)
+---p----- a------- inet(hpxe3gc)
+---p----- a------- inet(hpxe3gf)
+---p----- a------- inet(hpxt1000)
+---p----- a------- inet(hpzt11xx)
+---p----- a------- inet(hpxe4xxx)
+---p----- a------- inet(hp500fa)
+---p----- a------- inet(hp5xx)
+---p----- a------- inet(honeywell_euroboard)
+---p----- a------- inet(rapidaccess)
+---p----- a------- inet(rapidaccess2)
+---p----- a------- inet(rapidaccess2a)
+---p----- a------- inet(thinkpad)
+-h-p----- a------- inet(logitech_base)
+-h-p----- a------- inet(logitech_set3)
+---p----- a------- inet(ltcd)
+---p----- a------- inet(logiaccess)
+---p----- a------- inet(logicdit)
+---p----- a------- inet(logicdo)
+---p----- a------- inet(logicdp)
+---p----- a------- inet(logicdpa)
+---p----- a------- inet(logicink)
+---p----- a------- inet(logiciink)
+---p----- a------- inet(logiclx300)
+---p----- a------- inet(logiinkse)
+---p----- a------- inet(logiinkseusb)
+---p----- a------- inet(logiitc)
+---p----- a------- inet(logiik)
+---p----- a------- inet(itouch)
+---p----- a------- inet(logiultrax)
+---p----- a------- inet(dinovo)
+---p----- a------- inet(mx1998)
+---p----- a------- inet(mx2500)
+---p----- a------- inet(mx2750)
+---p----- a------- inet(microsoftinet)
+---p----- a------- inet(microsoftpro)
+---p----- a------- inet(microsoftprousb)
+---p----- a------- inet(microsoftprooem)
+---p----- a------- inet(microsoftprose)
+---p----- a------- inet(microsoftoffice)
+---p----- a------- inet(microsoftmult)
+---p----- a------- inet(oretec)
+---p----- a------- inet(propeller)
+---p----- a------- inet(qtronix)
+---p----- a------- inet(samsung4500)
+---p----- a------- inet(samsung4510)
+---p----- a------- inet(sk1300)
+---p----- a------- inet(sk2500)
+---p----- a------- inet(sk6200)
+---p----- a------- inet(sk7100)
+---p----- a------- inet(sven)
+---p----- a------- inet(symplon)
+---p----- a------- inet(toshiba_s3000)
+---p----- a------- inet(trust)
+---p----- a------- inet(trustda)
+---p----- a------- inet(yahoo)
+--------- -------- inet(sp_inet)
+---p----- a------- inet(acer_c300)
+--------- -------- inet(acer_tm_800)
+---p----- -------- inet(apple)
+---p----- a------- inet(cymotionlinux)
+---p----- a------- inet(silvercrest)
+---p----- a------- inet(emachines)
+---p----- a------- inet(benqx800)
+---p----- a------- inet(benqx730)
+---p----- a------- inet(logitech_g15)
+---p----- -------- nbsp(none)
+---p----- -------- nbsp(level2)
+---p----- -------- nbsp(level3)
+---p----- -------- nbsp(level3s)
+---p----- -------- nbsp(level3n)
+---p----- -------- nbsp(level4)
+---p----- -------- nbsp(level4n)
+---p----- -m------ compose(ralt)
+---p----- -m------ compose(lwin)
+---p----- -m------ compose(rwin)
+---p----- -m------ compose(menu)
+---p----- -m------ compose(rctrl)
+---p----- -m------ compose(caps)
+--------- -------- fujitsu_vndr/jp
+--------- -------- fujitsu_vndr/us
+---p----- -m------ group(switch)
+---p----- -m------ group(lswitch)
+---p----- -m------ group(win_switch)
+---p----- -m------ group(lwin_switch)
+---p----- -m------ group(rwin_switch)
+---p----- -m------ group(rctrl_switch)
+---p----- -m------ group(toggle)
+---p----- -m------ group(shifts_toggle)
+---p----- -m------ group(ctrl_shift_toggle)
+---p----- -m------ group(lctrl_lshift_toggle)
+---p----- -m------ group(caps_toggle)
+---p----- -m------ group(shift_caps_toggle)
+---p----- -m------ group(ctrl_alt_toggle)
+---p----- -m------ group(alt_shift_toggle)
+---p----- -m------ group(menu_toggle)
+---p----- -m------ group(lwin_toggle)
+---p----- -m------ group(rwin_toggle)
+---p----- -m------ group(ctrls_toggle)
+---p----- -m------ group(alts_toggle)
+---p----- -m------ group(lshift_toggle)
+---p----- -m------ group(rshift_toggle)
+---p----- -m------ group(lalt_toggle)
+---p----- -m------ group(lctrl_toggle)
+---p----- -m------ group(rctrl_toggle)
+---p----- -m------ group(alt_caps_toggle)
+--dp----- a------- latam(basic)
+---p----- a------- latam(Sundeadkeys)
+---p----- a------- latam(sundeadkeys)
+---p----- a------- latam(nodeadkeys)
+--dp----- -------- latin(basic)
+---p----- -------- latin(type2)
+---p----- -------- latin(type3)
+---p----- -------- latin(type4)
+---p----- -------- latin(nodeadkeys)
+---p----- -------- latin(type2_nodeadkeys)
+---p----- -------- latin(type3_nodeadkeys)
+---p----- -------- latin(type4_nodeadkeys)
+---p----- a------- macintosh_vndr/ch(extended)
+---p----- a------- macintosh_vndr/ch(de)
+---p----- a------- macintosh_vndr/ch(fr)
+---p----- a------- macintosh_vndr/ch(nodeadkeys)
+--dp----- a------- macintosh_vndr/de(basic)
+---p----- a------- macintosh_vndr/de(Sundeadkeys)
+---p----- a------- macintosh_vndr/de(sundeadkeys)
+---p----- a------- macintosh_vndr/de(nodeadkeys)
+---p----- a------- macintosh_vndr/dk(basic)
+--dp----- a------- macintosh_vndr/dk(full)
+---p----- a------- macintosh_vndr/dk(nodeadkeys)
+--dp----- a------- macintosh_vndr/es(basic)
+--dp----- a------- macintosh_vndr/fi(basic)
+---p----- a------- macintosh_vndr/fi(nodeadkeys)
+--dp----- a------- macintosh_vndr/gb(basic)
+--------- -------- macintosh_vndr/fr(extended)
+--dp----- a------- macintosh_vndr/is(basic)
+---p----- a------- macintosh_vndr/is(nodeadkeys)
+--------- -------- macintosh_vndr/it(extended)
+--dp----- a------- macintosh_vndr/nl(basic)
+--dp----- a------- macintosh_vndr/no(basic)
+---p----- a------- macintosh_vndr/no(nodeadkeys)
+--dp----- a------- macintosh_vndr/pt(basic)
+---p----- a------- macintosh_vndr/pt(Sundeadkeys)
+---p----- a------- macintosh_vndr/pt(sundeadkeys)
+---p----- a------- macintosh_vndr/pt(nodeadkeys)
+--dp----- a------- macintosh_vndr/se(basic)
+---p----- a------- macintosh_vndr/se(nodeadkeys)
+--------- -------- macintosh_vndr/us(extended)
+-h------- -------- macintosh_vndr/us(oldmac)
+--dp----- -m------ macintosh_vndr/apple(extended)
+---p----- -m------ macintosh_vndr/apple(laptop)
+---p----- -m------ macintosh_vndr/apple(laptop_bad_switch)
+--dp----- a------- macintosh_vndr/latam(basic)
+---p----- -m------ altwin(meta_alt)
+---p----- -m------ altwin(ctrl_win)
+---p----- -m------ altwin(meta_win)
+---p----- -m------ altwin(left_meta_win)
+---p----- -m------ altwin(super_win)
+---p----- -m------ altwin(hyper_win)
+---p----- -m------ altwin(menu)
+---p----- -m------ altwin(alt_super_win)
+---p----- -m------ altwin(swap_lalt_lwin)
+--d------ -------- nec_vndr/jp(pc98)
+-hdp----- -m------ capslock(capslock)
+-h-p----- -m------ capslock(shiftlock)
+-h-p----- -m------ capslock(grouplock)
+-h-p----- --k----- keypad(overlay)
+-h-p----- --k----- keypad(overlay1)
+-h-p----- --k----- keypad(overlay2)
+-hdp----- --k----- keypad(x11)
+---p----- --k----- keypad(comma)
+---p----- --k----- keypad(dot)
+--------- --k----- keypad(legacy)
+--------- --k----- keypad(oss)
+--------- --k----- keypad(oss_latin9)
+---p----- --k----- keypad(core)
+---p----- --k----- keypad(legacymath)
+---p----- --k----- keypad(ossmath)
+---p----- --k----- keypad(ossmath_latin9)
+---p----- --k----- keypad(legacynumber)
+---p----- --k----- keypad(ossnumber)
+--dp----- -m------ level3(ralt_switch)
+---p----- -m------ level3(ralt_alt)
+---p----- -m------ level3(ralt_switch_multikey)
+-h-p----- -m------ level3(ralt_switch_for_alts_toggle)
+---p----- -m------ level3(alt_switch)
+---p----- -m------ level3(lalt_switch)
+---p----- -m------ level3(switch)
+---p----- -m------ level3(menu_switch)
+---p----- -m------ level3(win_switch)
+---p----- -m------ level3(lwin_switch)
+---p----- -m------ level3(rwin_switch)
+-h-p----- -m------ level3(enter_switch)
+---p----- -m------ level5(rctrl_switch)
+---p----- -------- eurosign(e)
+---p----- -------- eurosign(5)
+---p----- -------- eurosign(2)
+---p----- --kf---- srvr_ctrl(xfree86)
+---p----- --k----- srvr_ctrl(stdkeypad)
+---p----- ---f---- srvr_ctrl(fkey2vt)
+---p----- --kf---- srvr_ctrl(no_srvr_keys)
+--d------ -------- digital_vndr/lk(common)
+--------- -------- digital_vndr/lk(lk401)
+--------- -------- digital_vndr/pc(pc)
+--------- -------- digital_vndr/pc(pc104)
+--------- -------- digital_vndr/us(us)
+--------- -------- digital_vndr/us(vt105-tw)
+--------- -------- digital_vndr/us(vt105-dp)
+--------- -------- digital_vndr/us(vt105)
+--------- -------- digital_vndr/us(vt108-tw)
+--------- -------- digital_vndr/us(vt108-dp)
+--------- -------- digital_vndr/us(vt108)
+--------- -------- digital_vndr/us(unix)
+--------- -------- digital_vndr/us(pcxalga)
+--------- -------- digital_vndr/us(pcxal)
+--------- -------- digital_vndr/us(pcxalaa)
+--------- -------- digital_vndr/us(pcxalfa)
+--------- -------- digital_vndr/us(pcxalka)
+--------- -------- digital_vndr/us(lk44x)
+--------- -------- digital_vndr/us(pc104)
+--------- -------- digital_vndr/vt(vt105)
+--------- -------- digital_vndr/vt(vt108)
+--------- -------- sony_vndr/us(nwp5461)
++-dp----- a------- sy(basic)
++--p----- a------- sy(ku)
++--p----- a------- sy(ku_alt)
++--p----- a------- sy(ku_f)
++--p----- a------- sy(syc)
++--p----- a------- sy(syc_phonetic)
++-dp----- a------- th(basic)
++--p----- a------- th(pat)
++--p----- a------- th(tis)
++-dp----- a------- tj(basic)
++--p----- a------- tr(Sundeadkeys)
++--p----- -------- tr(alt)
++-dp----- -------- tr(basic)
++--p----- -------- tr(f)
++--p----- -------- tr(ku)
++--p----- -------- tr(ku_alt)
++--p----- -------- tr(ku_f)
++--p----- a------- tr(sundeadkeys)
++-dp----- a------- ua(basic)
++--p----- a------- ua(phonetic)
++--p----- a------- ua(rstu)
++--p----- a------- ua(rstu_ru)
++--p----- a------- ua(typewriter)
++--p----- a------- ua(winkeys)
++--p----- a------- us(alt-intl)
++-dp----- am------ us(basic)
++--p----- a------- us(dvorak)
++--p----- a------- us(dvorak-classic)
++--p----- a------- us(dvorak-l)
++--p----- a------- us(dvorak-r)
++--p----- a------- us(intl)
++--p----- a------- us(mac)
++--p----- a------- us(rus)
++-dp----- a------- uz(basic)
++-dp----- a------- vn(basic)
+ -d------ -------- xfree68_vndr/amiga(usa1)
+--d------ -------- xfree68_vndr/ataritt(us)
+ -------- -------- xfree68_vndr/ataritt(de)
+--------- -------- hp_vndr/us(hil)
+--------- -------- sgi_vndr/jp(jp106)
+--------- -------- sgi_vndr/jp(alternate106)
++-d------ -------- xfree68_vndr/ataritt(us)
++-dp----- am------ za(basic)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/docs.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/docs.diff
@@ -0,0 +1,11 @@
+--- xkeyboard-config-0.8.orig/docs/README.config
++++ xkeyboard-config-0.8/docs/README.config
+@@ -41,7 +41,7 @@
+ The proper rules file depends on your vendor. In reality, the commonest file
+ of rules is xfree86. For each rules file there is a description file named
+ <vendor-rules>.lst, for instance xfree86.lst which is located in xkb configu-
+-ration subdirectory rules (for example /etc/X11/xkb/rules).
++ration subdirectory rules (for example /usr/share/X11/xkb/rules).
+ 
+ 2.1  Basic Configuration
+ 
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/nbsp-level4nl.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/nbsp-level4nl.diff
@@ -0,0 +1,131 @@
+By Nicolas Mailhot, from https://bugs.freedesktop.org/show_bug.cgi?id=9529#c29
+
+diff -uNr xkeyboard-config-20080420/rules/base.o_s.part xkeyboard-config-20080420.new/rules/base.o_s.part
+--- xkeyboard-config-20080420/rules/base.o_s.part	2008-04-07 23:28:16.000000000 +0200
++++ xkeyboard-config-20080420.new/rules/base.o_s.part	2008-04-20 16:43:06.000000000 +0200
+@@ -75,6 +75,7 @@
+   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)
+diff -uNr xkeyboard-config-20080420/rules/base.xml.in xkeyboard-config-20080420.new/rules/base.xml.in
+--- xkeyboard-config-20080420/rules/base.xml.in	2008-04-20 00:36:46.000000000 +0200
++++ xkeyboard-config-20080420.new/rules/base.xml.in	2008-04-20 21:12:23.000000000 +0200
+@@ -4588,6 +4588,12 @@
+           <_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; uses hardcoded control instead of iso-level-5 to access high levels.</_description>
++        </configItem>
++      </option>
+     </group>
+     <group allowMultipleSelection="true">
+       <configItem>
+diff -uNr xkeyboard-config-20080420/symbols/fr xkeyboard-config-20080420.new/symbols/fr
+--- xkeyboard-config-20080420/symbols/fr	2008-03-22 19:50:08.000000000 +0100
++++ xkeyboard-config-20080420.new/symbols/fr	2008-04-20 17:18:30.000000000 +0200
+@@ -85,11 +85,11 @@
+ // Unicode French derivative
+ // Loose refactoring of the historic Linux French keyboard layout
+ //
+-// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
++// Copyright © 2006-2008 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+ //
+ // Credits (fr-latin1, fr-latin0, fr-latin9)
+ //   © 199x-1996 René Cougnenc ✝
+-//   © 1997-2002 Guylhem Aznar <clavier @ externe.net> 
++//   © 1997-2002 Guylhem Aznar <clavier @ externe.net>
+ //   © 2003-2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
+ //
+ // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
+@@ -113,8 +113,7 @@
+ 
+     include "latin"
+     include "level3(ralt_switch)"
+-    include "level5(rctrl_switch)"
+-    include "nbsp(level4n)"
++    include "nbsp(level4nl)"
+     include "keypad(oss)"
+ 
+     name[Group1]="France - Alternative";
+diff -uNr xkeyboard-config-20080420/symbols/nbsp xkeyboard-config-20080420.new/symbols/nbsp
+--- xkeyboard-config-20080420/symbols/nbsp	2007-01-05 00:31:30.000000000 +0100
++++ xkeyboard-config-20080420.new/symbols/nbsp	2008-04-20 17:50:36.000000000 +0200
+@@ -62,7 +62,6 @@
+ };
+ 
+ // level4n provides narrow no-breaking space in addition to the normal one
+-// Used by fr(oss), be(oss)…
+ partial
+ xkb_symbols "level4n" {
+  key <SPCE> {
+@@ -71,3 +70,14 @@
+  };
+ };
+ 
++// level4nl provides narrow no-breaking space in addition to the normal one
++// without forcing the use of level5 for mostly four-level layouts
++// Used by fr(oss), be(oss)…
++partial
++xkb_symbols "level4nl" {
++ key <SPCE> {
++   type[Group1]="LOCAL_EIGHT_LEVEL",
++   symbols[Group1]= [ space, space, space, nobreakspace, space, 0x100202F, NoSymbol, NoSymbol ]
++ };
++};
++
+diff -uNr xkeyboard-config-20080420/types/pc xkeyboard-config-20080420.new/types/pc
+--- xkeyboard-config-20080420/types/pc	2007-08-29 00:04:38.000000000 +0200
++++ xkeyboard-config-20080420.new/types/pc	2008-04-20 21:15:24.000000000 +0200
+@@ -67,4 +67,45 @@
+ 	level_name[Level1] = "Base";
+ 	level_name[Level2] = "Ctrl+Alt";
+     };
++
++   // Local eight level
++   // Needed when you want part of your layout eight-level but can not use
++   // LevelFive as modifier, as this will take over right ctrl by default
++   // for all the layout and is too invasive for your average four-level user
++   // Needed to fix bug #9529
++   // FIXME Should really use RControl but it's seems not to be enabled by
++   // default and touching this requires a lot of testing
++   type "LOCAL_EIGHT_LEVEL" {
++	modifiers = Shift+Lock+LevelThree+Control;
++
++	map[None]       = Level1;
++	map[Lock+Shift] = Level1;
++	map[Shift] = Level2;
++	map[Lock]  = Level2;
++
++	map[LevelThree]            = Level3;
++	map[Lock+Shift+LevelThree] = Level3;
++	map[Shift+LevelThree] = Level4;
++	map[Lock+LevelThree]  = Level4;
++
++	map[Control]            = Level5;
++	map[Lock+Shift+Control] = Level5;
++	map[Shift+Control] = Level6;
++	map[Lock+Control]  = Level6;
++
++	map[LevelThree+Control]            = Level7;
++	map[Lock+Shift+LevelThree+Control] = Level7;
++	map[Shift+LevelThree+Control] = Level8;
++	map[Lock+LevelThree+Control]  = Level8;
++
++	level_name[Level1] = "Base";
++	level_name[Level2] = "Shift";
++	level_name[Level3] = "Level3";
++	level_name[Level4] = "Shift Level3";
++	level_name[Level5] = "Ctrl";
++	level_name[Level6] = "Shift Ctrl";
++	level_name[Level7] = "Level3 Ctrl";
++	level_name[Level8] = "Shift Level3 Ctrl";
++    };
++
+ };
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/mac_poweroff.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/mac_poweroff.diff
@@ -0,0 +1,15 @@
+Add the power key, as requested by Jörg Sommer in
+  http://lists.debian.org/debian-powerpc/2006/09/msg00227.html
+
+Index: xkb-data/symbols/inet
+===================================================================
+--- xkb-data.orig/symbols/inet	2008-01-05 00:35:36.000000000 +0100
++++ xkb-data/symbols/inet	2008-01-05 00:36:33.000000000 +0100
+@@ -2037,6 +2037,7 @@
+     key <I2E>	{	[ XF86AudioLowerVolume	]	};
+     key <I30>	{	[ XF86AudioRaiseVolume	]	};
+     key <I56>   {       [ XF86RotateWindows	]	};
++    key <I5E>	{	[ XF86PowerOff		]	};
+ // Really keyboard backlight off/up/down
+     key <I57>   {       [ XF86Launch0		]	};
+     key <I58>	{	[ XF86Launch1    	]	};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/add_void_definition_pl-324647.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/add_void_definition_pl-324647.diff
@@ -0,0 +1,2292 @@
+Index: xkb-data/rules/base
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/base	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,949 @@
++// 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 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 = ara br es et kz 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 \
++              ipaq inspiron intel latitude \
++              logiaccess logicd logicda logicink \
++              logiex110 logiclx300 \
++              logiinkse logiinkseusb logiitc logiik itouch logiultrax \
++              logitech_g15 \
++	      logidinovo logidinovoedge \
++              microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
++              microsoftoffice microsoftmult \
++              mx1998 mx2500 mx2750 \
++              oretec \
++              presario propeller \
++              qtronix \
++              rapidaccess rapidaccess2 rapidaccess2a thinkpad \
++              samsung4500 samsung4510 \
++              scorpius silvercrest \
++              sk1300 sk2500 sk6200 sk7100 sp_inet \
++              sven 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
++
++! model		=	keycodes
++  amiga		=	amiga(de)
++  ataritt	=	ataritt(de)
++  sun4		=	sun(type4_euro)
++  sun5		=	sun(type5_euro)
++  sun6		=	sun(type6_usb)
++  pc98		=	xfree98(pc98)
++  abnt2		=	xfree86(abnt2)
++  jp106		=	xfree86(jp106)
++  evdev		=	evdev
++  olpc		=	evdev
++  macintosh_hhk	=	macintosh(hhk)
++  macintosh_old	=	macintosh(old)
++ $macbooks	=	macintosh+macintosh(goodmap)
++ $macs   	=	macintosh
++  *		=	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)
++  winbook	=	winbook(XP5)
++  pc98		=	nec(pc98)
++ $macbooks      =       macintosh(%m)
++ $macs		=	macintosh(macintosh)
++  hhk		=	hhk(basic)
++  kinesis	=	kinesis(model100)
++  *		=       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_comma)
++  *		ro		std		=	pc+ro(std_cedilla)
++  *		ro		academic		=	pc+ro(std_comma)
++  *		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
++  *		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_comma)
++  *		ro(std)			=	pc+ro(std_cedilla)
++  *		ro(academic)			=	pc+ro(std_comma)
++  *		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)
++  sun4		$nonlatin		=	latin+sun_vndr/us(sun4)+%l%(v):2
++  sun4		*			=	latin+sun_vndr/us(sun4)+%l%(v)
++  sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
++  sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
++  sun6		us			=	pc+sun_vndr/us(type6)
++  sun6		en_US			=	pc+sun_vndr/us(type6)+iso9995-3(basic)
++  sun6		*			=	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
++  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_comma)
++  *		ro(std)			=	pc+ro(std_cedilla)
++  *		ro(academic)			=	pc+ro(std_comma)
++  *		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])
++  sun4		*			=	latin+sun_vndr/us(sun4)+%l[1]%(v[1])
++  sun5		*			=	latin+sun_vndr/us(sun5)+%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_comma)
++  *		ro		std		=	pc+ro(std_cedilla)
++  *		ro		academic		=	pc+ro(std_comma)
++  *		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)
++
++! 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_comma):2
++  ro(std)	=	+ro(std_cedilla):2
++  ro(academic)	=	+ro(std_comma):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_comma):3
++  ro(std)	=	+ro(std_cedilla):3
++  ro(academic)	=	+ro(std_comma):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_comma):4
++  ro(std)	=	+ro(std_cedilla):4
++  ro(academic)	=	+ro(std_comma):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_comma):2
++  ro		std	=	+ro(std_cedilla):2
++  ro		academic	=	+ro(std_comma):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_comma):3
++  ro		std	=	+ro(std_cedilla):3
++  ro		academic	=	+ro(std_comma):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_comma):4
++  ro		std	=	+ro(std_cedilla):4
++  ro		academic	=	+ro(std_comma):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
++  $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)
++
++! model		layout		=	compat
++  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	=	+group(caps_toggle)
++  grp:shift_caps_toggle	=	+group(shift_caps_toggle)
++  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:lctrl_toggle	=	+group(lctrl_toggle)
++  grp:rctrl_toggle	=	+group(rctrl_toggle)
++  grp:lalt_toggle	=	+group(lalt_toggle)
++  grp:sclk_toggle	=	+group(sclk_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)
++  lv3:enter_switch	=	+level3(enter_switch)
++  caps:capslock		=	+capslock(capslock)
++  caps:shiftlock	=	+capslock(shiftlock)
++  caps:grouplock	=	+capslock(grouplock)
++  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)
++  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_wang         =	+keypad(future_wang)
++  keypad:comma          =       +keypad(comma)
++  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)
++  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)
+Index: xkb-data/rules/base.lst
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/base.lst	2008-01-05 00:40:02.000000000 +0100
+@@ -0,0 +1,646 @@
++! model
++  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
++  dellusbmm       Dell USB Multimedia Keybard
++  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_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
++  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
++  logiaccess      Logitech Access Keyboard
++  logiclx300      Logitech Cordless Desktop LX-300
++  logicd          Logitech Cordless Desktop
++  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
++  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
++  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
++  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
++  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
++  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
++  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
++  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
++  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-da         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
++  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
++  thinkpad        br: Thinkpad
++  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
++  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
++  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: (Legacy) 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
++  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
++  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)
++  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
++  comma           ro: Commabelow
++  std_comma       ro: Standard (Commabelow)
++  std_cedilla     ro: Standard (Cedilla)
++  winkeys         ro: Winkeys
++  phonetic        ru: Phonetic
++  typewriter      ru: Typewriter
++  winkeys         ru: Winkeys
++  tt              ru: Tatar
++  os              ru: Ossetian
++  os_winkeys      ru: Ossetian, Winkeys
++  cv              ru: Chuvash
++  cv_latin        ru: Chuvash Latin
++  udm             ru: Udmurt
++  kom             ru: Komi
++  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
++  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
++  intl            gb: International (with dead keys)
++  dvorak          gb: Dvorak
++  mac             gb: Macintosh
++  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: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: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.
++  grp:sclk_toggle      ScrollLock key changes group.
++  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.
++  lv3:enter_switch     Press Enter key on keypad to choose 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:comma         Force standard comma 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.
++  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: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:shift_lock      CapsLock just locks the Shift modifier.
++  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.
++  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
++  japan                Japanese keyboard options
++  japan:kana_lock      Kana Lock key is locking
++  japan:nicola_f_bs    NICOLA-F style Backspace
+Index: xkb-data/rules/compat/base.l2_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.l2_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,72 @@
++  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_comma):2
++  ro(std)	=	+ro(std_cedilla):2
++  ro(academic)	=	+ro(std_comma):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
+Index: xkb-data/rules/compat/base.l2v2_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.l2v2_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,45 @@
++  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_comma):2
++  ro		std	=	+ro(std_cedilla):2
++  ro		academic	=	+ro(std_comma):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
+Index: xkb-data/rules/compat/base.l3_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.l3_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,72 @@
++  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_comma):3
++  ro(std)	=	+ro(std_cedilla):3
++  ro(academic)	=	+ro(std_comma):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
+Index: xkb-data/rules/compat/base.l3v3_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.l3v3_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,45 @@
++  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_comma):3
++  ro		std	=	+ro(std_cedilla):3
++  ro		academic	=	+ro(std_comma):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
+Index: xkb-data/rules/compat/base.l4_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.l4_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,72 @@
++  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_comma):4
++  ro(std)	=	+ro(std_cedilla):4
++  ro(academic)	=	+ro(std_comma):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
+Index: xkb-data/rules/compat/base.l4v4_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.l4v4_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,45 @@
++  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_comma):4
++  ro		std	=	+ro(std_cedilla):4
++  ro		academic	=	+ro(std_comma):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
+Index: xkb-data/rules/compat/base.ml1_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.ml1_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,72 @@
++  *		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_comma)
++  *		ro(std)			=	pc+ro(std_cedilla)
++  *		ro(academic)			=	pc+ro(std_comma)
++  *		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)
+Index: xkb-data/rules/compat/base.ml1v1_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.ml1v1_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,45 @@
++  *		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_comma)
++  *		ro		std		=	pc+ro(std_cedilla)
++  *		ro		academic		=	pc+ro(std_comma)
++  *		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)
+Index: xkb-data/rules/compat/base.ml_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.ml_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,72 @@
++  *		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_comma)
++  *		ro(std)			=	pc+ro(std_cedilla)
++  *		ro(academic)			=	pc+ro(std_comma)
++  *		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)
+Index: xkb-data/rules/compat/base.mlv_s.part
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ xkb-data/rules/compat/base.mlv_s.part	2008-01-05 00:40:01.000000000 +0100
+@@ -0,0 +1,45 @@
++  *		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_comma)
++  *		ro		std		=	pc+ro(std_cedilla)
++  *		ro		academic		=	pc+ro(std_comma)
++  *		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)
+Index: xkb-data/symbols/pl
+===================================================================
+--- xkb-data.orig/symbols/pl	2008-01-05 00:22:37.000000000 +0100
++++ xkb-data/symbols/pl	2008-01-05 00:39:52.000000000 +0100
+@@ -11,11 +11,14 @@
+ 
+     name[Group1]="Poland";
+ 
++    key <AD01>  { [         q,          Q ] };
++    key <AD02>  { [         w,          W ] };
+     key <AD03>	{ [         e,          E,      eogonek,      Eogonek ]	};
+     key <AD09>	{ [         o,          O,       oacute,       Oacute ]	};
+ 
+     key <AC01>	{ [         a,          A,      aogonek,      Aogonek ]	};
+     key <AC02>	{ [         s,          S,       sacute,       Sacute ]	};
++    key <AC04>  { [         f,          F ] };
+ 
+     key <AB01>	{ [         z,          Z,    zabovedot,    Zabovedot ]	};
+     key <AB02>	{ [         x,          X,       zacute,       Zacute ]	};
+@@ -50,12 +53,15 @@
+     key <AE11>	{ [      plus,   question, dead_diaeresis, questiondown ] };
+     key <AE12>	{ [apostrophe,   asterisk, dead_cedilla,  dead_ogonek ]	};
+ 
++    key <AD01>  { [         q,          Q ] };
++    key <AD02>  { [         w,          W ] };
+     key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+     key <AD11>	{ [ zabovedot,     nacute,     division, dead_abovering ] };
+     key <AD12>	{ [    sacute,     cacute,     multiply,  dead_macron ]	};
+ 
+     key <AC02>	{ [         s,          S,      dstroke,      section ]	};
+     key <AC03>	{ [         d,          D,      Dstroke,          ETH ]	};
++    key <AC04>  { [         f,          F ] };
+     key <AC08>	{ [         k,          K,          kra,    ampersand ]	};
+     key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]	};
+     key <AC10>	{ [   lstroke,    Lstroke,       dollar, dead_doubleacute ] };
+@@ -136,6 +142,8 @@
+ 
+     name[Group1]="Poland - Kashubian";
+ 
++    key <AD01>  { [         q,          Q ] };
++    key <AD02>  { [         w,          W ] };
+     key <AD03>	{ [         e,          E,      eacute,      Eacute ]	};
+     key <AD04>	{ [         r,           R,      ediaeresis,      Ediaeresis ]	};
+     key <AD06>      { [         y,          Y,      EuroSign,         cent ]        };
+@@ -146,6 +154,7 @@
+ 
+     key <AC01>	{ [         a,          A,      aogonek,      Aogonek ]	};
+     key <AC02>	{ [         s,          S,      atilde,      Atilde ]	      };
++    key <AC04>  { [         f,          F ] };
+     key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]      };
+ 
+     key <AB01>	{ [         z,          Z,    zabovedot,    Zabovedot ]	};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/in_backslash.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/in_backslash.diff
@@ -0,0 +1,31 @@
+Index: xkeyboard-config-1.1~cvs.20080104.1/symbols/in
+===================================================================
+--- xkeyboard-config-1.1~cvs.20080104.1.orig/symbols/in
++++ xkeyboard-config-1.1~cvs.20080104.1/symbols/in
+@@ -116,7 +116,7 @@
+     key <AE10>  { [   0,	parenright,	U0966,		parenright ] };
+     key <AE11>	{ [   minus,	underscore	     ] };
+     key <AE12>	{ [   equal,	plus		     ] };
+-    key <BKSL>  { [   U0964,	U0965,		pipe,		backlash   ] }; //pipe : danda, double danda
++    key <BKSL>  { [   U0964,	U0965,		pipe,		backslash   ] }; //pipe : danda, double danda
+ 
+     //Q Row	
+     key <AD01>   { [   U200C, 	U200D   ] };  // Q: ZWNJ, ZWJ
+@@ -484,7 +484,7 @@
+ 
+     key <AE11> { [ minus      , 0x01000d03           ] };
+     key <AE12> { [ 0x01000d43 , 0x01000d0b           ] };
+-    key <BKSL>  { [0x0100200c, backlash ]};//bksl: ZWNJ 
++    key <BKSL>  { [0x0100200c, backslash ]};//bksl: ZWNJ 
+ 
+   
+     // From 'q' to right bracket (])
+@@ -555,7 +555,7 @@
+     key <AE10>  { [   0,	parenright,	U0D66,		parenright ] };
+     key <AE11>	{ [   minus,	underscore	     ] };
+     key <AE12>	{ [   equal,	plus		     ] };
+-    key <BKSL>  { [   U005C,	U007C,		U200C	] };//backlash:pipe,backlash,ZWNJ 
++    key <BKSL>  { [   U005C,	U007C,		U200C	] };//backslash:pipe,backslash,ZWNJ 
+ 
+     //Q Row	
+     key <AD01>   { [   U0D48,	U0D4C,	U0D10,	U0D14  ] }; // Q: ai and au matras 
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/lekp-add.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/lekp-add.diff
@@ -0,0 +1,160 @@
+--- xkeyboard-config-1.1~cvs.20080104.1.orig/symbols/lt	2006/09/02 00:34:17	1.9
++++ xkeyboard-config-1.1~cvs.20080104.1/symbols/lt	2008/02/01 23:59:44	1.10
+@@ -157,3 +157,157 @@
+ 
+     include "level3(ralt_switch)"
+ };
++
++
++
++// LEKP, LEKPa and Baltic+ layouts 1.0 for Linux.
++// Copyright (c) 2007 Tautrimas Pajarskas
++// For more info go to http://lekp.info
++
++partial alphanumeric_keys modifier_keys
++xkb_symbols "lekp" {
++    name[Group1]="Lithuania - LEKP";
++    key <TLDE>  { [     grave,   asciitilde, acute ] };
++    key <AE01>	{ [     slash,   numbersign,               bar ] };
++    key <AE02>	{ [ backslash,           at,           section ] };
++    key <AE03>	{ [    period,    braceleft ] };
++    key <AE04>	{ [     comma,   braceright ] };
++    key <AE05>	{ [         f, 	          F ] };
++    key <AE06>	{ [    exclam,       endash ] };
++    key <AE07>	{ [         w,            W ] };
++    key <AE08>	{ [   uogonek,      Uogonek ] };
++    key <AE09>	{ [   iogonek,      Iogonek ] };
++    key <AE10>	{ [ parenleft,  doublelowquotemark, registered ] };
++    key <AE11>	{ [ parenright, leftdoublequotemark, copyright ] };
++    key <AE12>  { [      colon,           ampersand, trademark ] };
++
++    key <BKSL>  { [ apostrophe,          underscore ] };
++
++    key <AD01>  { [          q,                  Q,   EuroSign ] };
++    key <AD02>  { [          g,                  G,          7 ] };
++    key <AD03>  { [          r,                  R,          8 ] };
++    key <AD04>  { [          l,                  L,          9 ] };
++    key <AD05>  { [          d,                  D,    percent ] };
++    key <AD06>  { [     ccaron,             Ccaron ] };
++    key <AD07>  { [          j,                  J ] };
++    key <AD08>  { [          u,                  U,     period ] };
++    key <AD09>  { [  eabovedot,          Eabovedot,      minus ] };
++    key <AD10>  { [    eogonek,            Eogonek,      slash ] };
++    key <AD11>  { [   question,        bracketleft,   division ] };
++    key <AD12>  { [      equal,       bracketright ] };
++
++    key <CAPS>  { [  BackSpace ] };
++    key <AC01>  { [          a,                  A,          0 ] };
++    key <AC02>  { [          k,                  K,          4 ] };
++    key <AC03>  { [          s,                  S,          5 ] };
++    key <AC04>  { [          t,                  T,          6 ] };
++    key <AC05>  { [          m,                  M,     dollar ] };
++    key <AC06>  { [          p,                  P ] };
++    key <AC07>  { [          n,                  N ] };
++    key <AC08>  { [          e,                  E,      comma ] };
++    key <AC09>  { [          i,                  I,       plus ] };
++    key <AC10>  { [          o,                  O,   asterisk ] };
++    key <AC11>  { [          y,                  Y,   multiply ] };
++
++    key <AB01>  { [          z,                  Z, asciicircum ] };
++    key <AB02>  { [          x,                  X,          1 ] };
++    key <AB03>  { [          c,                  C,          2 ] };
++    key <AB04>  { [          v,                  V,          3 ] };
++    key <AB05>  { [     zcaron,             Zcaron ] };
++    key <AB06>  { [     scaron,             Scaron ] };
++    key <AB07>  { [          b,                  B,     degree ] };
++    key <AB08>  { [    umacron,            Umacron,       less ] };
++    key <AB09>  { [    aogonek,            Aogonek,    greater ] };
++    key <AB10>  { [          h,                  H ] };
++
++    key <LSGT>  { [  semicolon,           quotedbl,   sterling ] };
++
++    include "level3(ralt_switch)"
++};
++
++partial alphanumeric_keys modifier_keys
++xkb_symbols "lekpa" {
++    name[Group1]="Lithuania - LEKPa";
++    key <TLDE>  { [     grave,   asciitilde,             acute ] };
++    key <AE01>	{ [     slash,     quotedbl,               bar ] };
++    key <AE02>	{ [ backslash,           at,           section ] };
++    key <AE03>	{ [    period,    braceleft,        numbersign ] };
++    key <AE04>	{ [     comma,   braceright,          sterling ] };
++    key <AE05>	{ [         f, 	          F,         ampersand ] };
++    key <AE06>	{ [    exclam,       endash ] };
++    key <AE07>	{ [         w,            W ] };
++    key <AE08>	{ [   uogonek,      Uogonek ] };
++    key <AE09>	{ [   iogonek,      Iogonek ] };
++    key <AE10>	{ [ parenleft, doublelowquotemark,  registered ] };
++    key <AE11>	{ [ parenright, leftdoublequotemark, copyright ] };
++    key <AE12>  { [      colon,   semicolon,         trademark ] };
++
++    key <BKSL>  { [ apostrophe,          underscore ] };
++
++    key <AD01>  { [          q,                  Q,   EuroSign ] };
++    key <AD02>  { [          g,                  G,          7 ] };
++    key <AD03>  { [          r,                  R,          8 ] };
++    key <AD04>  { [          l,                  L,          9 ] };
++    key <AD05>  { [          d,                  D,    percent ] };
++    key <AD06>  { [     ccaron,             Ccaron ] };
++    key <AD07>  { [          j,                  J ] };
++    key <AD08>  { [          u,                  U,     period ] };
++    key <AD09>  { [  eabovedot,          Eabovedot,      minus ] };
++    key <AD10>  { [    eogonek,            Eogonek,      slash ] };
++    key <AD11>  { [   question,        bracketleft,   division ] };
++    key <AD12>  { [      equal,       bracketright ] };
++
++    key <CAPS>  { [  BackSpace ] };
++    key <AC01>  { [          a,                  A,          0 ] };
++    key <AC02>  { [          k,                  K,          4 ] };
++    key <AC03>  { [          s,                  S,          5 ] };
++    key <AC04>  { [          t,                  T,          6 ] };
++    key <AC05>  { [          m,                  M,     dollar ] };
++    key <AC06>  { [          p,                  P ] };
++    key <AC07>  { [          n,                  N ] };
++    key <AC08>  { [          e,                  E,      comma ] };
++    key <AC09>  { [          i,                  I,       plus ] };
++    key <AC10>  { [          o,                  O,   asterisk ] };
++    key <AC11>  { [          y,                  Y,   multiply ] };
++
++    key <AB01>  { [          z,                  Z, asciicircum ] };
++    key <AB02>  { [          x,                  X,          1 ] };
++    key <AB03>  { [          c,                  C,          2 ] };
++    key <AB04>  { [          v,                  V,          3 ] };
++    key <AB05>  { [     zcaron,             Zcaron ] };
++    key <AB06>  { [     scaron,             Scaron ] };
++    key <AB07>  { [          b,                  B,     degree ] };
++    key <AB08>  { [    umacron,            Umacron,       less ] };
++    key <AB09>  { [    aogonek,            Aogonek,    greater ] };
++    key <AB10>  { [          h,                  H ] };
++
++
++    include "level3(ralt_switch)"
++};
++
++partial alphanumeric_keys modifier_keys
++xkb_symbols "balticplus" {
++    include "latin"
++    name[Group1]="Lithuania - Baltic+";
++    key <AE01>  { [   aogonek,      Aogonek,        1,      exclam ]    };
++    key <AE02>  { [    ccaron,       Ccaron,        2,          at ]    };
++    key <AE03>  { [   eogonek,      Eogonek,        3,  numbersign ]    };
++    key <AE04>  { [ eabovedot,    Eabovedot,        4,      dollar ]    };
++    key <AE05>  { [   iogonek,      Iogonek,        5,     percent ]    };
++    key <AE06>  { [    scaron,       Scaron,        6, asciicircum ]    };
++    key <AE07>  { [   uogonek,      Uogonek,        7,   ampersand ]    };
++    key <AE08>  { [   umacron,      Umacron,        8,    asterisk ]    };
++    key <AE09>  { [ parenleft, doublelowquotemark,  9 ] };
++    key <AE10>  { [ parenright, leftdoublequotemark, 0 ] };
++    key <AE11>  { [     minus,   underscore,    minus,  section ] };
++    key <AE12>  { [    zcaron,       Zcaron,    equal,        plus ]    };
++    key <CAPS>  { [ BackSpace ] };
++    key <NFER>  { [ backslash,         bar,   endash ] };
++    key <AD03>  { [         e,            E, EuroSign ] };
++    key <AD04>  { [         r,            R, registered ] };
++    key <AD05>  { [         t,            T, trademark ] };
++    key <AB03>  { [         c,            C, copyright ] };
++    key <AB08>  { [     comma,         less,  degree ] };
++    include "level3(ralt_switch)"
++};
++
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/unhide_lv3_enter_switch.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/unhide_lv3_enter_switch.diff
@@ -0,0 +1,47 @@
+Unhide lv3:enter_switch option, it can be useful if a pc105 model
+is selected with an Apple laptop.
+
+Not submitted upstream.
+
+Index: xkb-data/rules/base.o_s.part
+===================================================================
+--- xkb-data.orig/rules/base.o_s.part	2008-01-05 00:36:32.000000000 +0100
++++ xkb-data/rules/base.o_s.part	2008-01-05 00:36:38.000000000 +0100
+@@ -42,6 +42,7 @@
+   lv3:win_switch	=	+level3(win_switch)
+   lv3:lwin_switch	=	+level3(lwin_switch)
+   lv3:rwin_switch	=	+level3(rwin_switch)
++  lv3:enter_switch	=	+level3(enter_switch)
+   caps:capslock		=	+capslock(capslock)
+   caps:shiftlock	=	+capslock(shiftlock)
+   caps:grouplock	=	+capslock(grouplock)
+Index: xkb-data/symbols/level3
+===================================================================
+--- xkb-data.orig/symbols/level3	2008-01-05 00:35:36.000000000 +0100
++++ xkb-data/symbols/level3	2008-01-05 00:36:38.000000000 +0100
+@@ -136,7 +136,7 @@
+ // using the level3(enter_switch) map, the Enter key on the keypad
+ // temporarily chooses the third shift level.  This is especially
+ // useful for Mac laptops which miss the right Alt key.
+-partial hidden modifier_keys
++partial modifier_keys
+ xkb_symbols "enter_switch" {
+   key <KPEN> {
+     type[Group1]="ONE_LEVEL",
+Index: xkb-data/rules/base.xml.in
+===================================================================
+--- xkb-data.orig/rules/base.xml.in	2008-01-05 00:36:32.000000000 +0100
++++ xkb-data/rules/base.xml.in	2008-01-05 00:36:38.000000000 +0100
+@@ -3765,6 +3765,12 @@
+           <_description>Right Alt key never chooses 3rd level.</_description>
+         </configItem>
+       </option>
++      <option>
++        <configItem>
++          <name>lv3:enter_switch</name>
++          <_description>Press Enter key on keypad to choose 3rd level.</_description>
++        </configItem>
++      </option>
+     </group>
+     <group allowMultipleSelection="false">
+       <!-- Tweaking the position of the "Ctrl" key -->
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/ca-shs-add.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/ca-shs-add.diff
@@ -0,0 +1,49 @@
+Index: xkeyboard-config-0.9/rules/base.xml.in
+===================================================================
+--- xkeyboard-config-0.9.orig/rules/base.xml.in	2008-01-31 08:38:13.000000000 -0400
++++ xkeyboard-config-0.9/rules/base.xml.in	2008-01-31 08:38:36.000000000 -0400
+@@ -1235,6 +1235,12 @@
+             <_description>Inuktitut</_description>
+           </configItem>
+         </variant>
++        <variant>
++          <configItem>
++            <name>shs</name>
++            <_description>Secwepemctsin</_description>
++          </configItem>
++        </variant>
+       </variantList>
+     </layout>
+     <layout>
+Index: xkeyboard-config-0.9/symbols/ca
+===================================================================
+--- xkeyboard-config-0.9.orig/symbols/ca	2008-01-31 08:38:46.000000000 -0400
++++ xkeyboard-config-0.9/symbols/ca	2008-01-31 08:39:26.000000000 -0400
+@@ -453,3 +453,27 @@
+     include "level5(rctrl_switch)"
+ };
+ 
++// Secwepemctsin keyboard for X11
++// written by Neskie Manuel <neskiem@gmail.com>
++
++partial alphanumeric_keys
++xkb_symbols "shs" {
++
++    include "us"
++
++    name[Group1]= "Canada - Secwepemctsin";
++
++    key <AD01> {	[   q,	Q, UF7EB, UF7EA ]	};
++    key <AD02> {	[   w,	W, UF83B, UF83A ]	};
++    key <AD04> {	[   r,	R, UF7FB, UF7FA ]	};
++    key <AD05> {	[   t,	T, UF81B, UF81A ]	};
++    key <AD06> {	[   y,	Y, UF6AB, UF6AA ]	};
++    key <AD10> {	[   p,	P, UF7DB, UF7DA ]	};
++    key <AC02> {	[   s,	S, UF80B, UF80A	]	};
++    key <AC05> {	[   g,	G, UF76B, UF76A	]	};
++    key <AC08> {	[   k,	K, UF79B, UF79A ]	};
++    key <AC09> {	[   l,	L, UF7AB, UF7AA ]	};
++    key <AB07> {	[   m,	M, UF7BB, UF7BA ]	};
++
++    include "level3(ralt_switch)"
++};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/sclk_toggle.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/sclk_toggle.diff
@@ -0,0 +1,54 @@
+  * symbols/group: add ScrollLock as a group switcher key.
+    Thanks Andreas Kroschel.  Closes: #343287
+
+Not submitted yet.
+
+Index: xkb-data/symbols/group
+===================================================================
+--- xkb-data.orig/symbols/group	2008-01-05 00:35:36.000000000 +0100
++++ xkb-data/symbols/group	2008-01-05 00:35:58.000000000 +0100
+@@ -320,3 +320,15 @@
+     };
+ };
+ 
++
++// using the group(sclk_toggle) map, pressing the Scroll Lock key
++// toggles groups.
++partial modifier_keys
++xkb_symbols "sclk_toggle" {
++  virtual_modifiers AltGr;
++  key <SCLK> {
++    virtualMods= AltGr,
++    symbols[Group1] = [ ISO_Next_Group ]
++    };
++};
++
+Index: xkb-data/rules/base.o_s.part
+===================================================================
+--- xkb-data.orig/rules/base.o_s.part	2008-01-05 00:35:36.000000000 +0100
++++ xkb-data/rules/base.o_s.part	2008-01-05 00:35:58.000000000 +0100
+@@ -31,6 +31,7 @@
+   grp:lctrl_toggle	=	+group(lctrl_toggle)
+   grp:rctrl_toggle	=	+group(rctrl_toggle)
+   grp:lalt_toggle	=	+group(lalt_toggle)
++  grp:sclk_toggle	=	+group(sclk_toggle)
+   lv3:switch		=	+level3(switch)
+   lv3:ralt_switch	=	+level3(ralt_switch)
+   lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
+Index: xkb-data/rules/base.xml.in
+===================================================================
+--- xkb-data.orig/rules/base.xml.in	2008-01-05 00:35:36.000000000 +0100
++++ xkb-data/rules/base.xml.in	2008-01-05 00:35:58.000000000 +0100
+@@ -3691,6 +3691,12 @@
+           <_description>Right Ctrl key changes layout.</_description>
+         </configItem>
+       </option>
++      <option>
++        <configItem>
++          <name>grp:sclk_toggle</name>
++          <_description>ScrollLock key changes group.</_description>
++        </configItem>
++      </option>
+     </group>
+     <group allowMultipleSelection="true">
+       <!-- The key combination used to choose the 3rd (and 4th, together with Shift)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/clean.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/clean.diff
@@ -0,0 +1,66 @@
+Let 'make clean' remove generated files.
+
+Not submitted upstream.
+
+Index: xkb-data/rules/compat/Makefile.am
+===================================================================
+--- xkb-data.orig/rules/compat/Makefile.am	2008-01-05 00:22:37.000000000 +0100
++++ xkb-data/rules/compat/Makefile.am	2008-01-05 00:26:02.000000000 +0100
+@@ -7,15 +7,17 @@
+ 
+ if USE_COMPAT_RULES
+ 
+-noinst_SCRIPTS=base.l2_s.part base.l3_s.part base.l4_s.part \
++gen_parts=base.l2_s.part base.l3_s.part base.l4_s.part \
+ base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \
+ base.ml_s.part base.ml1_s.part \
+ base.mlv_s.part base.ml1v1_s.part \
+-base.ml_s.part $(dist_parts)
++base.ml_s.part
++noinst_SCRIPTS=$(gen_parts) $(dist_parts)
+ 
+ else
+ 
+ noinst_SCRIPTS=
++gen_parts=
+ 
+ endif
+ 
+@@ -50,3 +52,4 @@
+ 	sh $<
+ 
+ EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
++CLEANFILES=$(gen_parts)
+Index: xkb-data/rules/compat/Makefile.in
+===================================================================
+--- xkb-data.orig/rules/compat/Makefile.in	2008-01-05 00:22:37.000000000 +0100
++++ xkb-data/rules/compat/Makefile.in	2008-01-05 00:26:02.000000000 +0100
+@@ -191,14 +191,17 @@
+ transform_files = layoutRename.lst variantRename.lst
+ transform_scripts = ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh
+ dist_parts = base.o_s.part
+-@USE_COMPAT_RULES_FALSE@noinst_SCRIPTS = 
+-@USE_COMPAT_RULES_TRUE@noinst_SCRIPTS = base.l2_s.part base.l3_s.part base.l4_s.part \
++@USE_COMPAT_RULES_FALSE@gen_parts = 
++@USE_COMPAT_RULES_TRUE@gen_parts = base.l2_s.part base.l3_s.part base.l4_s.part \
+ @USE_COMPAT_RULES_TRUE@base.l2v2_s.part base.l3v3_s.part base.l4v4_s.part \
+ @USE_COMPAT_RULES_TRUE@base.ml_s.part base.ml1_s.part \
+ @USE_COMPAT_RULES_TRUE@base.mlv_s.part base.ml1v1_s.part \
+-@USE_COMPAT_RULES_TRUE@base.ml_s.part $(dist_parts)
++@USE_COMPAT_RULES_TRUE@base.ml_s.part
+ 
++@USE_COMPAT_RULES_FALSE@noinst_SCRIPTS = 
++@USE_COMPAT_RULES_TRUE@noinst_SCRIPTS = $(gen_parts) $(dist_parts)
+ EXTRA_DIST = base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
++CLEANFILES = $(gen_parts)
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -287,6 +290,7 @@
+ mostlyclean-generic:
+ 
+ clean-generic:
++	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ 
+ distclean-generic:
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/resync_rules_base.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/resync_rules_base.diff
@@ -0,0 +1,1627 @@
+# To rebuild this patch, run
+  if x=$(quilt top) && [ "$x" = resync_rules_base.diff ]; then
+    echo Regenerating $x
+  else
+    echo 'You need to apply resync_rules_base.diff with "quilt push -f" first'
+    exit 1
+  fi
+  ./debian/rules config.status
+  cd rules/compat
+  quilt add base.l[2-4]*.part base.m*.part
+  rm -f base.l[2-4]*.part base.m*.part
+  make
+  cd ..
+  quilt add base base.lst
+  rm -f base base.lst
+  make base base.lst
+  cd ..
+  quilt refresh --sort
+  exit 0
+
+Index: xkb-data/rules/base
+===================================================================
+--- xkb-data.orig/rules/base	2008-01-05 00:37:24.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,364 +0,0 @@
+-// 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 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 = ara br es et kz 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 \
+-              ipaq inspiron intel latitude \
+-              logiaccess logicd logicda logicink \
+-              logiex110 logiclx300 \
+-              logiinkse logiinkseusb logiitc logiik itouch logiultrax \
+-              logitech_g15 \
+-	      logidinovo logidinovoedge \
+-              microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
+-              microsoftoffice microsoftmult \
+-              mx1998 mx2500 mx2750 \
+-              oretec \
+-              presario propeller \
+-              qtronix \
+-              rapidaccess rapidaccess2 rapidaccess2a thinkpad \
+-              samsung4500 samsung4510 \
+-              scorpius silvercrest \
+-              sk1300 sk2500 sk6200 sk7100 sp_inet \
+-              sven 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
+-
+-! model		=	keycodes
+-  amiga		=	amiga(de)
+-  ataritt	=	ataritt(de)
+-  sun4		=	sun(type4_euro)
+-  sun5		=	sun(type5_euro)
+-  sun6		=	sun(type6_usb)
+-  pc98		=	xfree98(pc98)
+-  abnt2		=	xfree86(abnt2)
+-  jp106		=	xfree86(jp106)
+-  evdev		=	evdev
+-  olpc		=	evdev
+-  macintosh_hhk	=	macintosh(hhk)
+-  macintosh_old	=	macintosh(old)
+- $macbooks	=	macintosh+macintosh(goodmap)
+- $macs   	=	macintosh
+-  *		=	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)
+-  winbook	=	winbook(XP5)
+-  pc98		=	nec(pc98)
+- $macbooks      =       macintosh(%m)
+- $macs		=	macintosh(macintosh)
+-  hhk		=	hhk(basic)
+-  kinesis	=	kinesis(model100)
+-  *		=       pc(pc104)
+-
+-! model		layout		variant		=	symbols
+-  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
+-  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)
+-  sun4		$nonlatin		=	latin+sun_vndr/us(sun4)+%l%(v):2
+-  sun4		*			=	latin+sun_vndr/us(sun4)+%l%(v)
+-  sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
+-  sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
+-  sun6		us			=	pc+sun_vndr/us(type6)
+-  sun6		en_US			=	pc+sun_vndr/us(type6)+iso9995-3(basic)
+-  sun6		*			=	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
+-  thinkpad   	br			=	pc+br(thinkpad)
+-  *	   	$nonlatin		=	pc+us+%l%(v):2
+-  *		*			=	pc+%l%(v)
+-
+-! model		layout[1]			=	symbols
+-  ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
+-  amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+-  sun4		*			=	latin+sun_vndr/us(sun4)+%l[1]%(v[1])
+-  sun5		*			=	latin+sun_vndr/us(sun5)+%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
+-
+-! layout[2]	=	symbols
+-  *		=	+%l[2]%(v[2]):2
+-
+-! layout[3]	=	symbols
+-  *		=	+%l[3]%(v[3]):3
+-
+-! layout[4]	=	symbols
+-  *		=	+%l[4]%(v[4]):4
+-
+-! layout[2]	variant[2]	=	symbols
+-
+-! layout[3]	variant[3]	=	symbols
+-
+-! layout[4]	variant[4]	=	symbols
+-
+-! model		=	symbols
+-  $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)
+-
+-! model		layout		=	compat
+-  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	=	+group(caps_toggle)
+-  grp:shift_caps_toggle	=	+group(shift_caps_toggle)
+-  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: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:grouplock	=	+capslock(grouplock)
+-  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)
+-  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_wang         =	+keypad(future_wang)
+-  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)
+-  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)
+Index: xkb-data/rules/base.lst
+===================================================================
+--- xkb-data.orig/rules/base.lst	2008-01-05 00:37:24.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,643 +0,0 @@
+-! model
+-  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
+-  dellusbmm       Dell USB Multimedia Keybard
+-  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_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
+-  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
+-  logiaccess      Logitech Access Keyboard
+-  logiclx300      Logitech Cordless Desktop LX-300
+-  logicd          Logitech Cordless Desktop
+-  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
+-  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
+-  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
+-  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
+-  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
+-  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
+-  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
+-  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
+-  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-da         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
+-  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
+-  thinkpad        br: Thinkpad
+-  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
+-  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
+-  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: (Legacy) 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
+-  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
+-  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)
+-  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
+-  comma           ro: Commabelow
+-  std_comma       ro: Standard (Commabelow)
+-  std_cedilla     ro: Standard (Cedilla)
+-  winkeys         ro: Winkeys
+-  phonetic        ru: Phonetic
+-  typewriter      ru: Typewriter
+-  winkeys         ru: Winkeys
+-  tt              ru: Tatar
+-  os              ru: Ossetian
+-  os_winkeys      ru: Ossetian, Winkeys
+-  cv              ru: Chuvash
+-  cv_latin        ru: Chuvash Latin
+-  udm             ru: Udmurt
+-  kom             ru: Komi
+-  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
+-  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
+-  intl            gb: International (with dead keys)
+-  dvorak          gb: Dvorak
+-  mac             gb: Macintosh
+-  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: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: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.
+-  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: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:shift_lock      CapsLock just locks the Shift modifier.
+-  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.
+-  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
+-  japan                Japanese keyboard options
+-  japan:kana_lock      Kana Lock key is locking
+-  japan:nicola_f_bs    NICOLA-F style Backspace
+Index: xkb-data/rules/compat/base.l2_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.l2_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,67 +0,0 @@
+-  ar		=	+ara%(v[2]):2
+-  ben		=	+in(ben)%(v[2]):2
+-  bs		=	+ba%(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
+-  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
+-  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
+Index: xkb-data/rules/compat/base.l2v2_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.l2v2_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,41 +0,0 @@
+-  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
+-  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
+-  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
+Index: xkb-data/rules/compat/base.l3_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.l3_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,67 +0,0 @@
+-  ar		=	+ara%(v[3]):3
+-  ben		=	+in(ben)%(v[3]):3
+-  bs		=	+ba%(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
+-  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
+-  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
+Index: xkb-data/rules/compat/base.l3v3_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.l3v3_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,41 +0,0 @@
+-  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
+-  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
+-  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
+Index: xkb-data/rules/compat/base.l4_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.l4_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,67 +0,0 @@
+-  ar		=	+ara%(v[4]):4
+-  ben		=	+in(ben)%(v[4]):4
+-  bs		=	+ba%(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
+-  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
+-  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
+Index: xkb-data/rules/compat/base.l4v4_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.l4v4_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,41 +0,0 @@
+-  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
+-  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
+-  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
+Index: xkb-data/rules/compat/base.ml1_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.ml1_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,67 +0,0 @@
+-  *		ar			=	pc+ara%(v[1])
+-  *		ben			=	pc+in(ben)%(v[1])
+-  *		bs			=	pc+ba%(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)
+-  *		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)
+-  *		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)
+Index: xkb-data/rules/compat/base.ml1v1_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.ml1v1_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,41 +0,0 @@
+-  *		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)
+-  *		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)
+-  *		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)
+Index: xkb-data/rules/compat/base.ml_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.ml_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,67 +0,0 @@
+-  *		ar			=	pc+ara
+-  *		ben			=	pc+in(ben)
+-  *		bs			=	pc+ba
+-  *		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)
+-  *		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)
+-  *		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)
+Index: xkb-data/rules/compat/base.mlv_s.part
+===================================================================
+--- xkb-data.orig/rules/compat/base.mlv_s.part	2008-01-05 00:22:37.000000000 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,41 +0,0 @@
+-  *		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)
+-  *		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)
+-  *		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)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/patches/unicode_symbols.diff
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/patches/unicode_symbols.diff
@@ -0,0 +1,28 @@
+Index: xkeyboard-config-1.1~cvs.20080104.1/symbols/gn
+===================================================================
+--- xkeyboard-config-1.1~cvs.20080104.1.orig/symbols/gn
++++ xkeyboard-config-1.1~cvs.20080104.1/symbols/gn
+@@ -11,8 +11,8 @@
+     key <AE01>	{ [0x010007F1, 0x010007C1 ]	};
+     key <AE02>	{ [0x010007EB, 0x010007C2 ]	};
+     key <AE03>	{ [0x010007F5, 0x010007C3,  numbersign,     sterling ]	};
+-    key <AE04>	{ [0x010007F4, 0x010007C4, 0x010002E1C,       dollar ]	};
+-    key <AE05>	{ [ parenleft, 0x010007C5, 0x010002E1D				 ]	};
++    key <AE04>	{ [0x010007F4, 0x010007C4,  0x01002E1C,       dollar ]	};
++    key <AE05>	{ [ parenleft, 0x010007C5,  0x01002E1D				 ]	};
+     key <AE06>	{ [     minus, 0x010007C6,         bar				 ]	};
+     key <AE07>	{ [0x010007EC, 0x010007C7,       grave				 ]	};
+     key <AE08>	{ [0x010007FA, 0x010007C8,   backslash				 ]	};
+Index: xkeyboard-config-1.1~cvs.20080104.1/symbols/ng
+===================================================================
+--- xkeyboard-config-1.1~cvs.20080104.1.orig/symbols/ng
++++ xkeyboard-config-1.1~cvs.20080104.1/symbols/ng
+@@ -97,7 +97,7 @@
+    key <AC06>  { [         h,          H,    0x1001EE5,               0x1001EE4 ] }; // U with dot below
+    key <AC07>  { [         j,          J,    0x1001ECB,               0x1001ECA ] }; // I with dot below
+    key <AC08>  { [         k,          K,    0x1000199,               0x1000198 ] }; // K with hook
+-   key <AC09>  { [         l,          L,    0x10001E37,       0x1001E36 ] }; // L with dot below
++   key <AC09>  { [         l,          L,    0x1001E37,        0x1001E36 ] }; // L with dot below
+    key <AC10>  { [ semicolon,      colon,    masculine,      ordfeminine ] };
+    key <AC11>  { [ apostrophe,  quotedbl,     currency,         currency ] };
+    key <BKSL>  { [ backslash,        bar,      section,          section ] };
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/keymap.dir
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/keymap.dir
@@ -0,0 +1,354 @@
+-------- -------- amiga(de)
+-d------ -------- amiga(usa1)
+-------- -------- ataritt(de)
+-d------ -------- ataritt(us)
+-------- -------- digital_vndr/us(lk201)
+-------- -------- digital_vndr/us(lk401)
+-------- -------- digital_vndr/us(lk411)
+-------- -------- digital_vndr/us(lk421)
+-------- -------- digital_vndr/us(lk441)
+-------- -------- digital_vndr/us(lk443)
+-------- -------- digital_vndr/us(lk44x)
+-------- -------- digital_vndr/us(lk450)
+-------- -------- digital_vndr/us(mnk)
+-------- -------- digital_vndr/us(pcxal)
+-------- -------- digital_vndr/us(pcxalaa)
+-------- -------- digital_vndr/us(pcxalfa)
+-------- -------- digital_vndr/us(pcxalga)
+-------- -------- digital_vndr/us(pcxalka)
+-d------ -------- macintosh(macintosh)
+-------- -------- macintosh(macintosh_old)
+-------- -------- sgi_vndr/be(indigo)
+-------- -------- sgi_vndr/be(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/be(indy)
+-------- -------- sgi_vndr/be(indy_nodeadkeys)
+-------- -------- sgi_vndr/bg(indigo)
+-d------ -------- sgi_vndr/bg(indy)
+-------- -------- sgi_vndr/ca(indigo)
+-------- -------- sgi_vndr/ca(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/ca(indy)
+-------- -------- sgi_vndr/ca(indy_nodeadkeys)
+-------- -------- sgi_vndr/ch(de_indigo)
+-------- -------- sgi_vndr/ch(de_indigo_nodeadkeys)
+-d------ -------- sgi_vndr/ch(de_indy)
+-------- -------- sgi_vndr/ch(de_indy_nodeadkeys)
+-------- -------- sgi_vndr/ch(fr_indigo)
+-------- -------- sgi_vndr/ch(fr_indigo_nodeadkeys)
+-------- -------- sgi_vndr/ch(fr_indy)
+-------- -------- sgi_vndr/ch(fr_indy_nodeadkeys)
+-------- -------- sgi_vndr/cz(indigo)
+-------- -------- sgi_vndr/cz(indigo_qwerty)
+-d------ -------- sgi_vndr/cz(indy)
+-------- -------- sgi_vndr/cz(indy_qwerty)
+-------- -------- sgi_vndr/de(indigo)
+-------- -------- sgi_vndr/de(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/de(indy)
+-------- -------- sgi_vndr/de(indy_nodeadkeys)
+-------- -------- sgi_vndr/dk(indigo)
+-------- -------- sgi_vndr/dk(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/dk(indy)
+-------- -------- sgi_vndr/dk(indy_nodeadkeys)
+-------- -------- sgi_vndr/dvorak(indigo)
+-d------ -------- sgi_vndr/dvorak(indy)
+-------- -------- sgi_vndr/es(indigo)
+-------- -------- sgi_vndr/es(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/es(indy)
+-------- -------- sgi_vndr/es(indy_nodeadkeys)
+-------- -------- sgi_vndr/fi(indigo)
+-------- -------- sgi_vndr/fi(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/fi(indy)
+-------- -------- sgi_vndr/fi(indy_nodeadkeys)
+-------- -------- sgi_vndr/fr(indigo)
+-------- -------- sgi_vndr/fr(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/fr(indy)
+-------- -------- sgi_vndr/fr(indy_nodeadkeys)
+-------- -------- sgi_vndr/gb(indigo)
+-------- -------- sgi_vndr/gb(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/gb(indy)
+-------- -------- sgi_vndr/gb(indy_nodeadkeys)
+-------- -------- sgi_vndr/hu(indigo)
+-------- -------- sgi_vndr/hu(indigo_caps_toggle)
+-------- -------- sgi_vndr/hu(indigo_ctrl_alt_toggle)
+-------- -------- sgi_vndr/hu(indigo_ctrl_shift_toggle)
+-------- -------- sgi_vndr/hu(indigo_shift_toggle)
+-------- -------- sgi_vndr/hu(indigo_toggle)
+-d------ -------- sgi_vndr/hu(indy)
+-------- -------- sgi_vndr/hu(indy_caps_toggle)
+-------- -------- sgi_vndr/hu(indy_ctrl_alt_toggle)
+-------- -------- sgi_vndr/hu(indy_ctrl_shift_toggle)
+-------- -------- sgi_vndr/hu(indy_shift_toggle)
+-------- -------- sgi_vndr/hu(indy_toggle)
+-------- -------- sgi_vndr/it(indigo)
+-------- -------- sgi_vndr/it(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/it(indy)
+-------- -------- sgi_vndr/it(indy_nodeadkeys)
+-d------ -------- sgi_vndr/jp(indy)
+-------- -------- sgi_vndr/no(indigo)
+-------- -------- sgi_vndr/no(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/no(indy)
+-------- -------- sgi_vndr/no(indy_nodeadkeys)
+-------- -------- sgi_vndr/pl(indigo)
+-------- -------- sgi_vndr/pl(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/pl(indy)
+-------- -------- sgi_vndr/pl(indy_nodeadkeys)
+-------- -------- sgi_vndr/pt(indigo)
+-------- -------- sgi_vndr/pt(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/pt(indy)
+-------- -------- sgi_vndr/pt(indy_nodeadkeys)
+-------- -------- sgi_vndr/ru(indigo)
+-------- -------- sgi_vndr/ru(indigo_caps_toggle)
+-------- -------- sgi_vndr/ru(indigo_ctrl_alt_toggle)
+-------- -------- sgi_vndr/ru(indigo_ctrl_shift_toggle)
+-------- -------- sgi_vndr/ru(indigo_shift_toggle)
+-------- -------- sgi_vndr/ru(indigo_toggle)
+-d------ -------- sgi_vndr/ru(indy)
+-------- -------- sgi_vndr/ru(indy_caps_toggle)
+-------- -------- sgi_vndr/ru(indy_ctrl_alt_toggle)
+-------- -------- sgi_vndr/ru(indy_ctrl_shift_toggle)
+-------- -------- sgi_vndr/ru(indy_shift_toggle)
+-------- -------- sgi_vndr/ru(indy_toggle)
+-------- -------- sgi_vndr/se(indigo)
+-------- -------- sgi_vndr/se(indigo_nodeadkeys)
+-d------ -------- sgi_vndr/se(indy)
+-------- -------- sgi_vndr/se(indy_nodeadkeys)
+-------- -------- sgi_vndr/sk(indigo)
+-------- -------- sgi_vndr/sk(indigo_qwerty)
+-d------ -------- sgi_vndr/sk(indy)
+-------- -------- sgi_vndr/sk(indy_qwerty)
+-------- -------- sgi_vndr/th(indigo)
+-d------ -------- sgi_vndr/th(indy)
+-------- -------- sgi_vndr/us(indigo)
+-------- -------- sgi_vndr/us(indigo101_compose)
+-------- -------- sgi_vndr/us(indigo_compose)
+-d------ -------- sgi_vndr/us(indy)
+-------- -------- sgi_vndr/us(indy101_euro)
+-------- -------- sgi_vndr/us(indy_compose)
+-------- -------- sony(news5000-nwp5461)
+-------- -------- sun_vndr/all(Belgian6)
+-------- -------- sun_vndr/all(Belgian6_usb)
+-------- -------- sun_vndr/all(Canada4)
+-------- -------- sun_vndr/all(Canada_Fr5)
+-------- -------- sun_vndr/all(Canada_Fr5_Hobo)
+-------- -------- sun_vndr/all(Canada_Fr5_TBITS5)
+-------- -------- sun_vndr/all(Canada_Fr_x86)
+-------- -------- sun_vndr/all(Czech5)
+-------- -------- sun_vndr/all(Denmark4)
+-------- -------- sun_vndr/all(Denmark5)
+-------- -------- sun_vndr/all(Denmark5_Hobo)
+-------- -------- sun_vndr/all(Denmark6)
+-------- -------- sun_vndr/all(Denmark6_usb)
+-------- -------- sun_vndr/all(Denmark_x86)
+-------- -------- sun_vndr/all(Finnish6)
+-------- -------- sun_vndr/all(Finnish6_usb)
+-------- -------- sun_vndr/all(France5)
+-------- -------- sun_vndr/all(France5_Hobo)
+-------- -------- sun_vndr/all(France6)
+-------- -------- sun_vndr/all(France6_usb)
+-------- -------- sun_vndr/all(FranceBelg4)
+-------- -------- sun_vndr/all(France_x86)
+-------- -------- sun_vndr/all(Germany4)
+-------- -------- sun_vndr/all(Germany5)
+-------- -------- sun_vndr/all(Germany5_Hobo)
+-------- -------- sun_vndr/all(Germany6)
+-------- -------- sun_vndr/all(Germany6_usb)
+-------- -------- sun_vndr/all(Germany_x86)
+-------- -------- sun_vndr/all(Greece5)
+-------- -------- sun_vndr/all(Hungary5)
+-------- -------- sun_vndr/all(Italy4)
+-------- -------- sun_vndr/all(Italy5)
+-------- -------- sun_vndr/all(Italy5_Hobo)
+-------- -------- sun_vndr/all(Italy6)
+-------- -------- sun_vndr/all(Italy6_usb)
+-------- -------- sun_vndr/all(Italy_x86)
+-------- -------- sun_vndr/all(J3100)
+-------- -------- sun_vndr/all(Japan4)
+-------- -------- sun_vndr/all(Japan5)
+-------- -------- sun_vndr/all(Japan5_Hobo)
+-------- -------- sun_vndr/all(Japan6)
+-------- -------- sun_vndr/all(Japan6_usb)
+-------- -------- sun_vndr/all(Japan_Muhenkan_x86)
+-------- -------- sun_vndr/all(Japan_x86)
+-------- -------- sun_vndr/all(Korea4)
+-------- -------- sun_vndr/all(Korea5)
+-------- -------- sun_vndr/all(Korea5_Hobo)
+-------- -------- sun_vndr/all(Korea6)
+-------- -------- sun_vndr/all(Korea6_usb)
+-------- -------- sun_vndr/all(Korea_x86)
+-------- -------- sun_vndr/all(Latvia5)
+-------- -------- sun_vndr/all(Lithuania5)
+-------- -------- sun_vndr/all(MS_US101A_x86)
+-------- -------- sun_vndr/all(Netherland4)
+-------- -------- sun_vndr/all(Netherland5)
+-------- -------- sun_vndr/all(Netherland5_Hobo)
+-------- -------- sun_vndr/all(Netherland6)
+-------- -------- sun_vndr/all(Netherland6_usb)
+-------- -------- sun_vndr/all(Netherland_x86)
+-------- -------- sun_vndr/all(Norway4)
+-------- -------- sun_vndr/all(Norway5)
+-------- -------- sun_vndr/all(Norway5_Hobo)
+-------- -------- sun_vndr/all(Norway6)
+-------- -------- sun_vndr/all(Norway6_usb)
+-------- -------- sun_vndr/all(Norway_x86)
+-------- -------- sun_vndr/all(Poland5)
+-------- -------- sun_vndr/all(Portugal4)
+-------- -------- sun_vndr/all(Portugal5)
+-------- -------- sun_vndr/all(Portugal5_Hobo)
+-------- -------- sun_vndr/all(Portugal6)
+-------- -------- sun_vndr/all(Portugal6_usb)
+-------- -------- sun_vndr/all(Portugal_x86)
+-------- -------- sun_vndr/all(Russia5)
+-------- -------- sun_vndr/all(Russia6)
+-------- -------- sun_vndr/all(Russia6_usb)
+-------- -------- sun_vndr/all(Spain5)
+-------- -------- sun_vndr/all(Spain5_Hobo)
+-------- -------- sun_vndr/all(Spain6)
+-------- -------- sun_vndr/all(Spain6_usb)
+-------- -------- sun_vndr/all(SpainLatAm4)
+-------- -------- sun_vndr/all(Spain_x86)
+-------- -------- sun_vndr/all(Sweden5)
+-------- -------- sun_vndr/all(Sweden5_Hobo)
+-------- -------- sun_vndr/all(Sweden6)
+-------- -------- sun_vndr/all(Sweden6_usb)
+-------- -------- sun_vndr/all(SwedenFin4)
+-------- -------- sun_vndr/all(Sweden_x86)
+-------- -------- sun_vndr/all(Switzer_Fr4)
+-------- -------- sun_vndr/all(Switzer_Fr5)
+-------- -------- sun_vndr/all(Switzer_Fr5_Hobo)
+-------- -------- sun_vndr/all(Switzer_Fr6)
+-------- -------- sun_vndr/all(Switzer_Fr6_usb)
+-------- -------- sun_vndr/all(Switzer_Fr_x86)
+-------- -------- sun_vndr/all(Switzer_Ge4)
+-------- -------- sun_vndr/all(Switzer_Ge5)
+-------- -------- sun_vndr/all(Switzer_Ge5_Hobo)
+-------- -------- sun_vndr/all(Switzer_Ge6)
+-------- -------- sun_vndr/all(Switzer_Ge6_usb)
+-------- -------- sun_vndr/all(Switzer_Ge_x86)
+-------- -------- sun_vndr/all(Taiwan4)
+-------- -------- sun_vndr/all(Taiwan5)
+-------- -------- sun_vndr/all(Taiwan5_Hobo)
+-------- -------- sun_vndr/all(Taiwan6)
+-------- -------- sun_vndr/all(Taiwan6_usb)
+-------- -------- sun_vndr/all(Taiwan_x86)
+-------- -------- sun_vndr/all(Turkey5)
+-------- -------- sun_vndr/all(Turkey6)
+-------- -------- sun_vndr/all(Turkey6_usb)
+-------- -------- sun_vndr/all(TurkeyF6)
+-------- -------- sun_vndr/all(TurkeyF6_usb)
+-------- -------- sun_vndr/all(TurkeyQ6)
+-------- -------- sun_vndr/all(TurkeyQ6_usb)
+-------- -------- sun_vndr/all(UK4)
+-------- -------- sun_vndr/all(UK5)
+-------- -------- sun_vndr/all(UK5_Hobo)
+-------- -------- sun_vndr/all(UK6)
+-------- -------- sun_vndr/all(UK6_usb)
+-------- -------- sun_vndr/all(UK_x86)
+-------- -------- sun_vndr/all(US101A_PC)
+-------- -------- sun_vndr/all(US101A_Sun)
+-------- -------- sun_vndr/all(US101A_x86)
+-------- -------- sun_vndr/all(US4)
+-------- -------- sun_vndr/all(US5)
+-------- -------- sun_vndr/all(US5_Hobo)
+-------- -------- sun_vndr/all(US6)
+-------- -------- sun_vndr/all(US6_usb)
+-------- -------- sun_vndr/all(US_UNIX5)
+-------- -------- sun_vndr/all(US_UNIX5_Hobo)
+-------- -------- sun_vndr/all(US_UNIX6)
+-------- -------- sun_vndr/all(US_UNIX6_usb)
+-------- -------- sun_vndr/de(type4_de)
+-------- -------- sun_vndr/de(type4_de_nodeadkeys)
+-------- -------- sun_vndr/de(type4_de_openlook)
+-d------ -------- sun_vndr/de(type5_de)
+-------- -------- sun_vndr/de(type5_de_nodeadkeys)
+-------- -------- sun_vndr/de(type5_de_openlook)
+-------- -------- sun_vndr/es(type4_es)
+-------- -------- sun_vndr/es(type4_es_openlook)
+-d------ -------- sun_vndr/es(type5_es)
+-------- -------- sun_vndr/es(type5_es_openlook)
+-------- -------- sun_vndr/fi(type4_fi)
+-------- -------- sun_vndr/fi(type4_fi_openlook)
+-d------ -------- sun_vndr/fi(type5_fi)
+-------- -------- sun_vndr/fi(type5_fi_openlook)
+-------- -------- sun_vndr/fr(type4_fr)
+-------- -------- sun_vndr/fr(type4_fr_openlook)
+-d------ -------- sun_vndr/fr(type5_fr)
+-------- -------- sun_vndr/fr(type5_fr_openlook)
+-------- -------- sun_vndr/no(type4_no)
+-------- -------- sun_vndr/no(type4_no_openlook)
+-d------ -------- sun_vndr/no(type5_no)
+-------- -------- sun_vndr/no(type5_no_openlook)
+-------- -------- sun_vndr/pl(type4_pl)
+-------- -------- sun_vndr/pl(type4_pl_openlook)
+-d------ -------- sun_vndr/pl(type5_pl)
+-------- -------- sun_vndr/pl(type5_pl_openlook)
+-------- -------- sun_vndr/ru(type4_ru)
+-------- -------- sun_vndr/ru(type4_ru_openlook)
+-d------ -------- sun_vndr/ru(type5_ru)
+-------- -------- sun_vndr/ru(type5_ru_openlook)
+-------- -------- sun_vndr/se(type4_se)
+-------- -------- sun_vndr/se(type4_se_fixdollar)
+-------- -------- sun_vndr/se(type4_se_fixdollar_swapctl)
+-------- -------- sun_vndr/se(type5_se)
+-------- -------- sun_vndr/se(type5c_se)
+-d------ -------- sun_vndr/se(type5c_se_fixdollar)
+-------- -------- sun_vndr/uk(type4_uk)
+-------- -------- sun_vndr/uk(type4_uk_openlook)
+-d------ -------- sun_vndr/uk(type5_uk)
+-------- -------- sun_vndr/uk(type5_uk_openlook)
+-------- -------- sun_vndr/us(type4_us)
+-------- -------- sun_vndr/us(type4_us_openlook)
+-------- -------- sun_vndr/us(type5_unix)
+-------- -------- sun_vndr/us(type5_unix_openlook)
+-d------ -------- sun_vndr/us(type5_us)
+-------- -------- sun_vndr/us(type5_us_openlook)
+-------- -------- xfree86(ar)
+-------- -------- xfree86(be)
+-------- -------- xfree86(bg)
+-------- -------- xfree86(br)
+-------- -------- xfree86(ch_de)
+-------- -------- xfree86(ch_fr)
+-------- -------- xfree86(cz)
+-------- -------- xfree86(cz_qwerty)
+-------- -------- xfree86(de)
+-------- -------- xfree86(de_CH)
+-------- -------- xfree86(dk)
+-------- -------- xfree86(dvorak)
+-------- -------- xfree86(en_US)
+-------- -------- xfree86(es)
+-------- -------- xfree86(fr)
+-------- -------- xfree86(fr-latin9)
+-------- -------- xfree86(fr_CA)
+-------- -------- xfree86(fr_CH)
+-------- -------- xfree86(gb)
+-------- -------- xfree86(hr)
+-------- -------- xfree86(it)
+-------- -------- xfree86(jp106)
+-------- -------- xfree86(lt)
+-------- -------- xfree86(lt_std)
+-------- -------- xfree86(lv)
+-------- -------- xfree86(mk)
+-------- -------- xfree86(mt)
+-------- -------- xfree86(mt_us)
+-------- -------- xfree86(no)
+-------- -------- xfree86(pl)
+-------- -------- xfree86(pt)
+-------- -------- xfree86(ro)
+-------- -------- xfree86(ro_microsoft)
+-------- -------- xfree86(ru)
+-------- -------- xfree86(se_FI)
+-------- -------- xfree86(se_SE)
+-------- -------- xfree86(sk)
+-------- -------- xfree86(sk_qwerty)
+-------- -------- xfree86(sl)
+-------- -------- xfree86(sl_SI)
+-------- -------- xfree86(syr)
+-------- -------- xfree86(th)
+-------- -------- xfree86(th_pat)
+-------- -------- xfree86(th_tis)
+-------- -------- xfree86(tr)
+-------- -------- xfree86(uk)
+-d------ -------- xfree86(us)
+-------- -------- xfree86(us_flexpro)
+-------- -------- xfree86(us_intl)
+-------- -------- xfree86(us_microsoft)
+-------- -------- xfree86(uz)
+-d------ -------- xfree98(jp)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/types.dir
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/types.dir
@@ -0,0 +1,18 @@
+-d------ -------- basic(basic)
+-dp----- -------- cancel(Shift_Cancels_Caps)
+--p----- -------- caps(internal)
+--p----- -------- caps(internal_nocancel)
+--p----- -------- caps(shift)
+--p----- -------- caps(shift_nocancel)
+-d------ -------- complete(complete)
+-d------ -------- default(default)
+-dp----- -------- extra(default)
+--p----- -------- extra(keypad)
+--p----- -------- extra(mac_keypad)
+-dp----- -------- iso9995(default)
+-dp----- -------- level5(default)
+-dp----- -------- mousekeys(default)
+--p----- -------- numpad(mac)
+--p----- -------- numpad(microsoft)
+-dp----- -------- numpad(pc)
+-dp----- -------- pc(default)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/compat.dir
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/compat.dir
@@ -0,0 +1,28 @@
+-dp----- -------- accessx(basic)
+--p----- -------- accessx(full)
+-d------ -------- basic(basic)
+-d------ -------- complete(complete)
+-d------ -------- default(default)
+-dp----- -------- iso9995(default)
+-dp----- -------- japan(japan)
+--p----- -------- japan(kana_lock)
+h-p----- -------- keypad(overlay)
+h-p----- -------- keypad(overlay1)
+h-p----- -------- keypad(overlay2)
+-dp----- -------- ledcaps(caps_lock)
+--p----- -------- ledcaps(group_lock)
+--p----- -------- ledcaps(shift_lock)
+--p----- -------- lednum(group_lock)
+-dp----- -------- lednum(num_lock)
+--p----- -------- lednum(shift_lock)
+--p----- -------- ledscroll(group_lock)
+-dp----- -------- ledscroll(scroll_lock)
+--p----- -------- ledscroll(shift_lock)
+-dp----- -------- level5(default)
+-dp----- -------- misc(misc)
+-dp----- -------- mousekeys(mousekeys)
+-dp----- -------- norepeat(norepeat)
+-dp----- -------- pc(pc)
+-d------ -------- pc98(basic)
+-dp----- -------- xfree86(basic)
+-d------ -------- xtest(xtest)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/watch
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://xlibs.freedesktop.org/xkbdesc/ xkeyboard-config-(.*)\.tar\.gz
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/geometry.dir
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/geometry.dir
@@ -0,0 +1,99 @@
+-------- -------- amiga(de)
+-d------ -------- amiga(usa1)
+-------- -------- ataritt(de)
+-d------ -------- ataritt(us)
+-d------ -------- chicony(us)
+-d------ -------- dell(dell101)
+-------- -------- digital_vndr/lk(lk201)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/lk(lk401bj)
+-------- -------- digital_vndr/lk(lk401jj)
+-------- -------- digital_vndr/lk(lk450)
+--p----- -------- digital_vndr/pc(common)
+--p----- -------- digital_vndr/pc(leds_alone)
+--p----- -------- digital_vndr/pc(leds_on_keys)
+-------- -------- digital_vndr/pc(pc101)
+-------- -------- digital_vndr/pc(pc102)
+-------- -------- digital_vndr/pc(pcxaj)
+-------- -------- digital_vndr/unix(lk421jj)
+-------- -------- digital_vndr/unix(unix)
+-d------ -------- everex(STEPnote)
+-d------ -------- fujitsu(138)
+-------- -------- fujitsu(140)
+h-p----- -------- hhk(basic)
+-------- -------- hhk(jp1)
+-------- -------- hhk(jp2)
+-------- -------- hhk(jp3)
+-------- -------- hhk(jp4)
+-d------ -------- hhk(win1)
+-------- -------- hhk(win2)
+-------- -------- hhk(win3)
+-------- -------- hhk(win4)
+-------- -------- hp(hil)
+-------- -------- hp(omnibook)
+-------- -------- hp(omnibook_intl)
+-d------ -------- hp(pc101)
+-d------ -------- keytronic(FlexPro)
+-d------ -------- kinesis(model100)
+-------- -------- macintosh(applepro)
+-------- -------- macintosh(macbook78)
+-------- -------- macintosh(macbook79)
+-d------ -------- macintosh(macintosh)
+-d------ -------- microsoft(natural)
+-d------ -------- nec(pc98)
+-d------ -------- northgate(omnikey101)
+-------- -------- pc(abnt2)
+-------- -------- pc(jp106)
+-------- -------- pc(kr106)
+-------- -------- pc(latitude)
+-d------ -------- pc(pc101)
+-------- -------- pc(pc102)
+-------- -------- pc(pc104)
+-------- -------- pc(pc105)
+-------- -------- pc(pc86)
+-------- -------- sgi_vndr/O2(jp106)
+-d------ -------- sgi_vndr/O2(pc101)
+-------- -------- sgi_vndr/O2(pc102)
+-d------ -------- sgi_vndr/indigo(pc101)
+-------- -------- sgi_vndr/indigo(pc102)
+-------- -------- sgi_vndr/indy(jp106)
+-d------ -------- sgi_vndr/indy(pc101)
+-------- -------- sgi_vndr/indy(pc102)
+-d------ -------- sony(nwp5461)
+-------- -------- sun(MS_x86)
+-------- -------- sun(t5)
+-------- -------- sun(t5hobo)
+-------- -------- sun(t5jp)
+-------- -------- sun(t5jphobo)
+-------- -------- sun(t5tuv)
+-------- -------- sun(t5tuvhobo)
+-------- -------- sun(t5unix)
+-------- -------- sun(t6)
+-------- -------- sun(t6jp)
+-------- -------- sun(t6tuv)
+-------- -------- sun(t6unix)
+-------- -------- sun(type4)
+-------- -------- sun(type4_ca)
+-------- -------- sun(type4_se)
+-------- -------- sun(type4jp)
+-------- -------- sun(type4tuv)
+-------- -------- sun(type5)
+-------- -------- sun(type5_se)
+-------- -------- sun(type5c_se)
+-------- -------- sun(type5euro)
+-------- -------- sun(type5hobo)
+-------- -------- sun(type5jp)
+-------- -------- sun(type5jphobo)
+-------- -------- sun(type5tuv)
+-------- -------- sun(type5tuvhobo)
+-------- -------- sun(type5unix)
+-d------ -------- sun(type6)
+-------- -------- sun(type6jp)
+-------- -------- sun(type6tuv)
+-------- -------- sun(type6unix)
+-------- -------- sun(x86)
+-------- -------- sun(x86tuv)
+-------- -------- thinkpad(common)
+-------- -------- thinkpad(intl)
+-------- -------- thinkpad(us)
+-d------ -------- winbook(XP5)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/changelog.Ubuntu
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/changelog.Ubuntu
@@ -0,0 +1,191 @@
+xkeyboard-config (0.8-7ubuntu2) edgy; urgency=low
+
+  * Actually move all the files from xkeyboard-config to xkb-data (closes:
+    Malone #59220).
+  * Version xkeyboard-config's dependency on xkb-data to avoid files going
+    missing.
+  * Fix typo in xkeyboard-config's description.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 10 Sep 2006 14:30:46 +0100
+
+xkeyboard-config (0.8-7ubuntu1) edgy; urgency=low
+
+  * Rename binary package to xkb-data to match Debian.
+  * Add transitional package for xkeyboard-config.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed,  5 Jul 2006 15:08:24 +0200
+
+xkeyboard-config (0.8-7) dapper; urgency=low
+
+  * Grab Kurdish keymaps from upstream.  Malone: #30361
+  * Nuke /etc/X11/xkb/symbols/pc if it's a directory.  This is
+    kinda-wrong, but leaving it around is worse.  Malone #23083. 
+  * Add Spanish translation from upstream CVS.  Malone #22424
+  * Add LSGT to keycodes/evdev.  Malone: #42846
+  * Remove Daniel from maintainer field in control file.  
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Thu, 18 May 2006 09:43:43 +0200
+
+xkeyboard-config (0.8-6) dapper; urgency=low
+
+  * debian/rules: Generate a POT file. Closes: LP##35407.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri,  7 Apr 2006 09:57:49 +0200
+
+xkeyboard-config (0.8-5) dapper; urgency=low
+
+  * Experimentally remove the default Shift-NumLock=>Pointer_EnableKeys
+    (aka MouseKeys) policy so that NumLock works on ThinkPads (which send
+    Shift+NumLock).  If this causes problems for a large number of people
+    it can be investigated.  [Malone: #35080]
+
+ -- Paul Sladen <ubuntu@paul.sladen.org>  Sat, 25 Mar 2006 16:00:17 +0000
+
+xkeyboard-config (0.8-4) dapper; urgency=low
+
+  * symbols/group:
+    - patch from the CVS to fix the ralt issue (Ubuntu :#35845)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 24 Mar 2006 01:28:57 +0100
+
+xkeyboard-config (0.8-3) dapper; urgency=low
+
+  [ Tollef Fog Heen ]
+  * Add missing descriptions for Logitech iTouch Internet Navigator
+    Keyboard SE and same + USB, added in upstream CVS (Malone: #29470)
+
+  [ Sebastien Bacher ]
+  * symbols/level3, types/pc: 
+    - CVS patch to fix some of the issues with "compose:ralt" (Ubuntu:
+    #35845)
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Thu, 23 Mar 2006 10:55:02 +0100
+
+xkeyboard-config (0.8-2) dapper; urgency=low
+
+  * Rename the korean symbols file to kr since it's a South Korean
+    keyboard layout.
+  * Add missing include "us" for hr(us).
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Tue, 21 Mar 2006 11:56:38 +0100
+
+xkeyboard-config (0.8-1) dapper; urgency=low
+
+  * New upstream release
+    - Fixes group switching (Malone: #21595)
+  * Add Korean symbols file.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Thu, 16 Mar 2006 14:55:09 +0100
+
+xkeyboard-config (0.6-11) dapper; urgency=low
+
+  * Make sure compose:caps is actually there.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Sun, 26 Feb 2006 14:43:59 +0100
+
+xkeyboard-config (0.6-10) dapper; urgency=low
+
+  * Change dependency on x-common to x11-common.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Thu, 19 Jan 2006 18:39:16 +1100
+
+xkeyboard-config (0.6-9) dapper; urgency=low
+
+  * Respin to get compose:caps back (suspect timestamp hilarity with
+    rules/base, ugh; closes: Ubuntu#20484).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 12 Dec 2005 15:16:36 +1100
+
+xkeyboard-config (0.6-8) dapper; urgency=low
+
+  * Add de_CH -> ch(de) and fr_CH -> ch(fr) mappings.
+  * Add level3(ralt_switch_for_alts_toggle), which maps RALT to
+    [ l3switch, group_next ], which is the desired behaviour for a three-level
+    keyboard with multiple layouts present (see below).
+  * Add list of layouts which use third/fourth levels to base.lists.part.
+  * Add l[x] + o -> s mappings for all four levels; for all three-level
+    layouts, map grp:alts_toggle -> level3(ralt_switch_for_alts_toggle) for
+    that group only.  Note that this precludes (sensibly) adding layouts
+    which use a different key than RALT for the l3 switcher to
+    $threelevellayouts, although this is only cosmetic (closes: Ubuntu#15372).
+  * Adjust altwin(meta_win) to cope with this; only modify the first level of
+    LALT and RALT.
+  * Only modify the first level in compose(ralt).
+  * Bind Alt_R to Mod1 in pc.
+  * Remove (completely false) ONE_LEVEL declarations for LALT, RALT, LWIN and
+    RWIN through level3.
+  * Add Conflicts on libxkbfile1 (<< 7.0.0-3), so we force upgrading to a
+    fixed version; l[x] + o -> s mappings (and l + o -> s) in the rules
+    will cause earlier versions of xkbfile to choke.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 10 Oct 2005 15:41:08 +1000
+
+xkeyboard-config (0.6-5) breezy; urgency=low
+
+  * Add ralt -> l3 mapping to no(dvorak), es(dvorak), and de(dvorak).
+  * diaresis -> diaeresis in de(dvorak).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Thu,  6 Oct 2005 12:01:39 +1000
+
+xkeyboard-config (0.6-4) breezy; urgency=low
+
+  * Add l:us_intl -> l:us,v:alt-intl mapping in rules.ml_s.part (closes:
+    Ubuntu#16568).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Fri, 30 Sep 2005 19:11:29 +1000
+
+xkeyboard-config (0.6-3) breezy; urgency=low
+
+  * Remove ca mapping from rules.ml_s.part, re-merge the rules.  Add default
+    'default' mapping to symbols/ca, which emulates the old rule-based
+    behaviour.  Add ca_enhanced mapping to rules.ml_s.part.  Add ca(fr) and
+    ca_enhanced to base.xml.in (closes: Ubuntu#15040).
+  * Fix merge.sh to be srcdir != destdir safe.
+  * Re-add compose:caps (closes: Ubuntu#15790).
+  * Add hr(alt) variant, thanks Ante Karamatic (closes: Ubuntu#14667); also
+    add hr_US -> hr(alt) mapping in rules.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed, 21 Sep 2005 18:19:41 +1000
+
+xkeyboard-config (0.6-2) breezy; urgency=low
+
+  * Fix missing build-depends.
+
+ -- LaMont Jones <lamont@ubuntu.com>  Sat,  3 Sep 2005 11:22:39 -0600
+
+xkeyboard-config (0.6-1) breezy; urgency=low
+
+  * New upstream release.
+    + Provides fr-latin9 as an alias for fr(latin9) (closes: Ubuntu#13919).
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 29 Aug 2005 13:01:44 +1000
+
+xkeyboard-config (0.5-4) breezy; urgency=low
+
+  * Replaces on old versions of xlibs-data.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Thu,  4 Aug 2005 19:30:21 +1000
+
+xkeyboard-config (0.5-3) breezy; urgency=low
+
+  * Add /usr/lib/X11/xkb and /usr/X11R6/lib/X11/xkb symlinks; add Pre-Depends
+    on x-common as we now use /usr/lib/X11 and want that to be in a
+    transitioned state.  Add Conflicts on old (monolith) versions of libx11-6
+    as that's where the XKB symlinks used to live.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 25 Jul 2005 21:19:44 +1000
+
+xkeyboard-config (0.5-2) breezy; urgency=low
+
+  * Remove 'compiled' symlink in debian/rules, averting conflict with
+    xbase-clients.
+  * Bump xlibs Conflicts/Replaces to -39, to account for fun with broken
+    packaging.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 18 Jul 2005 18:47:52 +1000
+
+xkeyboard-config (0.5-1) breezy; urgency=low
+
+  * First xkeyboard-config release.
+
+ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 11 Jul 2005 15:07:19 +1000
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/xkb-data.dirs
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/xkb-data.dirs
@@ -0,0 +1 @@
+etc/X11/xkb
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/links
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/links
@@ -0,0 +1,16 @@
+usr/share/X11/xkb/compat etc/X11/xkb/compat
+usr/share/X11/xkb/compat.dir etc/X11/xkb/compat.dir
+usr/share/X11/xkb/geometry etc/X11/xkb/geometry
+usr/share/X11/xkb/geometry.dir etc/X11/xkb/geometry.dir
+usr/share/X11/xkb/keycodes etc/X11/xkb/keycodes
+usr/share/X11/xkb/keycodes.dir etc/X11/xkb/keycodes.dir
+usr/share/X11/xkb/keymap etc/X11/xkb/keymap
+usr/share/X11/xkb/keymap.dir etc/X11/xkb/keymap.dir
+usr/share/X11/xkb/rules etc/X11/xkb/rules
+usr/share/X11/xkb/semantics etc/X11/xkb/semantics
+usr/share/X11/xkb/semantics.dir etc/X11/xkb/semantics.dir
+usr/share/X11/xkb/symbols etc/X11/xkb/symbols
+usr/share/X11/xkb/symbols.dir etc/X11/xkb/symbols.dir
+usr/share/X11/xkb/types etc/X11/xkb/types
+usr/share/X11/xkb/types.dir etc/X11/xkb/types.dir
+
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/control
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/control
@@ -0,0 +1,34 @@
+Source: xkeyboard-config
+Section: x11
+Priority: extra
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Uploaders: Mohammed Adnène Trojette <adn+deb@diwi.org>
+Build-Depends: debhelper (>= 5.0.0), quilt
+Build-Depends-Indep: libxml-parser-perl
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git
+Homepage: http://www.freedesktop.org/Software/XKeyboardConfig
+
+Package: xkb-data
+Architecture: all
+Replaces: xlibs (<< 6.8.2-39), xlibs-data (<< 6.8.2-39), libx11-6 (<< 1:6.2.1+cvs.20050610-1), xkeyboard-config (<< 0.8-7ubuntu2)
+Conflicts: xkeyboard-config (<< 0.8-7ubuntu2)
+Breaks: console-setup (<< 1.21ubuntu3)
+Description: X Keyboard Extension (XKB) configuration data
+ This package contains configuration data used by the X Keyboard
+ Extension (XKB), which allows selection of keyboard layouts when
+ using a graphical interface.
+ .
+ Every X11 vendor provides its own XKB data files, so keyboard layout
+ designers have to send their layouts to several places.  The
+ xkeyboard-config project has been launched at FreeDesktop in order
+ to provide a central repository that could be used by all vendors.
+
+Package: xkeyboard-config
+Architecture: all
+Depends: xkb-data (>= ${source:Version})
+Description: Transitional package for xkb-data
+ This package is not needed and can safely be removed from the system
+ once no other packages depend on it.
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/copyright
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/copyright
@@ -0,0 +1,33 @@
+This package was debianized by Denis Barbier <barbier@debian.org> on
+Tue, 10 Oct 2006 01:16:55 +0200
+
+It was downloaded from
+  http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.gz
+
+Upstream Authors: 
+  Denis Barbier <barbier@linuxfr.org>
+  Frank Murphy <murphyf+xfree86@f-m.fm>
+  Ivan Pascal <pascal@info.tsu.ru>
+  Andriy Rysin <arysin@myrealbox.com>
+  Sergey V. Udaltsov <svu@users.sourceforge.net>
+  Данило Шеган <dsegan@gmx.net>
+
+This program is distributed under the following license:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the copyright holder(s) not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  The copyright holder(s) makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+THE COPYRIGHT HOLDER(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR 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.
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/keycodes.dir
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/keycodes.dir
@@ -0,0 +1,82 @@
+-------- -------- aliases(azerty)
+-d------ -------- aliases(qwerty)
+-------- -------- aliases(qwertz)
+-------- -------- amiga(de)
+-d------ -------- amiga(usa1)
+-------- -------- ataritt(de)
+-d------ -------- ataritt(us)
+-------- -------- digital_vndr/lk(lk201)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/lk(lk401bj)
+-------- -------- digital_vndr/lk(lk401jj)
+-------- -------- digital_vndr/lk(lk421)
+-------- -------- digital_vndr/lk(lk421aj)
+-------- -------- digital_vndr/lk(lk421jj)
+-------- -------- digital_vndr/lk(lk443)
+-------- -------- digital_vndr/lk(lk444)
+-------- -------- digital_vndr/lk(lk44x)
+-------- -------- digital_vndr/lk(lk_common)
+-------- -------- digital_vndr/lk(lkx01)
+-------- -------- digital_vndr/pc(lk411)
+-------- -------- digital_vndr/pc(lk411_common)
+-------- -------- digital_vndr/pc(lk411jj)
+-------- -------- digital_vndr/pc(lk450)
+-------- -------- digital_vndr/pc(pc101)
+-------- -------- digital_vndr/pc(pc102)
+-------- -------- digital_vndr/pc(pc104)
+-------- -------- digital_vndr/pc(pc10x)
+-------- -------- digital_vndr/pc(pc_common)
+-------- -------- digital_vndr/pc(pcxajaa)
+-d------ -------- evdev(evdev)
+-d------ -------- fujitsu(138)
+-------- -------- hp(hil)
+-d------ -------- hp(hp-101)
+-------- -------- ibm(rs6k-101)
+-------- -------- ibm(rs6k-102)
+-------- -------- macintosh(badmap)
+-------- -------- macintosh(goodmap)
+-d------ -------- macintosh(macintosh)
+-------- -------- macintosh(old)
+-d------ -------- sgi_vndr/indigo(pc101)
+-------- -------- sgi_vndr/indigo(pc102)
+-------- -------- sgi_vndr/indy(jp106)
+h-p----- -------- sgi_vndr/indy(overlayKeypad)
+-------- -------- sgi_vndr/indy(pc101)
+-------- -------- sgi_vndr/indy(pc102)
+-------- -------- sgi_vndr/indy(pc104)
+-------- -------- sgi_vndr/indy(pc105)
+h-p----- -------- sgi_vndr/indy(shiftLock)
+-d------ -------- sgi_vndr/indy(universal)
+-d------ -------- sgi_vndr/iris(iris)
+-------- -------- sony(nwp5461)
+-d------ -------- sun(type4)
+-------- -------- sun(type4__se)
+-------- -------- sun(type4_ca)
+-------- -------- sun(type4_euro)
+-------- -------- sun(type4_jp)
+-------- -------- sun(type4_se)
+-------- -------- sun(type4_se_swapctl)
+-------- -------- sun(type4tuv)
+-------- -------- sun(type5)
+-------- -------- sun(type5_euro)
+-------- -------- sun(type5_jp)
+-------- -------- sun(type5_jphobo)
+-------- -------- sun(type5_se)
+-------- -------- sun(type5c_se)
+-------- -------- sun(type5hobo)
+-------- -------- sun(type5tuv)
+-------- -------- sun(type5tuvhobo)
+-------- -------- sun(type6)
+-------- -------- sun(type6_euro)
+-------- -------- sun(type6_jp)
+-------- -------- sun(type6_jp_usb)
+-------- -------- sun(type6_usb)
+-------- -------- sun(type6tuv)
+-------- -------- sun(type6tuv_usb)
+-------- -------- sun(type6unix)
+-------- -------- xfree86(102)
+-------- -------- xfree86(abnt2)
+-------- -------- xfree86(basic)
+-------- -------- xfree86(jp106)
+-d------ -------- xfree86(xfree86)
+-d------ -------- xfree98(pc98)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/README.Debian
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/README.Debian
@@ -0,0 +1,92 @@
+Notes about the Debian xkb-data package
+=======================================
+
+Support of Apple keyboards
+--------------------------
+
+Apple keyboards have been mostly unusable with XKB for years,
+and many unofficial files spread around the Internet to fix
+this mess.  Fortunately this issue has been fixed now, thanks
+to testers on the debian-powerpc mailing list, and changes
+have been merged upstream.
+
+The following models are available:
+ * macintosh_old
+   For old kernels with ADB keycodes
+ * ibook powerbook macbook78 macbook79
+   Laptop, 3rd and 4th levels are obtained by the small Enter key.
+ * macintosh
+   Default Macintosh
+These models look for symbols in /usr/share/X11/xkb/symbols/macintosh_vndr,
+which means that the following layouts can be selected:
+   ch de dk es fi fr gb is it latam nl no pt se us
+
+PC models can be selected, to have access to more layouts.  Some options
+may then be added to have the same behavior as with Macintosh keyboards.
+Here is a (non exhaustive) list of relevant options:
+ * lv3:lwin_switch   Press left Apple-key to choose 3rd level.
+ * lv3:enter_switch  Press Enter key on keypad to choose 3rd level.
+ * numpad:mac        Numpad keys work as with Macintosh keyboards.
+ * apple:badmap      Swap keycodes of two keys when Mac keyboards are
+                     misdetected by kernel.
+
+Variants have been added to PC layouts to emulate Macintosh layouts.
+For instance,
+
+    Option     "XkbRules"    "xorg"
+    Option     "XkbModel"    "ibook"
+    Option     "XkbLayout"   "fr"
+
+in /etc/X11/xorg.conf can be replaced by
+
+    Option     "XkbRules"    "xorg"
+    Option     "XkbModel"    "pc105"
+    Option     "XkbLayout"   "fr"
+    Option     "XkbVariant"  "mac"
+    Option     "XkbOptions"  "lv3:enter_switch,apple:badmap,numpad:mac"
+
+Denis Barbier <barbier@debian.org>  Thu,  5 Oct 2006 22:51:12 +0200
+
+Cleaning /etc/X11/xkb
+---------------------
+
+Since 0.8-3, all the files in /etc/X11/xkb/ were moved to
+/usr/share/X11/xkb/symbols. If you want to clean /etc/X11/xkb/, you need
+to run dpkg -P xlibs.
+
+Customised layouts
+------------------
+
+Since 0.8-1, layouts are read from /usr/share/X11/xkb/symbols and no
+more from /etc/X11/xkb/symbols. Thus, layouts are no more conffiles.
+The good way to have a custom layout is to create one's own layout that
+includes other layouts and customises some keys you want to modify.
+
+Do not modify directly files /usr/share/X11/xkb/symbols.
+
+For instance, to create a French layout altering the 'a' key, create a
+/usr/share/X11/xkb/symbols/my_fr file containing the following lines
+(without the pipes):
+
+   |   partial alphanumeric_keys
+   |   xkb_symbols "my_fr" {
+   |       include "fr"
+   |       key <AD01> { [ a, A, oe, OE ] };
+   |   };
+
+To have it appear in your desktop environment layout manager, add
+"my_fr" in /etc/X11/xkb/base.xml as a new layout. For
+example, insert the following lines (without the pipes):
+
+    |    <layout>
+    |      <configItem>
+    |        <name>my_fr</name>
+    |        <shortDescription>MyFr</shortDescription>
+    |        <description>French (customized)</description>
+    |      </configItem>
+    |      <variantList/>
+    |    </layout>
+
+/etc/X11/xkb/base.xml is a configuration file.
+
+Mohammed Adnène Trojette <adn+deb@diwi.org>  Sun, 23 Sep 2007 00:05:50 +0200
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/semantics.dir
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/semantics.dir
@@ -0,0 +1,4 @@
+-d------ -------- basic(basic)
+-d------ -------- complete(complete)
+-d------ -------- default(default)
+-d------ -------- xtest(xtest)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/symbols.dir
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/symbols.dir
@@ -0,0 +1,758 @@
+-dp----- a------- ad(basic)
+-dp----- a------- af(basic)
+--p----- a------- af(ps)
+--p----- a------- af(uz)
+-dp----- a------- al(basic)
+--p----- -m------ altwin(alt_super_win)
+--p----- -m------ altwin(ctrl_win)
+--p----- -m------ altwin(hyper_win)
+--p----- -m------ altwin(left_meta_win)
+--p----- -m------ altwin(menu)
+--p----- -m------ altwin(meta_alt)
+--p----- -m------ altwin(meta_win)
+--p----- -m------ altwin(super_win)
+--p----- -m------ altwin(swap_lalt_lwin)
+-dp----- a------- am(basic)
+--p----- a------- am(eastern)
+--p----- a------- am(eastern-alt)
+-------- -------- am(phonetic)
+--p----- a------- am(phonetic-alt)
+--p----- a------- am(western)
+--p----- a------- ara(azerty)
+--p----- a------- ara(azerty_digits)
+-dp----- a------- ara(basic)
+--p----- a------- ara(buckwalter)
+--p----- a------- ara(digits)
+--p----- a------- ara(qwerty)
+--p----- a------- ara(qwerty_digits)
+--p----- a------- az(cyrillic)
+-dp----- a------- az(latin)
+--p----- a------- ba(alternatequotes)
+-dp----- a------- ba(basic)
+--p----- a------- ba(unicode)
+--p----- a------- ba(unicodeus)
+--p----- a------- ba(us)
+-dp----- a------- bd(basic)
+-------- -------- bd(probhat)
+--p----- a------- be(Sundeadkeys)
+-dp----- a------- be(basic)
+--p----- a------- be(iso-alternate)
+--p----- a------- be(nodeadkeys)
+--p----- a------- be(sundeadkeys)
+--p----- a------- be(wang)
+-dp----- a------- bg(bds)
+--p----- a------- bg(phonetic)
+-d------ -------- br(abnt2)
+--p----- a------- br(nodeadkeys)
+-dp----- a------- braille(home_row)
+h-p----- --k----- braille(keypad)
+--p----- a------- braille(left_hand)
+--p----- a------- braille(right_hand)
+-dp----- a------- bt(basic)
+-dp----- a------- by(basic)
+--p----- a------- by(latin)
+--p----- a------- by(winkeys)
+-dp----- -------- ca(fr)
+-------- -------- ca(fr-dvorak)
+--p----- -------- ca(fr-legacy)
+-------- a------- ca(ike)
+--p----- -------- ca(multi)
+--p----- -------- ca(multi-2gr)
+--p----- -------- ca(multix)
+hdp----- -m------ capslock(capslock)
+h-p----- -m------ capslock(grouplock)
+h-p----- -m------ capslock(shiftlock)
+-dp----- a------- cd(basic)
+-dp----- a------- ch(basic)
+--p----- a------- ch(de)
+--p----- a------- ch(de_Sundeadkeys)
+--p----- a------- ch(de_mac)
+--p----- a------- ch(de_nodeadkeys)
+--p----- a------- ch(de_sundeadkeys)
+--p----- a------- ch(fr)
+--p----- a------- ch(fr_Sundeadkeys)
+--p----- a------- ch(fr_mac)
+--p----- a------- ch(fr_nodeadkeys)
+--p----- a------- ch(fr_sundeadkeys)
+--p----- -m------ compose(caps)
+--p----- -m------ compose(lwin)
+--p----- -m------ compose(menu)
+--p----- -m------ compose(ralt)
+--p----- -m------ compose(rctrl)
+--p----- -m------ compose(rwin)
+-------- -------- cs(alternatequotes)
+-dp----- a------- cs(basic)
+h-p----- a------- cs(common)
+h-p----- a------- cs(cyralpha)
+h-p----- a------- cs(latalpha)
+--p----- a------- cs(latin)
+-------- -------- cs(latinalternatequotes)
+--p----- a------- cs(latinunicode)
+--p----- a------- cs(latinunicodeyz)
+--p----- a------- cs(latinyz)
+h-p----- a------- cs(level3)
+h-p----- a------- cs(twoletter)
+--p----- a------- cs(yz)
+--p----- -m------ ctrl(ctrl_aa)
+--p----- -m------ ctrl(ctrl_ac)
+--p----- -m------ ctrl(ctrl_ra)
+--p----- -m------ ctrl(nocaps)
+--p----- -m------ ctrl(swapcaps)
+-dp----- a------- cz(basic)
+-------- -------- cz(bksl)
+--p----- a------- cz(qwerty)
+-------- -------- cz(qwerty_bksl)
+--p----- a------- de(Sundeadkeys)
+-d------ -------- de(basic)
+--p----- a------- de(deadacute)
+--p----- a------- de(deadgraveacute)
+--p----- a------- de(dvorak)
+--p----- a------- de(mac)
+--p----- a------- de(mac_nodeadkeys)
+--p----- a------- de(neo)
+--p----- a------- de(nodeadkeys)
+--p----- a------- de(ro)
+--p----- a------- de(ro_nodeadkeys)
+--p----- a------- de(sundeadkeys)
+-d------ -------- digital_vndr/lk(common)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/pc(pc)
+-------- -------- digital_vndr/pc(pc104)
+-------- -------- digital_vndr/us(lk44x)
+-------- -------- digital_vndr/us(pc104)
+-------- -------- digital_vndr/us(pcxal)
+-------- -------- digital_vndr/us(pcxalaa)
+-------- -------- digital_vndr/us(pcxalfa)
+-------- -------- digital_vndr/us(pcxalga)
+-------- -------- digital_vndr/us(pcxalka)
+-------- -------- digital_vndr/us(unix)
+-------- -------- digital_vndr/us(us)
+-------- -------- digital_vndr/us(vt105)
+-------- -------- digital_vndr/us(vt105-dp)
+-------- -------- digital_vndr/us(vt105-tw)
+-------- -------- digital_vndr/us(vt108)
+-------- -------- digital_vndr/us(vt108-dp)
+-------- -------- digital_vndr/us(vt108-tw)
+-------- -------- digital_vndr/vt(vt105)
+-------- -------- digital_vndr/vt(vt108)
+-dp----- a------- dk(basic)
+--p----- a------- dk(mac)
+--p----- a------- dk(mac_nodeadkeys)
+--p----- a------- dk(nodeadkeys)
+-dp----- a------- ee(basic)
+--p----- a------- ee(dvorak)
+--p----- a------- ee(nodeadkeys)
+-dp----- a------- epo(basic)
+--p----- a------- epo(legacy)
+--p----- a------- es(Sundeadkeys)
+-dp----- a------- es(basic)
+--p----- a------- es(cat)
+--p----- a------- es(dvorak)
+--p----- a------- es(mac)
+--p----- a------- es(nodeadkeys)
+--p----- a------- es(sundeadkeys)
+-dp----- a------- et(basic)
+--p----- -------- eurosign(2)
+--p----- -------- eurosign(5)
+--p----- -------- eurosign(e)
+-dp----- a------- fi(basic)
+--p----- a------- fi(fi)
+-------- -------- fi(kotoistus)
+--p----- a------- fi(mac)
+--p----- a------- fi(nodeadkeys)
+-------- -------- fi(smi)
+-dp----- a------- fo(basic)
+--p----- a------- fo(nodeadkeys)
+--p----- a------- fr(Sundeadkeys)
+-dp----- a------- fr(basic)
+--p----- a------- fr(bepo)
+--p----- a------- fr(bepo_latin9)
+--p----- a------- fr(dvorak)
+--p----- a------- fr(latin9)
+--p----- a------- fr(latin9_Sundeadkeys)
+--p----- a------- fr(latin9_nodeadkeys)
+--p----- a------- fr(latin9_sundeadkeys)
+--p----- a------- fr(mac)
+--p----- a------- fr(nodeadkeys)
+--p----- a------- fr(oss)
+--p----- a------- fr(oss_Sundeadkeys)
+--p----- a------- fr(oss_latin9)
+--p----- a------- fr(oss_nodeadkeys)
+--p----- a------- fr(oss_sundeadkeys)
+--p----- a------- fr(sundeadkeys)
+-------- -------- fujitsu_vndr/jp
+-------- -------- fujitsu_vndr/us
+-dp----- a------- gb(basic)
+--p----- a------- gb(dvorak)
+--p----- a------- gb(intl)
+--p----- a------- gb(mac)
+--p----- a------- ge(azerty_tskapo)
+-dp----- a------- ge(basic)
+--p----- a------- ge(ergonomic)
+--p----- a------- ge(mess)
+--p----- a------- ge(os)
+--p----- a------- ge(qwerty)
+--p----- a------- ge(ru)
+--p----- a------- gh(akan)
+-dp----- a------- gh(basic)
+--p----- a------- gh(ewe)
+--p----- a------- gh(fula)
+--p----- a------- gh(ga)
+--p----- a------- gh(generic)
+--p----- a------- gh(hausa)
+h-p----- a---g--- gr(bare)
+-dp----- a---g--- gr(basic)
+--p----- a---g--- gr(extended)
+--p----- a---g--- gr(nodeadkeys)
+--p----- a---g--- gr(polytonic)
+--p----- -m------ group(alt_caps_toggle)
+--p----- -m------ group(alt_shift_toggle)
+--p----- -m------ group(alts_toggle)
+--p----- -m------ group(caps_toggle)
+--p----- -m------ group(ctrl_alt_toggle)
+--p----- -m------ group(ctrl_shift_toggle)
+--p----- -m------ group(ctrls_toggle)
+--p----- -m------ group(lalt_toggle)
+--p----- -m------ group(lctrl_lshift_toggle)
+--p----- -m------ group(lctrl_toggle)
+--p----- -m------ group(lshift_toggle)
+--p----- -m------ group(lswitch)
+--p----- -m------ group(lwin_switch)
+--p----- -m------ group(lwin_toggle)
+--p----- -m------ group(menu_toggle)
+--p----- -m------ group(rctrl_switch)
+--p----- -m------ group(rctrl_toggle)
+--p----- -m------ group(rshift_toggle)
+--p----- -m------ group(rwin_switch)
+--p----- -m------ group(rwin_toggle)
+--p----- -m------ group(sclk_toggle)
+--p----- -m------ group(shift_caps_toggle)
+--p----- -m------ group(shifts_toggle)
+--p----- -m------ group(switch)
+--p----- -m------ group(toggle)
+--p----- -m------ group(win_switch)
+-------- -------- hp_vndr/us(hil)
+--p----- a------- hr(alternatequotes)
+-dp----- a------- hr(basic)
+--p----- a------- hr(unicode)
+--p----- a------- hr(unicodeus)
+--p----- a------- hr(us)
+--p----- -------- hu(101_qwerty_comma_dead)
+--p----- -------- hu(101_qwerty_comma_nodead)
+--p----- -------- hu(101_qwerty_dot_dead)
+--p----- -------- hu(101_qwerty_dot_nodead)
+--p----- -------- hu(101_qwertz_comma_dead)
+--p----- -------- hu(101_qwertz_comma_nodead)
+--p----- -------- hu(101_qwertz_dot_dead)
+--p----- -------- hu(101_qwertz_dot_nodead)
+--p----- -------- hu(102_qwerty_comma_dead)
+--p----- -------- hu(102_qwerty_comma_nodead)
+--p----- -------- hu(102_qwerty_dot_dead)
+--p----- -------- hu(102_qwerty_dot_nodead)
+--p----- -------- hu(102_qwertz_comma_dead)
+--p----- -------- hu(102_qwertz_comma_nodead)
+--p----- -------- hu(102_qwertz_dot_dead)
+--p----- -------- hu(102_qwertz_dot_nodead)
+-dp----- -------- hu(basic)
+h-p----- a------- hu(def_101)
+h-p----- a------- hu(def_102)
+h-p----- a------- hu(def_common)
+h-p----- a------- hu(def_dead)
+h-p----- --k----- hu(def_dot)
+h-p----- a------- hu(def_nodead)
+h-p----- a------- hu(def_qwerty)
+h-p----- a------- hu(def_qwertz)
+--p----- -------- hu(nodeadkeys)
+--p----- -------- hu(qwerty)
+--p----- -------- hu(standard)
+--p----- a------- ie(CloGaelach)
+--p----- a------- ie(UnicodeExpert)
+-dp----- a------- ie(basic)
+--p----- a------- ie(ogam)
+--p----- a------- ie(ogam_is434)
+-dp----- a------- il(basic)
+--p----- a------- il(biblical)
+--p----- a------- il(lyx)
+--p----- a------- il(phonetic)
+--p----- a------- in(ben)
+-------- -------- in(ben_probhat)
+--p----- a------- in(bolnagri)
+-dp----- a------- in(deva)
+--p----- a------- in(guj)
+--p----- a------- in(guru)
+--p----- a------- in(kan)
+--p----- a------- in(mal)
+--p----- a------- in(ori)
+--p----- a------- in(tam)
+--p----- a------- in(tam_TAB)
+--p----- a------- in(tam_TSCII)
+--p----- a------- in(tam_unicode)
+--p----- a------- in(tel)
+--p----- a------- in(urd)
+--p----- a------- inet(a4_rfkb23)
+--p----- a------- inet(a4techKB21)
+--p----- a------- inet(a4techKBS8)
+--p----- a------- inet(acer_c300)
+--p----- a------- inet(acer_ferrari4k)
+-------- -------- inet(acer_tm_800)
+--p----- a------- inet(acpi)
+--p----- a------- inet(airkey)
+--p----- -------- inet(apple)
+--p----- a------- inet(armada)
+--p----- a------- inet(azonaRF2300)
+--p----- a------- inet(benqx730)
+--p----- a------- inet(benqx800)
+--p----- a------- inet(brother)
+--p----- a------- inet(btc5090)
+--p----- a------- inet(btc5113rf)
+--p----- a------- inet(btc5126t)
+--p----- a------- inet(btc9000)
+--p----- a------- inet(btc9000a)
+-------- -------- inet(btc9001ah)
+--p----- a------- inet(btc9019u)
+--p----- a------- inet(cherryblue)
+--p----- a------- inet(cherrybluea)
+--p----- a------- inet(cherryblueb)
+--p----- a------- inet(cherrycyboard)
+--p----- a------- inet(chicony)
+--p----- a------- inet(chicony9885)
+--p----- a------- inet(compaqeak8)
+--p----- a------- inet(compaqik13)
+--p----- a------- inet(compaqik18)
+--p----- a------- inet(compaqik7)
+--p----- a------- inet(cymotionlinux)
+--p----- a------- inet(dell)
+--p----- a------- inet(dell8125)
+--p----- a------- inet(dell8135)
+--p----- a------- inet(dellusbmm)
+--p----- a------- inet(dexxa)
+--p----- a------- inet(diamond)
+--p----- a------- inet(dinovo)
+--p----- a------- inet(dtk2000)
+--p----- a------- inet(emachines)
+--p----- a------- inet(ennyah_dkb1008)
+--p----- a------- inet(evdev)
+--p----- a------- inet(genius)
+--p----- a------- inet(geniuscomfy)
+--p----- a------- inet(geniuscomfy2)
+--p----- a------- inet(geniuskb19e)
+--p----- a------- inet(gyration)
+--p----- a------- inet(honeywell_euroboard)
+--p----- a------- inet(hp2501)
+--p----- a------- inet(hp2505)
+--p----- a------- inet(hp500fa)
+--p----- a------- inet(hp5181)
+--p----- a------- inet(hp5185)
+--p----- a------- inet(hp5xx)
+--p----- a------- inet(hpi6)
+--p----- a------- inet(hpxe3gc)
+--p----- a------- inet(hpxe3gf)
+--p----- a------- inet(hpxe4xxx)
+--p----- a------- inet(hpxt1000)
+--p----- a------- inet(hpzt11xx)
+--p----- a------- inet(inspiron)
+--p----- a------- inet(ipaq)
+--p----- a------- inet(itouch)
+--p----- a------- inet(latitude)
+--p----- a------- inet(logiaccess)
+--p----- a------- inet(logicdit)
+--p----- a------- inet(logicdo)
+--p----- a------- inet(logicdp)
+--p----- a------- inet(logicdpa)
+--p----- a------- inet(logiciink)
+--p----- a------- inet(logicink)
+--p----- a------- inet(logiclx300)
+--p----- a------- inet(logiik)
+--p----- a------- inet(logiinkse)
+--p----- a------- inet(logiinkseusb)
+--p----- a------- inet(logiitc)
+h-p----- a------- inet(logitech_base)
+--p----- a------- inet(logitech_g15)
+h-p----- a------- inet(logitech_set3)
+--p----- a------- inet(logiultrax)
+--p----- a------- inet(ltcd)
+--p----- a------- inet(microsoftinet)
+--p----- a------- inet(microsoftmult)
+--p----- a------- inet(microsoftoffice)
+--p----- a------- inet(microsoftpro)
+--p----- a------- inet(microsoftprooem)
+--p----- a------- inet(microsoftprose)
+--p----- a------- inet(microsoftprousb)
+--p----- a------- inet(mx1998)
+--p----- a------- inet(mx2500)
+--p----- a------- inet(mx2750)
+--p----- a------- inet(oretec)
+--p----- a------- inet(precision_m)
+--p----- a------- inet(presario)
+--p----- a------- inet(propeller)
+--p----- a------- inet(qtronix)
+--p----- a------- inet(rapidaccess)
+--p----- a------- inet(rapidaccess2)
+--p----- a------- inet(rapidaccess2a)
+--p----- a------- inet(samsung4500)
+--p----- a------- inet(samsung4510)
+--p----- a------- inet(scorpius)
+--p----- a------- inet(silvercrest)
+--p----- a------- inet(sk1300)
+--p----- a------- inet(sk2500)
+--p----- a------- inet(sk6200)
+--p----- a------- inet(sk7100)
+-------- -------- inet(sp_inet)
+--p----- a------- inet(sven)
+--p----- a------- inet(symplon)
+--p----- a------- inet(thinkpad)
+--p----- a------- inet(toshiba_s3000)
+--p----- a------- inet(trust)
+--p----- a------- inet(trustda)
+--p----- a------- inet(yahoo)
+-dp----- a------- iq(basic)
+--p----- a------- iq(ku)
+--p----- a------- iq(ku_alt)
+--p----- a------- iq(ku_ara)
+--p----- a------- iq(ku_f)
+-dp----- a------- ir(basic)
+--p----- a------- ir(keypad)
+--p----- a------- ir(ku)
+--p----- a------- ir(ku_alt)
+--p----- a------- ir(ku_ara)
+--p----- a------- ir(ku_f)
+h-p----- a------- ir(part_keypad)
+h-p----- a------- ir(part_pro)
+--p----- a------- ir(pro)
+--p----- a------- ir(pro_keypad)
+--p----- a------- is(Sundeadkeys)
+-dp----- a------- is(basic)
+--p----- a------- is(mac)
+--p----- a------- is(nodeadkeys)
+-dp----- a------- it(basic)
+--p----- a------- it(mac)
+--p----- a------- it(nodeadkeys)
+-dp----- a------- jp(106)
+--p----- a------- jp(OADG109A)
+h-p----- a------- jp(common)
+--p----- a------- jp(kana)
+--p----- a------- jp(nicola_f_bs)
+--p----- --k----- keypad(core)
+-------- --k----- keypad(future)
+-------- --k----- keypad(future_wang)
+--p----- --k----- keypad(futuremath)
+-------- --k----- keypad(legacy)
+-------- --k----- keypad(legacy_wang)
+--p----- --k----- keypad(legacymath)
+--p----- --k----- keypad(legacynumber)
+--p----- --k----- keypad(legacynumber_wang)
+-------- --k----- keypad(oss)
+-------- --k----- keypad(oss_latin9)
+-------- --k----- keypad(oss_wang)
+--p----- --k----- keypad(ossmath)
+--p----- --k----- keypad(ossmath_latin9)
+--p----- --k----- keypad(ossnumber)
+--p----- --k----- keypad(ossnumber_wang)
+h-p----- --k----- keypad(overlay)
+h-p----- --k----- keypad(overlay1)
+h-p----- --k----- keypad(overlay2)
+hdp----- --k----- keypad(x11)
+-dp----- a------- kg(basic)
+-dp----- a------- kh(basic)
+--p----- --k----- kpdl(comma)
+--p----- --k----- kpdl(commaoss)
+--p----- --k----- kpdl(dot)
+--p----- --k----- kpdl(dotoss)
+--p----- --k----- kpdl(dotoss_latin9)
+--p----- --k----- kpdl(kposs)
+--p----- --k----- kpdl(momayyezoss)
+h-p----- ---f---- kr(koreankeys)
+h-p----- ---f---- kr(koreankeys_raltctl)
+-------- a------- kr(kr104)
+-d------ a------- kr(kr106)
+-dp----- a------- kz(basic)
+--p----- a------- kz(kazrus)
+--p----- a------- kz(ruskaz)
+-dp----- a------- la(basic)
+--p----- a------- latam(Sundeadkeys)
+-dp----- a------- latam(basic)
+--p----- a------- latam(nodeadkeys)
+--p----- a------- latam(sundeadkeys)
+-dp----- -------- latin(basic)
+--p----- -------- latin(nodeadkeys)
+--p----- -------- latin(type2)
+--p----- -------- latin(type2_nodeadkeys)
+--p----- -------- latin(type3)
+--p----- -------- latin(type3_nodeadkeys)
+--p----- -------- latin(type4)
+--p----- -------- latin(type4_nodeadkeys)
+--p----- -m------ level3(alt_switch)
+--p----- -m------ level3(enter_switch)
+--p----- -m------ level3(lalt_switch)
+--p----- -m------ level3(lwin_switch)
+--p----- -m------ level3(menu_switch)
+--p----- -m------ level3(ralt_alt)
+-dp----- -m------ level3(ralt_switch)
+h-p----- -m------ level3(ralt_switch_for_alts_toggle)
+--p----- -m------ level3(ralt_switch_multikey)
+--p----- -m------ level3(rwin_switch)
+--p----- -m------ level3(switch)
+--p----- -m------ level3(win_switch)
+--p----- -m------ level5(rctrl_switch)
+-dp----- a------- lk(sin_phonetic)
+--p----- a------- lk(tam_TAB)
+--p----- a------- lk(tam_unicode)
+-dp----- am------ lt(basic)
+--p----- am------ lt(ibm)
+--p----- am------ lt(std)
+--p----- am------ lt(us)
+--p----- am------ lv(apostrophe)
+-dp----- am------ lv(basic)
+--p----- am------ lv(fkey)
+--p----- am------ lv(tilde)
+-dp----- a------- ma(arabic)
+--p----- a------- ma(french)
+--p----- a------- ma(tifinagh)
+--p----- a------- ma(tifinagh-alt)
+--p----- a------- ma(tifinagh-alt-phonetic)
+--p----- a------- ma(tifinagh-extended)
+--p----- a------- ma(tifinagh-extended-phonetic)
+--p----- a------- ma(tifinagh-phonetic)
+-dp----- -m------ macintosh_vndr/apple(extended)
+--p----- -m------ macintosh_vndr/apple(laptop)
+--p----- -m------ macintosh_vndr/apple(laptop_bad_switch)
+--p----- a------- macintosh_vndr/ch(de)
+--p----- a------- macintosh_vndr/ch(extended)
+--p----- a------- macintosh_vndr/ch(fr)
+--p----- a------- macintosh_vndr/ch(nodeadkeys)
+--p----- a------- macintosh_vndr/de(Sundeadkeys)
+-dp----- a------- macintosh_vndr/de(basic)
+--p----- a------- macintosh_vndr/de(nodeadkeys)
+--p----- a------- macintosh_vndr/de(sundeadkeys)
+--p----- a------- macintosh_vndr/dk(basic)
+-dp----- a------- macintosh_vndr/dk(full)
+--p----- a------- macintosh_vndr/dk(nodeadkeys)
+-dp----- a------- macintosh_vndr/es(basic)
+-dp----- a------- macintosh_vndr/fi(basic)
+--p----- a------- macintosh_vndr/fi(nodeadkeys)
+-------- -------- macintosh_vndr/fr(extended)
+-dp----- a------- macintosh_vndr/gb(basic)
+-dp----- a------- macintosh_vndr/is(basic)
+--p----- a------- macintosh_vndr/is(nodeadkeys)
+-------- -------- macintosh_vndr/it(extended)
+-dp----- a------- macintosh_vndr/latam(basic)
+-dp----- a------- macintosh_vndr/nl(basic)
+-dp----- a------- macintosh_vndr/no(basic)
+--p----- a------- macintosh_vndr/no(nodeadkeys)
+--p----- a------- macintosh_vndr/pt(Sundeadkeys)
+-dp----- a------- macintosh_vndr/pt(basic)
+--p----- a------- macintosh_vndr/pt(nodeadkeys)
+--p----- a------- macintosh_vndr/pt(sundeadkeys)
+-dp----- a------- macintosh_vndr/se(basic)
+--p----- a------- macintosh_vndr/se(nodeadkeys)
+-------- -------- macintosh_vndr/us(extended)
+h------- -------- macintosh_vndr/us(oldmac)
+-dp----- a------- mao(basic)
+-dp----- a------- mk(basic)
+--p----- a------- mk(nodeadkeys)
+-dp----- a------- mm(basic)
+-dp----- a------- mn(basic)
+-dp----- a------- mt(basic)
+--p----- a------- mt(us)
+-dp----- a------- mv(basic)
+--p----- -------- nbsp(level2)
+--p----- -------- nbsp(level3)
+--p----- -------- nbsp(level3n)
+--p----- -------- nbsp(level3s)
+--p----- -------- nbsp(level4)
+--p----- -------- nbsp(level4n)
+--p----- -------- nbsp(none)
+-d------ -------- nec_vndr/jp(pc98)
+-dp----- a------- ng(basic)
+--p----- a------- ng(hausa)
+--p----- a------- ng(igbo)
+--p----- a------- ng(yoruba)
+--p----- a------- nl(Sundeadkeys)
+-dp----- a------- nl(basic)
+--p----- a------- nl(mac)
+--p----- a------- nl(std)
+--p----- a------- nl(sundeadkeys)
+-dp----- a------- no(basic)
+--p----- a------- no(dvorak)
+--p----- a------- no(mac)
+--p----- a------- no(mac_nodeadkeys)
+--p----- a------- no(nodeadkeys)
+--p----- a------- no(smi)
+--p----- a------- no(smi_nodeadkeys)
+-dp----- a------- np(basic)
+h-p----- a------- pc(editing)
+h-p----- a------- pc(function)
+-dp----- am------ pc(pc105)
+-dp----- a------- pk(urd)
+-dp----- a------- pl(basic)
+--p----- a------- pl(csb)
+--p----- a------- pl(dvorak)
+--p----- a------- pl(dvorak_altquotes)
+--p----- a------- pl(dvorak_quotes)
+--p----- a------- pl(qwertz)
+--p----- a------- pt(Sundeadkeys)
+-dp----- a------- pt(basic)
+--p----- a------- pt(mac)
+--p----- a------- pt(mac_nodeadkeys)
+--p----- a------- pt(mac_sundeadkeys)
+--p----- a------- pt(nodeadkeys)
+--p----- a------- pt(sundeadkeys)
+--p----- a------- ro(academic)
+-dp----- a------- ro(basic)
+--p----- a------- ro(comma)
+--p----- a------- ro(std)
+--p----- a------- ro(winkeys)
+-dp----- a------- ru(basic)
+--p----- a------- ru(cv)
+--p----- a------- ru(cv_latin)
+--p----- a------- ru(os)
+--p----- a------- ru(os_winkeys)
+--p----- a------- ru(phonetic)
+--p----- a------- ru(tt)
+--p----- a------- ru(typewriter)
+--p----- a------- ru(udm)
+--p----- a------- ru(winkeys)
+-dp----- a------- se(basic)
+--p----- a------- se(dvorak)
+--p----- a------- se(mac)
+--p----- a------- se(nodeadkeys)
+--p----- a------- se(rus)
+--p----- a------- se(rus_nodeadkeys)
+--p----- a------- se(se)
+-------- -------- se(smi)
+--p----- a------- se(svdvorak)
+-------- -------- sgi_vndr/jp(alternate106)
+-------- -------- sgi_vndr/jp(jp106)
+--p----- a------- si(alternatequotes)
+-dp----- a------- si(basic)
+--p----- a------- si(unicode)
+--p----- a------- si(unicodeus)
+--p----- a------- si(us)
+-dp----- a------- sk(basic)
+-------- -------- sk(bksl)
+--p----- a------- sk(qwerty)
+-------- -------- sk(qwerty_bksl)
+-------- -------- sony_vndr/us(nwp5461)
+--p----- ---f---- srvr_ctrl(fkey2vt)
+--p----- --kf---- srvr_ctrl(no_srvr_keys)
+--p----- --k----- srvr_ctrl(stdkeypad)
+--p----- --kf---- srvr_ctrl(xfree86)
+-------- -------- sun_vndr/cs(type5)
+-------- -------- sun_vndr/cz(type5)
+-------- -------- sun_vndr/de(type4)
+-------- -------- sun_vndr/dk(type4)
+-------- -------- sun_vndr/dk(type5)
+--p----- -------- sun_vndr/es(type4)
+--p----- -------- sun_vndr/es(type5)
+--p----- -------- sun_vndr/es(type6)
+-------- -------- sun_vndr/fi(basic)
+-------- -------- sun_vndr/fr(type4)
+-------- -------- sun_vndr/fr(type5)
+-------- -------- sun_vndr/fr(type6)
+-------- -------- sun_vndr/gb(type4)
+--p----- -------- sun_vndr/gb(type5)
+--p----- -------- sun_vndr/gb(type6)
+-------- -------- sun_vndr/gr(type5)
+-dp----- a------- sun_vndr/hu(type5)
+-------- -------- sun_vndr/it(type4)
+-------- -------- sun_vndr/it(type5)
+--p----- -------- sun_vndr/it(type6)
+-------- -------- sun_vndr/jp(J3100)
+-------- -------- sun_vndr/jp(Muhenkan_x86)
+-------- -------- sun_vndr/jp(basic)
+-------- -------- sun_vndr/jp(type4)
+-------- -------- sun_vndr/jp(type5)
+-------- -------- sun_vndr/jp(type5hobo)
+--p----- -------- sun_vndr/jp(type6)
+--p----- -------- sun_vndr/jp(type7)
+-------- -------- sun_vndr/jp(x86)
+-------- -------- sun_vndr/ko(type4)
+-------- -------- sun_vndr/ko(type5)
+--p----- -------- sun_vndr/ko(type6)
+-dp----- a------- sun_vndr/lt(type5)
+-dp----- a------- sun_vndr/lv(type5)
+-------- -------- sun_vndr/nl(type4)
+-------- -------- sun_vndr/no(type4)
+-------- -------- sun_vndr/no(type5)
+-------- -------- sun_vndr/pl(type5)
+-------- -------- sun_vndr/pt(type4)
+-------- -------- sun_vndr/pt(type5)
+--p----- -------- sun_vndr/pt(type6)
+-------- -------- sun_vndr/ru(basic)
+--p----- -------- sun_vndr/ru(type6)
+-------- -------- sun_vndr/se(type4)
+-------- -------- sun_vndr/se(type5)
+--p----- -------- sun_vndr/se(type6)
+-dp----- -------- sun_vndr/solaris(defaults)
+--p----- -------- sun_vndr/solaris(keynames)
+--p----- -------- sun_vndr/solaris(xf86keynames)
+-------- -------- sun_vndr/sw(type4de)
+-------- -------- sun_vndr/sw(type4fr)
+-------- -------- sun_vndr/sw(type5de)
+-------- -------- sun_vndr/sw(type5fr)
+-------- -------- sun_vndr/tr(basic)
+-------- -------- sun_vndr/tr(type6F)
+-------- -------- sun_vndr/tr(type6Q)
+-------- -------- sun_vndr/tuv(type4)
+-------- -------- sun_vndr/tuv(type4basic)
+-------- -------- sun_vndr/tuv(type5)
+-------- -------- sun_vndr/tuv(type5basic)
+-------- -------- sun_vndr/tw(type4)
+-------- -------- sun_vndr/tw(type5)
+--p----- -------- sun_vndr/tw(type6)
+-------- -------- sun_vndr/us(US101A_Sun)
+-------- -------- sun_vndr/us(pc101)
+-------- -------- sun_vndr/us(pc101currency)
+-------- -------- sun_vndr/us(pc102)
+-------- -------- sun_vndr/us(pc104)
+-------- -------- sun_vndr/us(sunbasic)
+-------- -------- sun_vndr/us(type4)
+-------- -------- sun_vndr/us(type4basic)
+-------- -------- sun_vndr/us(type5)
+-------- -------- sun_vndr/us(type5basic)
+-------- -------- sun_vndr/us(type5hobo)
+-------- -------- sun_vndr/us(type5hobobasic)
+-------- -------- sun_vndr/us(type6)
+-------- -------- sun_vndr/usb(sun_usb)
+-dp----- a------- sy(basic)
+--p----- a------- sy(ku)
+--p----- a------- sy(ku_alt)
+--p----- a------- sy(ku_f)
+--p----- a------- sy(syc)
+--p----- a------- sy(syc_phonetic)
+-dp----- a------- th(basic)
+--p----- a------- th(pat)
+--p----- a------- th(tis)
+-dp----- a------- tj(basic)
+--p----- a------- tr(Sundeadkeys)
+--p----- -------- tr(alt)
+-dp----- -------- tr(basic)
+--p----- -------- tr(f)
+--p----- -------- tr(ku)
+--p----- -------- tr(ku_alt)
+--p----- -------- tr(ku_f)
+--p----- a------- tr(sundeadkeys)
+-dp----- a------- ua(basic)
+--p----- a------- ua(phonetic)
+--p----- a------- ua(rstu)
+--p----- a------- ua(rstu_ru)
+--p----- a------- ua(typewriter)
+--p----- a------- ua(winkeys)
+--p----- a------- us(alt-intl)
+-dp----- am------ us(basic)
+--p----- a------- us(colemak)
+--p----- a------- us(dvorak)
+--p----- a------- us(dvorak-classic)
+--p----- a------- us(dvorak-l)
+--p----- a------- us(dvorak-r)
+--p----- a------- us(euro)
+--p----- a------- us(intl)
+--p----- a------- us(mac)
+--p----- a------- us(rus)
+-dp----- a------- uz(cyrillic)
+--p----- a------- uz(latin)
+-dp----- a------- vn(basic)
+-d------ -------- xfree68_vndr/amiga(usa1)
+-------- -------- xfree68_vndr/ataritt(de)
+-d------ -------- xfree68_vndr/ataritt(us)
+-dp----- am------ za(basic)
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/changelog
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/changelog
@@ -0,0 +1,560 @@
+xkeyboard-config (1.1~cvs.20080104.1-1ubuntu6) hardy; urgency=low
+
+  * Actually apply ca-shs-add and lekp-add patches. Fix up lekp-add to avoid
+    patch conflicts.
+  * nbsp-level4nl: Define a new type for French narrow non-breaking space
+    handling which hardcodes the Control modifier, rather than relying on a
+    level-5 shift which changes the modifier key's function for every key on
+    the keyboard (LP: #198759). Patch from Nicolas Mailhot upstream, via
+    https://bugs.freedesktop.org/show_bug.cgi?id=9529#c29.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 21 Apr 2008 16:42:54 +0100
+
+xkeyboard-config (1.1~cvs.20080104.1-1ubuntu5) hardy; urgency=low
+
+  * preinst:
+    - when upgrading from hardy, check the conffiles against
+      xkeyboard-config not xkb-data (was not available back then)
+  * debian/control:
+    - add conflicts against old xkeyboard-config to ensure the 
+      upgrade happens in the right order (LP: #213566)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 09 Apr 2008 13:11:52 +0200
+
+xkeyboard-config (1.1~cvs.20080104.1-1ubuntu4) hardy; urgency=low
+
+  * New patches:
+    + ca-shs-add.diff - layout for Secwepemctsin (LP: #187430)
+    + lekp-add.diff - layout for Lithuanian (LP: #183511)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 08 Apr 2008 01:13:34 -0700
+
+xkeyboard-config (1.1~cvs.20080104.1-1ubuntu3) hardy; urgency=low
+
+  * in_backslash: Fix "backlash" typo in symbols/in.
+  * unicode_symbols: Fix 0x01000XXXX (instead of 0x0100XXXX) typos in
+    symbols/gn and symbols/ng. Also filed as freedesktop.org bug #15273.
+  * Use dpkg-query in preinst conffile upgrade code rather than looking in
+    /var/lib/dpkg/status directly.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 30 Mar 2008 17:32:13 +0100
+
+xkeyboard-config (1.1~cvs.20080104.1-1ubuntu2) hardy; urgency=low
+
+  * Remove cs_hr_any patch; console-setup 1.21ubuntu3 fixes the real bug.
+  * Add Breaks field to ensure safe partial upgrades for the above. This may
+    be removed after Ubuntu 8.04.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 26 Feb 2008 14:16:34 +0000
+
+xkeyboard-config (1.1~cvs.20080104.1-1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add patch cs_hr_any, avoid using the "any" symbol in cs and hr, since
+      console-setup doesn't understand it (Ubuntu: #93077).
+    - Keep preinst conffile upgrade code for dapper -> hardy upgrades.
+    - Add transitional package for xkeyboard-config.
+    - Replace various packages that used to contain XKB data.
+    - Create symlinks from /etc/X11/xkb/ subdirectories and .dir files
+      to the corresponding directories and files in /usr/share/X11/xkb/.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 15 Jan 2008 12:25:41 +0200
+
+xkeyboard-config (1.1~cvs.20080104.1-1) unstable; urgency=low
+
+  * New upstream CVS snapshot from January 4th 2008:
+     + fixed Latin American layout. (Closes: #444035)
+     + fixed Cherry CyMotion Master Linux layout. (Closes: #343929)
+     + fixed HP Compaq nx9020 layout. (Closes: #395883)
+     + split Serbia and Montenegro. (Closes: #451622)
+     + added fr(nodeadkeys) to mac. (Closes: #456942)
+     + fixed mapping for shift+backslash in "il" keyboard. (Closes: #457927)
+     + added English quotation marks to intl keymaps. (Closes: #453675)
+  * debian/control:
+     + bumped Standards-Version to 3.7.3.
+     + used Vcs-Git and Vcs-Browser fields.
+     + use a Homepage field.
+  * Refreshed resync_rules_base.diff. (Closes: #442942)
+  * Documented the creation of a custom layout in README.Debian and
+    made /usr/share/X11/xkb/rules/base.xml a symlink to
+    /etc/X11/xkb/base.xml.
+    (Closes: #410628, #410903, #438940)
+  * Documented how to remove conffiles left in /etc/X11/xkb/ in
+    README.Debian. (Closes: #366180)
+  * New patch: add_void_definition_pl-324647.diff
+     + don't use rules/latin's definitions for alt+{w,q,f}.
+       (Closes: #324647)
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Sun, 13 Jan 2008 15:33:54 +0100
+
+xkeyboard-config (1.0~cvs.20070916-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Add patch cs_hr_any, avoid using the "any" symbol in cs and hr, since
+      console-setup doesn't understand it (Ubuntu: #93077).
+    - Keep preinst conffile upgrade code for dapper -> hardy upgrades.
+    - Add transitional package for xkeyboard-config.
+    - Replace various packages that used to contain XKB data.
+  * Refresh cs_hr_any to apply cleanly.
+
+ -- Loic Minier <lool@dooz.org>  Fri, 23 Nov 2007 12:15:39 +0100
+
+xkeyboard-config (1.0~cvs.20070916-1) unstable; urgency=low
+
+  * New upstream CVS snapshot from September 16th 2007:
+     + fix evdev layout. (Closes: #442479)
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Sun, 16 Sep 2007 18:51:30 +0200
+
+xkeyboard-config (1.0~cvs.20070914-1) unstable; urgency=low
+
+  * New upstream CVS snapshot from September 14th 2007:
+     + advertise all Romanian layouts. Thanks Eddy Petrișor for the
+       patch. (Closes: #436993)
+     + fix ctrl:swapcaps. (Closes: #410060)
+     + add missing virtual keys from evdev keycodes. Thanks Yann
+       Vernier for the patch. (Closes: #432613)
+     + support Asus 6000 series laptop keyboard. Thanks Arnout Boelens
+     for the patch. (Closes: #383953)
+  * Update debian/*.dir files.
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Fri, 14 Sep 2007 19:12:27 +0200
+
+xkeyboard-config (1.0~cvs.20070721-1) unstable; urgency=low
+
+  [ Julien Cristau ]
+  * Fix watch file to look for tarballs at http://xlibs.fd.o/xkbdesc/
+
+  [ Mohammed Adnène Trojette ]
+  * New upstream CVS snapshot from July 21st 2007:
+     + include xkb files for the Happy Hacking keyboard. (Closes: #167370)
+     + fix us layout. (Closes: #421532)
+     + fix se layout. (Closes: #425304)
+     + fix de+nodeadkey layout. (Closes: #432297)
+  * Patches refreshed:
+     + fix FTBFS. (Closes: #424112)
+  * Patches obsoleted:
+     + greek.diff.
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Sat, 21 Jul 2007 20:51:07 +0200
+
+xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low
+
+  * Add myself to Uploaders. (Closes: #401777)
+  * CVS Snapshot from April 24 2007:
+     + fix Uzbek layout. (Closes: #412528)
+     + fix typo in compat/misc. (Closes: #412352)
+     + adjust Dutch layout. (Closes: #286581)
+     + fix keymap on iBook G4 Japanese keyboard. (Closes: #374070)
+     + fix <K6C> key in symbols/inet. (Closes: #409982)
+     + update Finnish layout. (Closes: #405207)
+     + add Logitech Cordless Desktop Optical support. (Closes: #391192)
+     + fix a jp106 backslash/yen issue. (Closes: #280579)
+  * Patches refreshed:
+     + resync_rules_base.diff.
+  * Patches obsoleted or merged upstream:
+     + revert_bz8572.diff
+     + po.diff
+     + bz1576.diff
+     + bz8668.diff
+     + compatibility.diff
+     + japan.diff
+  * Patches to send upstream:
+     + 001_keypad_comma.diff: add keypad:comma option. (Closes: #409117)
+  * Bump debhelper compatibility to 5.
+  * Remove reference to xlibs. (Closes: #413620)
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Sat, 28 Apr 2007 20:35:01 +0200
+
+xkeyboard-config (0.9-4ubuntu3) gutsy; urgency=low
+
+  * debian/patches/romanian_comma.diff : Patch from upstream exposing
+    two additional Romanian variants that use commas instead of cedillas.
+    The comma variants are the new standard layouts and this patch is needed
+    for them to appear in the keyboard-preferences dialog
+
+ -- Jani Monoses <jani@ubuntu.com>  Sun, 30 Sep 2007 16:48:01 +0200
+
+xkeyboard-config (0.9-4ubuntu2) gutsy; urgency=low
+
+  [ Ante Karamatić ]
+  * debian/patches/cs_hr_any.diff: Avoid using the "any" symbol in cs and
+    hr, since console-setup doesn't understand it (LP: #93077).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 24 Sep 2007 12:44:06 +0100
+
+xkeyboard-config (0.9-4ubuntu1) feisty; urgency=low
+
+  * Resynchronise with Debian. New packaging; old Ubuntu changelog preserved
+    as debian/changelog.Ubuntu in the source package. Remaining changes:
+    - Add transitional package for xkeyboard-config.
+    - Replace various packages that used to contain XKB data.
+  * Create symlinks from /etc/X11/xkb/ subdirectories and .dir files to the
+    corresponding directories and files in /usr/share/X11/xkb/. Making the
+    whole of /etc/X11/xkb into a symlink would be simpler, but that's made
+    difficult by the fact that xkbutils ships two symlinks there.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 28 Nov 2006 14:18:52 +0000
+
+xkeyboard-config (0.9-4) unstable; urgency=low
+
+  [ Denis Barbier ]
+  + debian/patches/po.diff: Escape <> characters in Slovenian
+    PO file, base.xml was not a valid XML file.  Closes: #394060
+
+  [ Loic Minier ]
+  * Upload.
+
+ -- Denis Barbier <barbier@debian.org>  Fri, 20 Oct 2006 22:24:57 +0200
+
+xkeyboard-config (0.9-3) unstable; urgency=high
+
+  [ Denis Barbier ]
+  * debian/patches/resync_rules_base.diff: Regenerate to fix FTBFS.
+    Closes: #393166  Thanks Andreas Jochens.
+    Urgency set to high because of the FTBFS.
+
+  + debian/patches/po.diff: Update Slovenian PO file.
+
+  + debian/patches/bz8668.diff: New patch to fix Ctrl-Alt-Backspace
+    with Macintosh us layout.
+
+  * debian/patches/revert_bz8572.diff: Sync to CVS.
+
+  [ Drew Parsons ]
+  * Thank you to Denis for the hard work keeping the keyboards typing.
+
+ -- Drew Parsons <dparsons@debian.org>  Wed, 18 Oct 2006 10:55:11 +1000
+
+xkeyboard-config (0.9-2) unstable; urgency=low
+
+  + debian/patches/po.diff: Update Hungarian PO file.
+
+  + debian/patches/revert_bz8572.diff: New patch to revert changes
+    introduced in BZ8572, they cause trouble with Ctrl-Alt-F*
+    combinations.  Closes: #392911.
+
+ -- Denis Barbier <barbier@debian.org>  Sat, 14 Oct 2006 19:55:14 +0200
+
+xkeyboard-config (0.9-1) unstable; urgency=low
+
+  * New upstream release.
+    Almost all upstream fixes were already backported, this package
+    is very similar to 0.8-18.
+
+  * Drop patches merged upstream:
+    + debian/patches/latin_quotes.diff
+    + debian/patches/fix_xkbcomp_crash.diff
+
+  * This version adds leftsinglequotemark and rightsinglequotemark to
+    symbols/us(alt-intl).  Closes: #391995 Thanks Jan Willem Stumpel.
+
+ -- Denis Barbier <barbier@debian.org>  Wed, 11 Oct 2006 22:50:37 +0200
+
+xkeyboard-config (0.8-18) unstable; urgency=low
+
+  * Sync to CVS 2006-10-05.
+    Drop patches merged upstream:
+    + debian/patches/mac-gb-euro.diff
+    + debian/patches/symbols-typos.diff
+    + debian/patches/finnish-macron.diff
+    + debian/patches/rewrite-mac.diff
+
+  * debian/patches/japan.diff: New patch so that the latin variant of
+    jp layout is selected with multiple layouts.
+
+ -- Denis Barbier <barbier@debian.org>  Thu,  5 Oct 2006 22:12:56 +0200
+
+xkeyboard-config (0.8-17) unstable; urgency=low
+
+  * debian/patches/finnish-macron.diff: In symbols.fi, replace macron
+    by dead_macron.  Closes: #387320  Thanks Martin-Éric Racine.
+
+  * debian/patches/symbols-typos.diff: Fix typos in keysym names.
+    Closes: #390876  Thanks Sam Hocevar.
+
+  * debian/patches/rewrite-mac.diff: Add includes to mac layouts in
+    symbols/* to reduce key definitions.
+
+ -- Denis Barbier <barbier@debian.org>  Tue,  3 Oct 2006 22:18:31 +0200
+
+xkeyboard-config (0.8-16) unstable; urgency=low
+
+  * Sync to CVS 2006-10-02.
+    + Macintosh layouts are also available for PC models.
+    + New nbsp:* options to add nobreakspace keysym on space key.
+      Closes: #361777  Thanks Samuel Thibault.
+
+  * Thix patch has been merged upstream and is removed:
+    + debian/patches/thinkpad.diff
+
+  * debian/patches/unhide_lv3_enter_switch.diff: New patch to
+    expose lv3:enter_switch, it can be useful when using pc105
+    model on a Mac laptop.
+
+ -- Denis Barbier <barbier@debian.org>  Tue,  3 Oct 2006 00:35:01 +0200
+
+xkeyboard-config (0.8-15) unstable; urgency=low
+
+  * debian/patches/greek.diff: New patch to replace dead_horn and
+    dead_ogonek by U0313/U0314, which are the correct breathing
+    signs for polytonic Greek.  This change can be performed now
+    that an updated el_GR.UTF-8/Compose file hit testing.
+    Closes: #386385  Thanks Jan Willem Stumpel.
+
+  * debian/patches/compatibility.diff: Add compatibility rules to
+    make sure that changes in symbols/pc do not cause trouble.
+    Closes: #389589  Thanks Robert Bihlmeyer.
+
+ -- Denis Barbier <barbier@debian.org>  Wed, 27 Sep 2006 23:19:39 +0200
+
+xkeyboard-config (0.8-14) unstable; urgency=low
+
+  * Sync to CVS 2006-09-25.
+  * These patches have been merged upstream and are removed:
+    + debian/patches/macbook_layouts.diff
+    + debian/patches/fr.po.diff
+
+  * debian/patches/bz1576.diff: Minor fixes in Macintosh layouts.
+
+  * debian/patches/thinkpad.diff: Fix geometry/thinkpad.
+    Closes: #389358  Thanks Wouter Cloetens
+
+ -- Denis Barbier <barbier@debian.org>  Mon, 25 Sep 2006 21:38:39 +0200
+
+xkeyboard-config (0.8-13) unstable; urgency=low
+
+  * Sync to CVS 2006-09-18.
+    Support for Macintosh keyboards has been fully reworked, deeply
+    tested by debian-powerpc readers and merged upstream.  Macintosh
+    layouts can now be as customized as PC ones with options.
+    Closes: #121297, #111905, #166478, #234113, #319423, #256442
+
+  * These patches are removed because they are obsolete:
+    + debian/patches/cvs_revert.diff
+    + debian/patches/inet.diff
+    + debian/patches/mac_fnkeys.diff
+    + debian/patches/macintosh.diff
+    + debian/patches/macintosh-gb.diff
+    + debian/patches/mac_swap_kp.diff
+    + debian/patches/mac_nodeadkeys.diff
+
+  * debian/README.Debian: Replace its obsolete content by informations 
+    to powerpc users.
+
+  * debian/patches/fix_xkbcomp_crash.diff: New patch to fix an
+    xkbcomp crash introduced in CVS and not fixed yet.
+    Closes: #387917 Thanks Helge Kreutzmann and Wolfgang Pfeiffer.
+
+  * debian/patches/mac_poweroff.diff: Add the power key to Apple
+    laptops.  Thanks Jörg Sommer.
+
+  * debian/patches/macbook_layouts.diff: For MacBook models, load
+    symbols from symbols/macintosh_vndr/* instead of symbols/*.
+
+  * debian/patches/mac-gb-euro.diff: New patch to add the Euro sign
+    on key 2 for the Macintosh gb layout.
+
+  * debian/patches/fr.po.diff: Fix po/fr.po, the version currently
+    in CVS is broken.
+
+ -- Denis Barbier <barbier@debian.org>  Sat, 23 Sep 2006 00:18:38 +0200
+
+xkeyboard-config (0.8-12) unstable; urgency=low
+
+  * Sync to CVS 2006-09-05.
+    + Closes: #362850: support alt-caps to toggle groups
+    Drop patches merged upstream:
+    + debian/patches/fix_symbols_hr.diff
+    + debian/patches/fix_symbols_key_type.diff
+    + debian/patches/ralt_switch_multikey.diff
+    + debian/patches/rearrange_options.diff
+    + debian/patches/microsoft.diff
+
+ -- Denis Barbier <barbier@debian.org>  Tue,  5 Sep 2006 19:48:57 +0200
+
+xkeyboard-config (0.8-11) unstable; urgency=low
+
+  * debian/patches/rearrange_options.diff: New patch to modify options
+    order in rules/base so that altwin:meta_win can be overriden by
+    other options.  Closes: #385355  Thanks Ben Mueller
+
+  * debian/patches/fix_symbols_key_type.diff: Several layouts did
+    define global key types, so keys for other groups were broken.
+    Closes: #373692, #385970  Thanks Robert Marlow and Jan Willem Stumpel
+
+ -- Denis Barbier <barbier@debian.org>  Mon,  4 Sep 2006 21:50:00 +0200
+
+xkeyboard-config (0.8-10) unstable; urgency=low
+
+  * Really fix Mac nodeadkeys variants, rules/base was not properly
+    rebuilt.
+
+ -- Denis Barbier <barbier@debian.org>  Thu, 31 Aug 2006 00:30:25 +0200
+
+xkeyboard-config (0.8-9) unstable; urgency=low
+
+  * debian/patches/resync_rules_base.diff: New patch to help keeping
+    rules/base.* and rules/compat/base.* files up-to-date.
+
+  * debian/patches/mac_swap_kp.diff: New patch to swap KP_Delete and
+    KP_Separator on Mac keyboards.  Closes: #328125  Thanks Ben Mueller
+
+  * debian/patches/latin_quotes.diff: New patch; grave and apostrophe
+    on the 4th level can be provided via simpler keystrokes.  They were
+    historically provided as alternative quotes, but these ones are
+    better alternatives.  Closes: #308196 Thanks Mark Sheppard
+
+  * debian/patches/mac_nodeadkeys.diff:  New patch to fix nodeadkeys variants,
+    they were badly broken.
+
+ -- Denis Barbier <barbier@debian.org>  Wed, 30 Aug 2006 22:17:59 +0200
+
+xkeyboard-config (0.8-8) unstable; urgency=low
+
+  * Sync to CVS 2006-08-28.
+    + symbols/inet, keycodes/evdev: updated evdev
+    + symbols/pl: added pl(csb)
+    + symbols/bt: fixed Bhutan
+    + symbols/us: added dvorak-classic  Closes: #257626, #264647
+    + symbols/inet: added acer_c300
+    + symbols/lk: updated Sinhala
+    + symbols/de: added Mac variants
+    + symbols/ch: fixed KPDL in ch(de_mac)
+
+  * debian/patches/update-bt.diff: Patch dropped, merged upstream.
+
+  * debian/patches/fix_symbols_hr.diff: New patch to fix Croatian layout,
+    some differences with previous XFree86 keymap had been introduced
+    in xkeyboard-config.  Closes: #379292  Thanks Josip Rodin
+
+  * debian/patches/mac_fnkeys.diff: New patch to fix console switching
+    with Macintosh us layout.  Closes: #370564  Thanks Ben Mueller
+
+  * debian/patches/ralt_switch_multikey.diff: New patch to enable again
+    lv3:ralt_switch_multikey which had been dropped from xkeyboard-config.
+    Closes: #364435  Thanks Klaus Ethgen
+
+  * debian/patches/microsoft.diff: New patch to enable again the
+    'microsoft' model, it had been disabled by error in previous uploads.
+    Closes: #379917 Thanks Phil Armstrong
+
+  * debian/patches/inet.diff: New patch to add apple, apple_laptop,
+    hpxt1000 and latitude to $inetkbds.  Closes: #381882
+    Thanks Steinar H. Gunderson
+
+ -- Denis Barbier <barbier@debian.org>  Sat, 26 Aug 2006 14:54:51 +0200
+
+xkeyboard-config (0.8-7) unstable; urgency=low
+
+  * debian/patches/macintosh-gb.diff: New patch to fix <LSGT> and <TLDE> keys.
+    Closes: #379148 Thanks Roger Leigh
+
+  * debian/patches/macintosh.diff: New patch to include 'latin' layout.
+    Closes: #366615, #363525
+
+  * debian/patches/update-bt.diff: New patch to update the Bhutanese layout.
+    Closes: #378309 Thanks Christian Perrier
+
+  * debian/rules: Make sure that rules/base{,.lst,.xml} files are rebuilt.
+
+ -- Denis Barbier <barbier@debian.org>  Mon, 14 Aug 2006 16:10:41 +0200
+
+xkeyboard-config (0.8-6) unstable; urgency=low
+
+  * debian/control: Move debhelper from Build-Depends-Indep to Build-Depends.
+
+  * debian/control: Bump Standards-Version to 3.7.2, no changes needed.
+
+  * debian/control: Use quilt to manage changes.
+
+  * Sync with CVS 2006-07-02.
+    The following bugs have been fixed upstream:
+    + XF86AudioRaiseVolume is defined twice for Logitech keyboards.
+      Closes: #363925
+    + hr(us) layout apparently broken.  Closes: #373833
+    + symbols/inet and rules/base.* do not match.  Closes: #368885
+    + no korean alphabet (hangul) mapping support.  Closes: #342615
+
+  * Drop fr.po.diff, included upstream.
+
+ -- Denis Barbier <barbier@debian.org>  Sun,  2 Jul 2006 22:11:44 +0200
+
+xkeyboard-config (0.8-5) unstable; urgency=low
+
+  * Add a symlink rules/xfree86 -> rules/base.  Thanks Daniel Stone.
+
+ -- Denis Barbier <barbier@debian.org>  Fri, 14 Apr 2006 22:30:25 +0200
+
+xkeyboard-config (0.8-4) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Thu,  6 Apr 2006 19:56:38 -0400
+
+xkeyboard-config (0.8-3) experimental; urgency=low
+
+  * Add a note into NEWS.Debian telling to read README.Debian.
+  * Improve README.Debian again.
+  * Replace /etc/X11/xkb by /usr/share/X11/xkb in docs/README.config too.
+
+ -- Denis Barbier <barbier@debian.org>  Tue, 28 Mar 2006 20:52:21 +0200
+
+xkeyboard-config (0.8-2) experimental; urgency=low
+
+  * Explain in README.Debian how to use xkb-data 0.8 with xorg < 7.0.
+    Thanks Andreas Kroschel  (Closes: #357207)
+  * Update po/fr.po
+
+ -- Denis Barbier <barbier@debian.org>  Thu, 16 Mar 2006 23:27:19 +0100
+
+xkeyboard-config (0.8-1) experimental; urgency=low
+
+  * New upstream release.
+  * This release includes the Khmmer layout.  Closes: #355613
+  * Add Build-Depends-Indep: libxml-parser-perl, which is needed to build rules.xml.
+  * Modify debian/rules so that xkbcomp is not required to build this package.
+    Closes: #355742
+  * Move XKB files into /usr/share/X11/xkb and purge unmodified configuration file
+    when upgrading from previous xkb-data releases.
+  * Remove xkbcomp symlink, it is no more needed.  Closes: #356529
+  * Set Maintainer to Debian X Strike Force, and myself to Uploaders.
+
+ -- Denis Barbier <barbier@debian.org>  Mon, 13 Mar 2006 21:21:25 +0100
+
+xkeyboard-config (0.6-2) experimental; urgency=low
+
+  * symbols/compose: add CapsLock as a compose key.  Closes: #343287
+    Thanks Andreas Kroschel.
+  * symbols/group: add ScrollLock as a group switcher key.
+    Thanks Andreas Kroschel.
+
+ -- Denis Barbier <barbier@debian.org>  Fri, 16 Dec 2005 17:54:43 +0100
+
+xkeyboard-config (0.6-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control: Bump Standards-Version to 3.6.2, no changes needed
+    in packaging.
+  * debian/README.Debian: Add a note explaining how to use xkeyboard-config.
+  * Since binary package is xkb-data, files are installed under
+    /etc/X11/xkb-data and not /etc/X11/xkeyboard-config.
+
+ -- Denis Barbier <barbier@debian.org>  Thu,  6 Oct 2005 23:19:59 +0200
+
+xkeyboard-config (0.5-2) experimental; urgency=low
+
+  * Some packages have a versioned dependency on xlibs, so Replaces
+    does not work here.  For the moment, XKB files are moved to
+    /etc/X11/xkeyboard-config
+
+ -- Denis Barbier <barbier@debian.org>  Thu, 17 Mar 2005 22:25:02 +0100
+
+xkeyboard-config (0.5-1) experimental; urgency=low
+
+  * Initial upload.  Closes: #274299
+  * Uploaded to experimental until we decide what to do with the
+    xlibs <-> xkb-data transition.
+
+ -- Denis Barbier <barbier@debian.org>  Wed,  2 Mar 2005 22:28:23 +0100
+
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/xkb-data-legacy.install
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/xkb-data-legacy.install
@@ -0,0 +1 @@
+usr/share/X11/xkb/*
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/rules
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/rules
@@ -0,0 +1,133 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+	confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+xkb_base := /usr/share/X11/xkb
+stamp := stamp-dir/
+QUILT := quilt --quiltrc debian/patches/quiltrc
+
+$(stamp):
+	mkdir $@
+
+patch: $(stamp)patch
+$(stamp)patch: $(stamp)
+	@if $(QUILT) next >/dev/null 2>&1; then \
+	  echo -n "Applying patches..."; \
+	  if $(QUILT) push -a -v > ${stamp}patch-log 2>&1; then \
+	    echo "successful."; \
+	    mv ${stamp}patch-log $@; \
+	  else \
+	    echo "failed! (check ${stamp}patch-log for details)"; \
+	    exit 1; \
+	  fi; \
+	else \
+	  echo "No patches to apply"; \
+	fi
+	: > rules/base.mlv_s.part
+
+unpatch:
+	@echo -n "Unapplying patches..."
+	@if $(QUILT) top >/dev/null 2>&1; then \
+	  if $(QUILT) pop -a -v > $(stamp)unpatch-log 2>&1; then \
+	    echo "successful."; \
+	  else \
+	    echo "failed! (check $(stamp)unpatch-log for details)"; \
+	    exit 1; \
+	  fi; \
+	else \
+	  echo "nothing to do."; \
+	fi
+	-rm -f $(stamp)patch $(stamp)patch-log $(stamp)unpatch-log
+	-rm -rf .pc
+
+config.status: $(stamp)configure
+$(stamp)configure: $(stamp)patch
+	dh_testdir
+	./configure $(confflags) \
+	  --prefix=/usr \
+	  --disable-xkbcomp-symlink --with-xkb-rules-symlink=xfree86,xorg \
+	  --with-xkb-base=$(xkb_base) \
+	  XKBCOMP=/no/thanks
+	touch $@
+
+build: $(stamp)build
+$(stamp)build: $(stamp)configure
+	dh_testdir
+
+	# Files kept so that xkbcomp is not needed
+	for d in compat geometry keycodes keymap semantics symbols types; \
+	  do cp debian/$$d.dir $$d/; done
+	$(MAKE)
+	touch $@
+
+clean: $(stamp) unpatch
+	dh_testdir
+	dh_testroot
+	rm -rf $(stamp)
+
+	[ ! -f Makefile ] || $(MAKE) distclean
+	# Files not cleaned up
+	-rm -f intltool-extract intltool-merge intltool-update
+	-rm -f rules/base.xml
+	-rm -f po/.intltool-merge-cache
+	dh_clean 
+
+deb:
+	dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
+
+dir:
+	set -e; for f in compat geometry keycodes keymap semantics symbols types; do \
+	  rm -f $$f/$$f.dir; \
+	  cd $$f; \
+	  make $$f.dir XKBCOMP=xkbcomp; \
+	  LC_ALL=C sort -k3 $$f.dir > $$f.new && mv $$f.new $$f.dir; \
+	  cd ..; \
+	  cp $$f/$$f.dir debian/; \
+	done
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/xkb-data
+	#  Remove this symlink, it is no more needed
+	rm -f $(CURDIR)/debian/xkb-data/$(xkb_base)/compiled
+
+        # Move base.xml to /etc/X11/xkb/ and make
+        # /usr/share/X11/xkb/rules/base.xml links to it
+	mv debian/xkb-data/usr/share/X11/xkb/rules/base.xml debian/xkb-data/etc/X11/xkb/
+	dh_link etc/X11/xkb/base.xml usr/share/X11/xkb/rules/base.xml
+
+# Build architecture-dependent files here.
+binary-arch: build install
+# We have nothing to do by default.
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/preinst
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/preinst
@@ -0,0 +1,58 @@
+#! /bin/sh
+
+set -e
+rm_conffile() {
+      CONFFILE="$1"
+      OLD="$2"
+
+      if [ -e "$CONFFILE" ]; then
+              md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+              [ "$md5sum" != "$OLD" ] || rm -f "$CONFFILE"
+     fi
+}
+
+case "$1" in
+    install|upgrade)
+        # TODO: we should really have rollback code for all of this.
+        if dpkg --compare-versions "$2" le "0.9-1"; then
+            dpkg-query -W -f='${Conffiles}' xkeyboard-config 2>/dev/null |\
+              while read cf md5sum
+            do
+                rm_conffile $cf $md5sum
+            done
+
+            for link in xfree86 xfree86.lst xfree86.xml xorg xorg.lst xorg.xml; do
+                rm -f "/etc/X11/xkb/rules/$link"
+            done
+
+            for dir in compat geometry keycodes keymap rules semantics symbols types; do
+                if [ -d "/etc/X11/xkb/$dir" ]; then
+                    find "/etc/X11/xkb/$dir" -depth -type d -print0 | \
+                        xargs -0r rmdir --ignore-fail-on-non-empty
+                    if [ -d "/etc/X11/xkb/$dir" ]; then
+                        cat >&2 <<EOF
+
+WARNING: /etc/X11/xkb/$dir had local changes! XKB configuration has
+moved to /usr/share/X11/xkb. Preserving as /etc/X11/xkb/$dir.dpkg-old.
+EOF
+                        mv "/etc/X11/xkb/$dir" "/etc/X11/xkb/$dir.dpkg-old"
+                    fi
+                fi
+                if [ "$dir" != rules ]; then
+                    if [ -f "/etc/X11/xkb/$dir.dir" ]; then
+                        cat >&2 <<EOF
+
+WARNING: /etc/X11/xkb/$dir.dir had local changes! XKB configuration has
+moved to /usr/share/X11/xkb. Preserving as /etc/X11/xkb/$dir.dir.dpkg-old.
+EOF
+                        mv "/etc/X11/xkb/$dir.dir" "/etc/X11/xkb/$dir.dir.dpkg-old"
+                    fi
+                fi
+            done
+        fi
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- xkeyboard-config-1.1~cvs.20080104.1.orig/debian/compat
+++ xkeyboard-config-1.1~cvs.20080104.1/debian/compat
@@ -0,0 +1 @@
+5
--- xkeyboard-config-1.1~cvs.20080104.1.orig/symbols/cs
+++ xkeyboard-config-1.1~cvs.20080104.1/symbols/cs
@@ -0,0 +1,261 @@
+// Bosnian, Croatian, Serbian and Slovenian XKB keyboard mapping
+// (derived from "Danube" D.2)
+//
+// Danube D.2 from 2003-05-12 is available at http://srpski.org/dunav/
+//
+// Original authors:
+//  Danilo Segan (Данило Шеган) <danilo@kvota.net>
+//  Chusslove Illich (Часлав Илић) <chaslav@sezampro.yu>
+//
+// Danilo Segan <danilo@kvota.net>:
+// - Modified for inclusion in XFree86
+// - Further modifications on 2005-08-18 to support Bosnian, Croatian
+//   and Slovenian in xkeyboard-config
+//  
+// $XKeyboardConfig: xkeyboard-config/symbols/cs,v 1.7 2007/07/15 22:12:12 svu Exp $
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+  name[Group1]= "Serbia and Montenegro";
+
+  include "cs(level3)"
+  include "cs(common)"
+  include "cs(cyralpha)"
+  include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "latin" {
+
+  name[Group1]= "Serbia and Montenegro - Latin";
+
+  include "latin(type3)"
+  include "cs(latalpha)"
+  include "cs(level3)"
+  include "cs(common)"
+  include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "yz" {
+  // Cyrillic_zhe and Cyrillic_ze swapped.
+
+  name[Group1]= "Serbia and Montenegro - Z and ZHE swapped";
+
+  include "cs(basic)"
+
+  key <AD06> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // y
+  key <AB01> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // z
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "common" {
+  // "Common" keys: keys which are same for both latin and cyrillic keyboards
+
+  key.type[Group1] = "FOUR_LEVEL";
+
+  key <TLDE> {   [ quoteleft,           asciitilde,    any,any ]   }; //
+  key <AE01> {   [ 1,                   exclam,        any,any ]   }; //
+  key <AE02> {   [ 2,                   quotedbl,      any,any ]   }; //
+  key <AE03> {   [ 3,                   numbersign,    any,any ]   }; //
+  key <AE04> {   [ 4,                   dollar,        any,any ]   }; //
+  key <AE05> {   [ 5,                   percent,       any,any ]   }; //
+  key <AE06> {   [ 6,                   ampersand,     any,any ]   }; //
+  key <AE07> {   [ 7,                   slash,         any,any ]   }; //
+  key <AE08> {   [ 8,                   parenleft,     any,any ]   }; //
+  key <AE09> {   [ 9,                   parenright,    any,any ]   }; //
+  key <AE10> {   [ 0,                   equal,         any,any ]   }; //
+  key <AE11> {   [ apostrophe,          question,      any,any ]   }; //
+  key <AE12> {   [ plus,                asterisk,      any,any ]   }; //
+
+  key <AB08> {   [ comma,               semicolon,     any,any ]   }; //
+  key <AB09> {   [ period,              colon,         any,any ]   }; //
+  key <AB10> {   [ minus,               underscore,    any,any ]   }; //
+
+  include "kpdl(comma)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "cyralpha" {
+
+  key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
+
+  key <AD01> {   [ Cyrillic_lje,        Cyrillic_LJE,   any,any ]   }; // q
+  key <AD02> {   [ Cyrillic_nje,        Cyrillic_NJE,   any,any ]   }; // w
+  key <AD03> {   [ Cyrillic_ie,         Cyrillic_IE,    any,any ]   }; // e
+  key <AD04> {   [ Cyrillic_er,         Cyrillic_ER,    any,any ]   }; // r
+  key <AD05> {   [ Cyrillic_te,         Cyrillic_TE,    any,any ]   }; // t
+  key <AD06> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // y
+  key <AD07> {   [ Cyrillic_u,          Cyrillic_U,     any,any ]   }; // u
+  key <AD08> {   [ Cyrillic_i,          Cyrillic_I,     any,any ]   }; // i
+  key <AD09> {   [ Cyrillic_o,          Cyrillic_O,     any,any ]   }; // o
+  key <AD10> {   [ Cyrillic_pe,         Cyrillic_PE,    any,any ]   }; // p
+  key <AD11> {   [ Cyrillic_sha,        Cyrillic_SHA,   any,any ]   }; // [ {
+  key <AD12> {   [ Serbian_dje,         Serbian_DJE,    any,any ]   }; // ] }
+
+  key <AC01> {   [ Cyrillic_a,          Cyrillic_A,     any,any ]   }; // a
+  key <AC02> {   [ Cyrillic_es,         Cyrillic_ES,    any,any ]   }; // s
+  key <AC03> {   [ Cyrillic_de,         Cyrillic_DE,    any,any ]   }; // d
+  key <AC04> {   [ Cyrillic_ef,         Cyrillic_EF,    any,any ]   }; // f
+  key <AC05> {   [ Cyrillic_ghe,        Cyrillic_GHE,   any,any ]   }; // g
+  key <AC06> {   [ Cyrillic_ha,         Cyrillic_HA,    any,any ]   }; // h
+  key <AC07> {   [ Cyrillic_je,         Cyrillic_JE,    any,any ]   }; // j
+  key <AC08> {   [ Cyrillic_ka,         Cyrillic_KA,    any,any ]   }; // k
+  key <AC09> {   [ Cyrillic_el,         Cyrillic_EL,    any,any ]   }; // l
+  key <AC10> {   [ Cyrillic_che,        Cyrillic_CHE,   any,any ]   }; // ; :
+  key <AC11> {   [ Serbian_tshe,        Serbian_TSHE,   any,any ]   }; // ' "
+  key <BKSL> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // \ |
+
+  key <AB01> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // z
+  key <AB02> {   [ Cyrillic_dzhe,       Cyrillic_DZHE,  any,any ]   }; // x
+  key <AB03> {   [ Cyrillic_tse,        Cyrillic_TSE,   any,any ]   }; // c
+  key <AB04> {   [ Cyrillic_ve,         Cyrillic_VE,    any,any ]   }; // v
+  key <AB05> {   [ Cyrillic_be,         Cyrillic_BE,    any,any ]   }; // b
+  key <AB06> {   [ Cyrillic_en,         Cyrillic_EN,    any,any ]   }; // n
+  key <AB07> {   [ Cyrillic_em,         Cyrillic_EM,    any,any ]   }; // m
+};
+
+
+partial hidden alphanumeric_keys
+xkb_symbols "latalpha" {
+
+  key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
+
+  key <AD11> {   [ scaron,              Scaron,        any,any ]   }; //
+  key <AD12> {   [ dstroke,             Dstroke,       any,any ]   }; //
+
+  key <AC10> {   [ ccaron,              Ccaron,        any,any ]   }; //
+  key <AC11> {   [ cacute,              Cacute,        any,any ]   }; //
+  key <BKSL> {   [ zcaron,              Zcaron,        any,any ]   }; //
+
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "twoletter" {
+  // These are letters which are written in latin transcription with two-characters.
+
+  key <AD01> {   type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC",
+                 [ U1C9,                U1C8,         any,   U1C7 ]   }; // q
+  key <AD02> {   type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC",
+                 [ U1CC,                U1CB,         any,   U1CA ]   }; // w
+  key <AB02> {   type[Group1] = "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC",
+                 [ U1C6,                U1C5,         any,   U1C4 ]   }; // x
+
+  // Also replace letter Y with Zcaron, since Y is of no use any longer
+  key <AB01> {   [ zcaron,              Zcaron,        any,any ]   }; //
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "level3" {
+  key <TLDE> {   [ any,any,     notsign,             notsign     ]   }; // ` ~
+  key <AE01> {   [ any,any,     dead_tilde,          asciitilde  ]   }; // 1 !
+  key <AE02> {   [ any,any,     dead_caron,          caron 	 ]   }; // 2 @
+  key <AE03> {   [ any,any,     dead_circumflex,     asciicircum ]   }; // 3 #
+  key <AE04> {   [ any,any,     dead_breve,          breve 	 ]   }; // 4 $
+  key <AE05> {   [ any,any,     dead_abovering,      degree	 ]   }; // 5 %
+  key <AE06> {   [ any,any,     dead_ogonek,         ogonek	 ]   }; // 6 ^
+  key <AE07> {   [ any,any,     dead_grave,          grave 	 ]   }; // 7 &
+  key <AE08> {   [ any,any,     dead_abovedot,       abovedot 	 ]   }; // 8 *
+  key <AE09> {   [ any,any,     dead_acute,          apostrophe  ]   }; // 9 (
+  key <AE10> {   [ any,any,     dead_doubleacute,    doubleacute ]   }; // 0 )
+  key <AE11> {   [ any,any,     dead_diaeresis,      diaeresis 	 ]   }; // - _
+  key <AE12> {   [ any,any,     dead_cedilla,        cedilla 	 ]   }; // = +
+
+  key <AD01> {   [ any,any,     backslash,           Greek_OMEGA ]   }; // q
+  key <AD02> {   [ any,any,     bar,                 Lstroke 	 ]   }; // w
+  key <AD03> {   [ any,any,     EuroSign,            EuroSign 	 ]   }; // e
+  key <AD04> {   [ any,any,     paragraph,           registered  ]   }; // r
+  key <AD05> {   [ any,any,     tslash,              Tslash 	 ]   }; // t // ALPHABETIC
+  key <AD06> {   [ any,any,     leftarrow,           yen 	 ]   }; // y
+  key <AD07> {   [ any,any,     downarrow,           uparrow 	 ]   }; // u
+  key <AD08> {   [ any,any,     rightarrow,          idotless 	 ]   }; // i
+  key <AD09> {   [ any,any,     oslash,              Ooblique 	 ]   }; // o // ALPHABETIC
+  key <AD10> {   [ any,any,     thorn,               THORN 	 ]   }; // p // ALPHABETIC
+  key <AD11> {   [ any,any,     division,            dead_abovering ]   }; // [
+  key <AD12> {   [ any,any,     multiply,            dead_macron ]   }; // ]
+
+  key <AC01> {   [ any,any,     ae,            	     AE               ]   }; // a // ALPHABETIC
+  key <AC02> {   [ any,any,     doublelowquotemark,  guillemotright   ]   }; // s
+  key <AC03> {   [ any,any,     leftdoublequotemark, guillemotleft    ]   }; // d
+  key <AC04> {   [ any,any,     bracketleft,         ordfeminine      ]   }; // f
+  key <AC05> {   [ any,any,     bracketright,        ENG 	      ]   }; // g
+  key <AC06> {   [ any,any,     hstroke,             Hstroke 	      ]   }; // h // ALPHABETIC
+  key <AC07> {   [ any,any,     NoSymbol,            NoSymbol 	      ]   }; // j
+  key <AC08> {   [ any,any,     lstroke,             ampersand 	      ]   }; // k
+  key <AC09> {   [ any,any,     lstroke,             Lstroke 	      ]   }; // l
+  key <AC10> {   [ any,any,     dead_acute,          dead_doubleacute ]   }; // ;
+  key <AC11> {   [ any,any,     ssharp,              dead_caron       ]   }; // '
+  key <BKSL> {   [ any,any,     currency,            dead_breve       ]   }; // \
+
+  key <AB01> {   [ any,any,     leftsinglequotemark, guillemotright   ]   }; // z
+  key <AB02> {   [ any,any,     rightsinglequotemark,guillemotleft    ]   }; // x
+  key <AB03> {   [ any,any,     cent,                copyright 	      ]   }; // c
+  key <AB04> {   [ any,any,     at,                  grave 	      ]   }; // v
+  key <AB05> {   [ any,any,     braceleft,           apostrophe       ]   }; // b
+  key <AB06> {   [ any,any,     braceright,          braceright       ]   }; // n
+  key <AB07> {   [ any,any,     asciicircum,         masculine 	      ]   }; // m
+  key <AB08> {   [ any,any,     less,                multiply 	      ]   }; // , <
+  key <AB09> {   [ any,any,     greater,             division 	      ]   }; // . >
+  key <AB10> {   [ any,any,     emdash,              endash   	      ]   }; // / ?
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "latinunicode" {
+  // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj
+  // as single character). You get the title form with AltGr+Shift.
+
+  name[Group1]= "Serbia and Montenegro - Latin Unicode";
+
+  include "cs(latin)"
+  include "cs(twoletter)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "latinyz" {
+  // For those who insist on using "english-position" Z and Y.
+
+  name[Group1]= "Serbia and Montenegro - Latin qwerty";
+
+  include "cs(latin)"
+
+  key <AD06> {   [ y,                   Y,             any,any ]   }; // y
+  key <AB01> {   [ z,                   Z,             any,any ]   }; // z
+};
+
+partial alphanumeric_keys
+xkb_symbols "latinunicodeyz" {
+  // Unicode, ZHE and Z swapped.
+
+  name[Group1]= "Serbia and Montenegro - Latin Unicode qwerty";
+
+  include "cs(latinunicode)"
+
+  key <AD06> {   [ zcaron,              Zcaron,        any,any ]   }; // y
+  key <AB01> {   [ z,                   Z,             any,any ]   }; // z
+};
+
+xkb_symbols "alternatequotes" {
+  // Another acceptable »pair of quotes« for Serbian 
+
+  name[Group1]= "Serbia and Montenegro - With guillemets";
+
+  include "cs(basic)"
+
+  key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
+  key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
+};
+
+xkb_symbols "latinalternatequotes" {
+  // Another acceptable »pair of quotes« for Serbian 
+
+  name[Group1]= "Serbia and Montenegro - Latin with guillemets";
+
+  include "cs(latin)"
+
+  key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
+  key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
+};
--- xkeyboard-config-1.1~cvs.20080104.1.orig/INSTALL
+++ xkeyboard-config-1.1~cvs.20080104.1/INSTALL
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
--- xkeyboard-config-1.1~cvs.20080104.1.orig/mkinstalldirs
+++ xkeyboard-config-1.1~cvs.20080104.1/mkinstalldirs
@@ -0,0 +1,40 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
+
+errstatus=0
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp"
+
+        mkdir "$pathcomp" || lasterr=$?
+
+        if test ! -d "$pathcomp"; then
+  	  errstatus=$lasterr
+        fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here