first feed-in of the layouts. The revolution is coming

275 files changed, 33133 insertions, 3866 deletions

diff --git a/Makefile.am b/Makefile.am
index 62169d2a..9c27edab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,9 @@
-SUBDIRS = intl m4  po 
+SUBDIRS = compat geometry intl keycodes keymap m4 po rules semantics symbols types
 
-xml_in_files = xfree86.xml.in
-xml_DATA = $(xml_in_files:.xml.in=.xml) xkb.dtd
-
-@INTLTOOL_XML_RULE@
-
-EXTRA_DIST= config.rpath mkinstalldirs  config.rpath $(xml_in_files) $(xml_DATA) \
+EXTRA_DIST= config.rpath mkinstalldirs  config.rpath \
        autogen.sh \
        xfree86_xkb_xml.spec \
        xfree86_xkb_xml.spec.in \
        intltool-extract.in intltool-merge.in intltool-update.in
 
-xmldir = $(xkb_base)/rules
-
 ACLOCAL_AMFLAGS = -I m4
diff --git a/README b/README
index ff8a0057..8dd7a58c 100644
--- a/README
+++ b/README
@@ -1,2 +1,25 @@
-This is just a module containing xmlized directory of the 
-XKB configuration repository. At the moment, only xfree86. is maintainer here.
+X Keyboard Extension
+--------------------
+
+The X Keyboard Extension essentially replaces the core protocol definition of
+keyboard. The extension makes possible to clearly and explicitly specify most
+aspects of keyboard behaviour on per-key basis and to more closely track the
+logical and physical state of the keyboard. It also includes a number of
+keyboard controls designed to make keyboards more accessible to people with
+physical impairments.
+
+There are five types of components in the server database corresponing to five
+xkb symbolic names: symbols, geometry, keycodes, compat and types which
+determine the keyboard behaviour. These five components can combined together
+into a resulting keyboard mapping using the 'rules' component.
+
+The complete specification can be found on
+http://www.x-docs.org/XKB/XKBproto.pdf
+
+For XKB configuration information see 'README.config' file.
+
+For information how to further enhance XKB configuration see 'README.enhancing'
+file.
+
+
+$XFree86$
diff --git a/README.config b/README.config
new file mode 100644
index 00000000..229049dc
--- /dev/null
+++ b/README.config
@@ -0,0 +1,198 @@
+                         The XKB Configuration Guide
+
+                         Kamil Toman, Ivan U. Pascal
+
+                              25 November 2002
+
+                                  Abstract
+
+     This document describes how to configure XFree86 XKB from a user's
+     point a few. It converts basic configuration syntax and gives also
+     a few examples.
+
+1.  Overview
+
+The XKB configuration is decomposed into a number of components. Selecting
+proper parts and combining them back you can achieve most of configurations
+you might need. Unless you have a completely atypical keyboard you really
+don't need to touch any of xkb configuration files.
+
+2.  Selecting XKB Configuration
+
+The easiest and the most natural way how to specify a keyboard mapping is to
+use rules component. As its name suggests it describes a number of general
+rules how to combine all bits and pieces into a valid and useful keyboard
+mapping. All you need to do is to select a suitable rules file and then to
+feed it with a few parameters that will adjust the keyboard behaviour to ful-
+fill your needs.
+
+The parameters are:
+
+   o XkbRules - files of rules to be used for keyboard mapping composition
+
+   o XkbModel - name of model of your keyboard type
+
+   o XkbLayout - layout(s) you intend to use
+
+   o XkbVariant - variant(s) of layout you intend to use
+
+   o XkbOptions - extra xkb configuration options
+
+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).
+
+2.1  Basic Configuration
+
+Let's say you want to configure a PC style America keyboard with 104 keys as
+described in xfree86.lst. It can be done by simply writing several lines from
+below to you XFree86 configuration file (often found as /etc/X11/XF86Config-4
+or /etc/X11/XF86Config):
+
+     Section "InputDevice"
+         Identifier "Keyboard1"
+         Driver "Keyboard"
+
+         Option "XkbModel" "pc104"
+         Option "XkbLayout" "us"
+         Option "XKbOptions" ""
+     EndSection
+
+The values of parameters XkbModel and XkbLayout are really not surprising.
+The parameters XkbOptions has been explicitly set to empty set of parameters.
+The parameter XkbVariant has been left out.  That means the default variant
+named basic is loaded.
+
+Of course, this can be also done at runtime using utility setxkbmap.  Shell
+command loading the same keyboard mapping would look like:
+
+     setxkbmap -rules xfree86 -model pc104 -layout us -option ""
+
+The configuration and the shell command would be very analogical for most
+other layouts (internationalized mappings).
+
+2.2  Advanced Configuration
+
+Since XFree86 4.3.x you can use multi-layouts xkb configuration.  What does
+it mean? Basically it allows to load up to four different keyboard layouts at
+a time. Each such layout would reside in its own group. The groups (unlike
+complete keyboard remapping) can be switched very fast from one to another by
+a combination of keys.
+
+Let's say you want to configure your new Logitech cordless desktop keyboard,
+you intend to use three different layouts at the same time - us, czech and
+german (in this order), and that you are used to Alt-Shift combination for
+switching among them.
+
+Then the configuration snippet could look like this:
+
+     Section "InputDevice"
+         Identifier "Keyboard1"
+         Driver "Keyboard"
+
+         Option "XkbModel" "logicordless"
+         Option "XkbLayout" "us,cz,de"
+         Option "XKbOptions" "grp:alt_shift_toggle"
+     EndSection
+
+Of course, this can be also done at runtime using utility setxkbmap.  Shell
+command loading the same keyboard mapping would look like:
+
+     setxkbmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+              -option "grp:alt_shift_toggle"
+
+2.3  Even More Advanced Configuration
+
+Okay, let's say you are more demanding. You do like the example above but you
+want it to change a bit. Let's imagine you want the czech keyboard mapping to
+use another variant but basic.  The configuration snippet then changes into:
+
+     Section "InputDevice"
+         Identifier "Keyboard1"
+         Driver "Keyboard"
+
+         Option "XkbModel" "logicordless"
+         Option "XkbLayout" "us,cz,de"
+         Option "XkbVariant" ",bksl,"
+         Option "XKbOptions" "grp:alt_shift_toggle"
+     EndSection
+
+That's seems tricky but it is not. The logic for settings of variants is the
+same as for layouts, that means the first and the third variant settings are
+left out (set to basic), the second is set to bksl (a special variant with an
+enhanced definition of the backslash key).
+
+Analogically, the loading runtime will change to:
+
+     setxkmap -rules xfree86 -model logicordless -layout "us,cz,de" \
+              -variant ",bksl," -option "grp:alt_shift_toggle"
+
+2.4  Basic Global Options
+
+See rules/*.lst files.
+
+3.  Direct XKB Configuration
+
+Generally, you can directly prescribe what configuration of each of basic xkb
+components should be used to form the resulting keyboard mapping.  This
+method is rather "brute force". You precisely need to know the structure and
+the meaning of all of used configuration components.
+
+This method also exposes all xkb configuration details directly into XFree86
+configuration file which is a not very fortunate fact.  In rare occasions it
+may be needed, though. So how does it work?
+
+3.1  Basic Components
+
+There are five basic components used to form a keyboard mapping:
+
+   o key codes - a translation of the scan codes produced by the keyboard
+     into a suitable symbolic form
+
+   o types - a specification of what various combinations of modifiers pro-
+     duce
+
+   o key symbols - a translation of symbolic key codes into actual symbols
+
+   o geometry - a description of physical keyboard geometry
+
+   o compatibility maps - a specification of what action should each key pro-
+     duce in order to preserve compatibility with XKB-unware clients
+
+3.2  Example Configuration
+
+Look at the following example:
+
+     Section "InputDevice"
+         Identifier "Keyboard0"
+         Driver "Keyboard"
+
+         Option "XkbKeycodes" "xfree86"
+         Option "XkbTypes"    "default"
+         Option "XkbSymbols"  "en_US(pc104)+de+swapcaps"
+         Option "XkbGeometry" "pc(pc104)"
+         Option "XkbCompat"   "basic+pc+iso9995"
+     EndSection
+
+This configuration sets the standard XFree86 default interpretation of key-
+board keycodes, sets the default modificator types. The symbol table is com-
+posed of extended US keyboard layout in its variant for pc keyboards with 104
+keys plus all keys for german layout are redefined respectively. Also the
+logical meaning of Caps-lock and Control keys is swapped.  The standard key-
+board geometry (physical look) is set to pc style keyboard with 104 keys. The
+compatibility map is set to allow basic shifting, to allow Alt keys to be
+interpreted and also to allow iso9995 group shifting.
+
+4.  Keymap XKB Configuration
+
+It is the formerly used way to configure xkb. The user included a special
+keymap file which specified the direct xkb configuration. This method has
+been obsoleted by previously described rules files which are far more flexi-
+ble and allow simpler and more intuitive syntax. It is preserved merely for
+compatibility reasons. Avoid using it if it is possible.
+
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Config.sgml,v 1.4 dawes Exp $
+
+
+$XFree86: $
diff --git a/README.enhancing b/README.enhancing
new file mode 100644
index 00000000..db78026b
--- /dev/null
+++ b/README.enhancing
@@ -0,0 +1,511 @@
+                  How to further enhance XKB configuration
+
+                         Kamil Toman, Ivan U. Pascal
+
+                              25 November 2002
+
+                                  Abstract
+
+     This guide is aimed to relieve one's labour to create a new (inter-
+     nationalized) keyboard layout. Unlike other documents this guide
+     accents the keymap developer's point of view.
+
+1.  Overview
+
+The developer of a new layout should read the xkb protocol specification (The
+X Keyboard Extension: Protocol Specification <URL:http://www.x-
+docs.org/XKB/XKBproto.pdf>) at least to clarify for himself some xkb-specific
+terms used in this document and elsewhere in xkb configuration. Also it shows
+wise to understand how the X server and a client digest their keyboard inputs
+(with and without xkb).
+
+A useful source is also Ivan  Pascal's text about xkb configuration
+<URL:http://www.tsu.ru/~pascal/en/xkb> often referenced throughout this docu-
+ment.
+
+Note that this document covers only enhancements which are to be made to
+XFree86 version 4.3.x and above.
+
+2.  The Basics
+
+At the startup (or at later at user's command) X server starts its xkb key-
+board module extension and reads data from a compiled configuration file.
+
+This compiled configuration file is prepared by the program xkbcomp which
+behaves altogether as an ordinary compiler (see man xkbcomp).  Its input are
+human readable xkb configuration files which are verified and then composed
+into a useful xkb configuration. Users don't need to mess with xkbcomp them-
+selves, for them it is invisible. Usually, it is started upon X server
+startup.
+
+As you probably already know, the xkb configuration consists of five main
+modules:
+
+      Keycodes
+            Tables that defines translation from keyboard scan codes into
+            reasonable symbolic names, maximum, minimum legal keycodes, sym-
+            bolic aliases and description of physically present LED-indica-
+            tors. The primary sence of this component is to allow definitions
+            of maps of symbols (see below) to be independent of physical key-
+            board scancodes. There are two main naming conventions for sym-
+            bolic names (always four bytes long):
+
+               o  names which express some traditional meaning like <SPCE>
+                 (stands for space bar) or
+
+               o  names which express some relative positioning on a key-
+                 board, for example <AE01> (an exclamation mark on US key-
+                 boards), on the right there are keys <AE02>, <AE03> etc.
+
+      Types
+            Types describe how the produced key is changed by active modi-
+            fiers (like Shift, Control, Alt, ...). There are several prede-
+            fined types which cover most of used combinations.
+
+      Compat
+            Compatibility component defines internal behaviour of modifiers.
+            Using compat component you can assign various actions (elabo-
+            rately described in xkb specification) to key events. This is
+            also the place where LED-indicators behaviour is defined.
+
+      Symbols
+            For i18n purposes, this is the most important table. It defines
+            what values (=symbols) are assigned to what keycodes (represented
+            by their symbolic name, see above). There may be defined more
+            than one value for each key and then it depends on a key type and
+            on modifiers state (respective compat component) which value will
+            be the resulting one.
+
+      Geometry
+            Geometry files aren't used by xkb itself but they may be used by
+            some external programs to depict a keyboard image.
+
+All these components have the files located in xkb configuration tree in sub-
+directories with the same names (usually in /usr/lib/X11/xkb).
+
+3.  Enhancing XKB Configuration
+
+Most of xkb enhancements concerns a need to define new output symbols for the
+some input key events. In other words, a need to define a new symbol map (for
+a new language, standard or just to feel more comfortable when typing text).
+
+What do you need to do? Generally, you have to define following things:
+
+   o  the map of symbols itself
+
+   o  the rules to allow users to select the new mapping
+
+   o  the description of the new layout
+
+First of all, it is good to go through existing layouts and to examine them
+if there is something you could easily adjust to fit your needs.  Even if
+there is nothing similar you may get some ideas about basic concepts and used
+tricks.
+
+3.1  Levels And Groups
+
+Since XFree86 4.3.0 you can use multi-layout concept of xkb configuration.
+Though it is still in boundaries of xkb protocol and general ideas, the
+keymap designer must obey new rules when creating new maps. In exchange we
+get a more powerful and cleaner configuration system.
+
+Remember that it is the application which must decide which symbol matches
+which keycode according to effective modifier state. The X server itself
+sends only an input event message to. Of course, usually the general inter-
+pretation is processed by Xlib, Xaw, Motif, Qt, Gtk and similar libraries.
+The X server only supplies its mapping table (usually upon an application
+startup).
+
+You can think of the X server's symbol table as of a irregular table where
+each keycode has its row and where each combination of modifiers determines
+exactly one column. The resulting cell then gives the proper symbolic value.
+Not all keycodes need to bind different values for different combination of
+modifiers.  <ENTER> key, for instance, usually doesn't depend on any modi-
+fiers so it its row has only one column defined.
+
+Note that in XKB there is no prior assumption that certain modifiers are
+bound to certain columns. By editing proper files (see keytypes (section 4.2,
+page 1)) this mapping can be changed as well.
+
+Unlike the original X protocol the XKB approach is far more flexible. It is
+comfortable to add one additional XKB term - group. You can think of a group
+as of a vector of columns per each keycode (naturally the dimension of this
+vector may differ for different keycodes). What is it good for? The group is
+not very useful unless you intend to use more than one logically different
+set of symbols (like more than one alphabet) defined in a single mapping ta-
+ble. But then, the group has a natural meaning - each symbol set has its own
+group and changing it means selecting a different one.  XKB approach allows
+up to four different groups. The columns inside each group are called (shift)
+levels. The X server knows the current group and reports it together with
+modifier set and with a keycode in key events.
+
+To sum it up:
+
+   o  for each keycode XKB keyboard map contains up to four one-dimensional
+     tables - groups (logically different symbol sets)
+
+   o  for each group of a keycode XKB keyboard map contains some columns -
+     shift levels (values reached by combinations of Shift, Ctrl, Alt, ...
+     modifiers)
+
+   o  different keycodes can have different number of groups
+
+   o  different groups of one keycode can have different number of shift lev-
+     els
+
+   o  the current group number is tracked by X server
+
+It is clear that if you sanely define levels, groups and sanely bind modi-
+fiers and associated actions you can have simultaneously loaded up to four
+different symbol sets where each of them would reside in its own group.
+
+The multi-layout concept provides a facility to manipulate xkb groups and
+symbol definitions in a way that allows almost arbitrary composition of pre-
+defined symbol tables. To keep it fully functional you have to:
+
+   o  define all symbols only in the first group
+
+   o  (re)define any modifiers with extra care to avoid strange (anisometric)
+     behaviour
+
+4.  Defining New Layouts
+
+See Some Words  About XKB internals <URL:http://www.tsu.ru/~pas-
+cal/en/xkb/internals.html> for explanation of used xkb terms and problems
+addressed by XKB extension.
+
+See Common  notes about XKB configuration files language
+<URL:http://www.tsu.ru/~pascal/en/xkb/gram-common.html> for more precise
+explanation of syntax of xkb configuration files.
+
+4.1  Predefined XKB Symbol Sets
+
+If you are about to define some European symbol map extension, you might want
+to use on of four predefined latin alphabet layouts.
+
+Okay, let's assume you want extend an existing keymap and you want to over-
+ride a few keys. Let's take a simple U.K. keyboard as an example (defined in
+pc/gb):
+
+     partial default alphanumeric_keys
+     xkb_symbols "basic" {
+       include "pc/latin"
+
+       name[Group1]="Great Britain";
+
+       key <AE02>  { [         2,   quotedbl,  twosuperior,    oneeighth ] };
+       key <AE03>  { [         3,   sterling, threesuperior,    sterling ] };
+       key <AC11>  { [apostrophe,         at, dead_circumflex, dead_caron] };
+       key <TLDE>  { [     grave,    notsign,          bar,          bar ] };
+       key <BKSL>  { [numbersign, asciitilde,   dead_grave,   dead_breve ] };
+       key <RALT>  { type[Group1]="TWO_LEVEL",
+                     [ ISO_Level3_Shift, Multi_key ]   };
+
+       modifier_map Mod5   { <RALT> };
+     };
+
+It defines a new layout in basic variant as an extension of common latin
+alphabet layout. The layout (symbol set) name is set to "Great Britain".
+Then there are redefinitions of a few keycodes and a modifiers binding. As
+you can see the number of shift levels is the same for <AE02>, <AE03>,
+<AC11>, <TLDE> and <BKSL> keys but it differs from number of shift levels of
+<RALT>.
+
+Note that the <RALT> key itself is a binding key for Mod5 and that it serves
+like a shift modifier for LevelThree, together with Shift as a multi-key. It
+is a good habit to respect this rule in a new similar layout.
+
+Okay, you could now define more variants of your new layout besides basic
+simply by including (augmenting/overriding/...) the basic definition and
+altering what may be needed.
+
+4.2  Key Types
+
+The differences in the number of columns (shift levels) are caused by a dif-
+ferent types of keys (see the types definition in section basics).  Most key-
+codes have implicitly set the keytype in the included "pc/latin" file to
+"FOUR_LEVEL_ALPHABETIC". The only exception is <RALT> keycode which is
+explicitly set "TWO_LEVEL" keytype.
+
+All those names refer to pre-defined shift level schemes. Usually you can
+choose a suitable shift level scheme from default types scheme list in proper
+xkb component's subdirectory.
+
+The most used schemes are:
+
+      ONE_LEVEL
+            The key does not depend on any modifiers. The symbol from first
+            level is always chosen.
+
+      TWO_LEVEL
+            The key uses a modifier Shift and may have two possible values.
+            The second level may be chosen by Shift modifier. If Lock modi-
+            fier (usually Caps-lock) applies the symbol is further processed
+            using system-specific capitalization rules. If both Shift+Lock
+            modifier apply the symbol from the second level is taken and cap-
+            italization rules are applied (and usually have no effect).
+
+      ALPHABETIC
+            The key uses modifiers Shift and Lock. It may have two possible
+            values. The second level may be chosen by Shift modifier. When
+            Lock modifier applies, the symbol from the first level is taken
+            and further processed using system-specific capitalization rules.
+            If both Shift+Lock modifier apply the symbol from the first level
+            is taken and no capitalization rules applied. This is often
+            called shift-cancels-caps behaviour.
+
+      THREE_LEVEL
+            Is the same as TWO_LEVEL but it considers an extra modifier -
+            LevelThree which can be used to gain the symbol value from the
+            third level. If both Shift+LevelThree modifiers apply the value
+            from the third level is also taken. As in TWO_LEVEL, the Lock
+            modifier doesn't influence the resulting level. Only Shift and
+            LevelThree are taken into that consideration. If the Lock modi-
+            fier is active capitalization rules are applied on the resulting
+            symbol.
+
+      FOUR_LEVEL
+            Is the same as THREE_LEVEL but unlike LEVEL_THREE if both
+            Shift+LevelThree modifiers apply the symbol is taken from the
+            fourth level.
+
+      FOUR_LEVEL_ALPHABETIC
+            Is similar to FOUR_LEVEL but also defines shift-cancels-caps
+            behaviour as in ALPHABETIC. If Lock+LevelThree apply the symbol
+            from the third level is taken and the capitalization rules are
+            applied.  If Lock+Shift+LevelThree apply the symbol from the
+            third level is taken and no capitalization rules are applied.
+
+      KEYPAD
+            As the name suggest this scheme is primarily used for numeric
+            keypads.  The scheme considers two modifiers - Shift and NumLock.
+            If none of modifiers applies the symbol from the first level is
+            taken. If either Shift or NumLock modifiers apply the symbol from
+            the second level is taken.  If both Shift+NumLock modifiers apply
+            the symbol from the first level is taken. Again, shift-cancels-
+            caps variant.
+
+      FOUR_LEVEL_KEYPAD
+            Is similar to KEYPAD scheme but considers also LevelThree modi-
+            fier.  If LevelThree modifier applies the symbol from the third
+            level is taken.  If Shift+LevelThree or NumLock+LevelThree apply
+            the symbol from the fourth level is taken. If all Shift+Num-
+            Lock+LevelThree modifiers apply the symbol from the third level
+            is taken. This also, shift-cancels-caps variant.
+
+Besides that, there are several schemes for special purposes:
+
+      PC_BREAK
+            It is similar to TWO_LEVEL scheme but it considers the Control
+            modifier rather than Shift. That means, the symbol from the sec-
+            ond level is chosen by Control rather than by Shift.
+
+      PC_SYSRQ
+            It is similar to TWO_LEVEL scheme but it considers the Alt modi-
+            fier rather than Shift. That means, the symbol from the second
+            level is chosen by Alt rather than by Shift.
+
+      CTRL+ALT
+            The key uses modifiers Alt and Control. It may have two possible
+            values. If only one modifier (Alt or Control) applies the symbol
+            from the first level is chosen. Only if both Alt+Control modi-
+            fiers apply the symbol from the second level is chosen.
+
+      SHIFT+ALT
+            The key uses modifiers Shift and Alt. It may have two possible
+            values.  If only one modifier (Alt or Shift) applies the symbol
+            from the first level is chosen. Only if both Alt+Shift modifiers
+            apply the symbol from the second level is chosen.
+
+If needed, special caps schemes may be used. They redefine the standard
+behaviour of all *ALPHABETIC types. The layouts (maps of symbols) with keys
+defined in respective types then automatically change their behaviour accord-
+ingly. Possible redefinitions are:
+
+   o internal
+
+   o internal_nocancel
+
+   o shift
+
+   o shift_nocancel
+
+None of these schemes should be used directly. They are defined merely for
+'caps:' xkb options (used to globally change the layouts behaviour).
+
+Don't alter any of existing key types. If you need a different behaviour cre-
+ate a new one.
+
+4.2.1  More On Definitions Of Types
+
+When the XKB software deals with a separate type description it gets a com-
+plete list of modifiers that should be taken into account from the 'modi-
+fiers=<list of modifiers>' list and expects that a set of 'map[<combination
+of modifiers>]=<list of modifiers>' instructions that contain the mapping for
+each combination of modifiers mentioned in that list. Modifiers that are not
+explicitly listed are NOT taken into account when the resulting shift level
+is computed.  If some combination is omitted the program (subroutine) should
+choose the first level for this combination (a quite reasonable behavior).
+
+Lets consider an example with two modifiers ModOne and ModTwo:
+
+     type "..." {
+         modifiers = ModOne+ModTwo;
+         map[None] = Level1;
+         map[ModOne] = Level2;
+     };
+
+In this case the map statements for ModTwo only and ModOne+ModTwo are omit-
+ted.  It means that if the ModTwo is active the subroutine can't found
+explicit mapping for such combination an will use the default level i.e.
+Level1.
+
+But in the case the type described as:
+
+     type "..." {
+         modifiers = ModOne;
+         map[None] = Level1;
+         map[ModOne] = Level2;
+     };
+
+the ModTwo will not be taken into account and the resulting level depends on
+the ModOne state only. That means, ModTwo alone produces the Level1 but the
+combination ModOne+ModTwo produces the Level2 as well as ModOne alone.
+
+What does it mean if the second modifier is the Lock? It means that in the
+first case (the Lock itself is included in the list of modifiers but combina-
+tions with this modifier aren't mentioned in the map statements) the internal
+capitalization rules will be applied to the symbol from the first level. But
+in the second case the capitalization will be applied to the symbol chosen
+accordingly to he first modifier - and this can be the symbol from the first
+as well as from the second level.
+
+Usually, all modifiers introduced in 'modifiers=<list of modifiers>' list are
+used for shift level calculation and then discarded. Sometimes this is not
+desirable. If you want to use a modifier for shift level calculation but you
+don't want to discard it, you may list in 'preserve[<combination of modi-
+fiers>]=<list of modifiers>'. That means, for a given combination all listed
+modifiers will be preserved. If the Lock modifier is preserved then the
+resulting symbol is passed to internal capitalization routine regardless
+whether it has been used for a shift level calculation or not.
+
+Any key type description can use both real and virtual modifiers. Since real
+modifiers always have standard names it is not necessary to explicitly
+declare them. Virtual modifiers can have arbitrary names and can be declared
+(prior using them) directly in key type definition:
+
+     virtual_modifiers <comma-separated list of modifiers>  ;
+
+as seen in for example basic, pc or mousekeys key type definitions.
+
+4.3  Rules
+
+Once you are finished with your symbol map you need to add it to rules file.
+The rules file describes how all the five basic keycodes, types, compat, sym-
+bols and geometry components should be composed to give a sensible resulting
+xkb configuration.
+
+The main advantage of rules over formerly used keymaps is a possibility to
+simply parameterize (once) fixed patterns of configurations and thus to ele-
+gantly allow substitutions of various local configurations into predefined
+templates.
+
+A pattern in a rules file (often located in /usr/lib/X11/xkb/rules) can be
+parameterized with four other arguments: Model, Layout, Variant and Options.
+For most cases parameters model and layout should be sufficient for choosing
+a functional keyboard mapping.
+
+The rules file itself is composed of pattern lines and lines with rules. The
+pattern line starts with an exclamation mark ('!') and describes how will the
+xkb interpret the following lines (rules). A sample rules file looks like
+this:
+
+     ! model                   =   keycodes
+       macintosh_old                     =   macintosh
+       ...
+       *                       =   xfree86
+
+     ! model                        =   symbols
+       hp                      =   +inet(%m)
+       microsoftpro                 =   +inet(%m)
+       geniuscomfy                  =   +inet(%m)
+
+     ! model       layout[1]          = symbols
+       macintosh    us           = macintosh/us%(v[1])
+       *             *               =       pc/pc(%m)+pc/%l[1]%(v[1])
+
+     ! model     layout[2]            = symbols
+       macintosh     us              =  +macintosh/us[2]%(v[2]):2
+       *       *               =   +pc/%l[2]%(v[2]):2
+
+     ! option            =    types
+       caps:internal               =    +caps(internal)
+       caps:internal_nocancel =    +caps(internal_nocancel)
+
+Each rule defines what certain combination of values on the left side of
+equal sign ('=') results in. For example a (keyboard) model macintosh_old
+instructs xkb to take definitions of keycodes from file keycodes/macintosh
+while the rest of models (represented by a wild card '*') instructs it to
+take them from file keycodes/xfree86. The wild card represents all possible
+values on the left side which were not found in any of the previous rules.
+The more specialized (more complete) rules have higher precedence than gen-
+eral ones, i.e. the more general rules supply reasonable default values.
+
+As you can see some lines contain substitution parameters - the parameters
+preceded by the percent sign ('%'). The first alphabetical character after
+the percent sign expands to the value which has been found on the left side.
+For example +%l%(v) expands into +cz(bksl) if the respective values on the
+left side were cz layout in its bksl variant. More, if the layout resp. vari-
+ant  parameter is followed by a pair of brackets ('[', ']') it means that xkb
+should place the layout resp. variant into specified xkb group. If the brack-
+ets are omitted the first group is the default value.
+
+So the second block of rules enhances symbol definitions for some particular
+keyboard models with extra keys (for internet, multimedia, ...) . Other mod-
+els are left intact. Similarly, the last block overrides some key type defi-
+nitions, so the common global behaviour ''shift cancels caps'' or ''shift
+doesn't cancel caps'' can be selected. The rest of rules produces special
+symbols for each variant us layout of macintosh keyboard and standard pc sym-
+bols in appropriate variants as a default.
+
+4.4  Descriptive Files of Rules
+
+Now you just need to add a detailed description to <rules>.xml description
+file so the other users (and external programs which often parse this file)
+know what is your work about.
+
+4.4.1  Old Descriptive Files
+
+The formerly used descriptive files were named <rules>.lst Its structure is
+very simple and quite self descriptive but such simplicity had also some cav-
+ities, for example there was no way how to describe local variants of layouts
+and there were problems with the localization of descriptions. To preserve
+compatibility with some older programs, new XML descriptive files can be con-
+verted to old format '.lst'.
+
+For each parameter of rules file should be described its meaning. For the
+rules file described above the .lst file could look like:
+
+     ! model
+       pc104        Generic 104-key PC
+       microsoft    Microsoft Natural
+       pc98         PC-98xx Series
+       macintosh     Original Macintosh
+       ...
+
+     ! layout
+       us      U.S. English
+       cz      Czech
+       de      German
+       ...
+
+     ! option
+       caps:internal           uses internal capitalization. Shift cancels Caps
+       caps:internal_nocancel uses internal capitalization. Shift doesn't cancel Caps
+
+And that should be it. Enjoy creating your own xkb mapping.
+
+     Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/XKB-Enhancing.sgml,v 1.2 dawes Exp $
+
+
+$XFree86: $
diff --git a/compat/.cvsignore b/compat/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/compat/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/compat/Makefile.am b/compat/Makefile.am
new file mode 100644
index 00000000..b667bd14
--- /dev/null
+++ b/compat/Makefile.am
@@ -0,0 +1,13 @@
+compat_DATA = \
+accessx basic complete \
+default group_led iso9995 \
+japan keypad leds \
+misc mousekeys norepeat \
+pc pc98 xfree86 \
+xtest README
+                                                                                          
+EXTRA_DIST= $(compat_DATA)
+                                                                                          
+compatdir = $(xkb_base)/compat
+
+
diff --git a/compat/README b/compat/README
new file mode 100644
index 00000000..fb84d71e
--- /dev/null
+++ b/compat/README
@@ -0,0 +1,37 @@
+The core protocol interpretation of keyboard modifiers does not include direct
+support for multiple keyboard groups, so XKB reports the effective keyboard
+group to XKB-aware clients using some of reserved bits in the state field of
+some core protocol events. This modified state field would not be interpreted
+correctly by XKB-unaware clients, so XKB provides a group compatibility mapping
+which remaps the keyboard group into a core modifier mask that has similar
+effects, when possible.
+
+XKB maintains three compatibility state components that are used to make
+XKB-unaware clients(*) work as well as possible:
+- The compatibility state which corresponds to the effective modifier and
+  effective group state.
+- The compatibility lookup state which is the core-protocol equivalent of the
+  lookup state.
+- The compatibility grab state which is the nearest core-protocol equivalent
+  of the grab state.
+
+Compatibility state are essentially the corresponding XKB states, but with
+keyboard group possibly encoded as one or more modifiers. 
+
+Modifiers that correspond to each keyboard group are described in this
+group compatibility map.
+
+
+----
+(*) The implementation of XKB invisibly extends the X library to use the
+keyboard extension if it is present. That means, clients that use library or
+toolkit routines to interpret keyboard events automatically use all of XKB
+features; clients that directly interpret the state field of core protocol
+events or the keymap direcly may be affected by some of the XKB differences.
+Thus most clients can take all advantages without modification but it also
+means that XKB state can be reported to clients that have not explicitly
+requested the keyboard extension.
+
+
+
+/* $XFree86$ */
diff --git a/compat/accessx b/compat/accessx
new file mode 100644
index 00000000..3e4b4616
--- /dev/null
+++ b/compat/accessx
@@ -0,0 +1,54 @@
+// $Xorg: accessx,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+
+default partial xkb_compatibility "basic" {
+    interpret AccessX_Enable { 
+	action= LockControls(controls=AccessXKeys); 
+    };
+};
+
+partial xkb_compatibility "full" {
+
+    interpret AccessX_Enable {
+	action= LockControls(controls=AccessXKeys); 
+    };
+
+    interpret AccessX_Feedback_Enable { 
+	action= LockControls(controls=AccessXFeedback); 
+    };
+
+    interpret RepeatKeys_Enable {
+	action= LockControls(controls=RepeatKeys);
+    };
+
+    interpret SlowKeys_Enable {
+	action= LockControls(controls=SlowKeys);
+    };
+
+    interpret BounceKeys_Enable {
+	action= LockControls(controls=BounceKeys);
+    };
+
+    interpret StickyKeys_Enable {
+	action= LockControls(controls=StickyKeys);
+    };
+
+    interpret MouseKeys_Enable {
+	action= LockControls(controls=MouseKeys);
+    };
+
+    interpret MouseKeys_Accel_Enable {
+	action= LockControls(controls=MouseKeysAccel);
+    };
+
+    interpret Overlay1_Enable {
+	action= LockControls(controls=Overlay1);
+    };
+
+    interpret Overlay2_Enable {
+	action= LockControls(controls=Overlay2);
+    };
+
+    interpret AudibleBell_Enable {
+	action= LockControls(controls=AudibleBell);
+    };
+};
diff --git a/compat/basic b/compat/basic
new file mode 100644
index 00000000..f369b0be
--- /dev/null
+++ b/compat/basic
@@ -0,0 +1,59 @@
+// $Xorg: basic,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+
+// Minimal set of symbol interpretations to provide 
+// reasonable default behavior (Num lock, shift and 
+// caps lock and mode switch) and set up the 
+// automatic updating of common keyboard LEDs.
+
+// $XFree86: xc/programs/xkbcomp/compat/basic,v 1.2 2000/11/06 19:24:10 dawes Exp $
+
+default xkb_compatibility "basic"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Shift_Lock+AnyOf(Shift+Lock) {
+	action= LockMods(modifiers=Shift);
+    };
+
+    interpret Any+Lock {
+	action= LockMods(modifiers=Lock);
+    };
+
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockMods(modifiers=NumLock);
+    };
+
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=+1);
+    };
+
+    interpret Any + Any {
+	action= SetMods(modifiers=modMapMods);
+    };
+
+    group 2 = AltGr;
+    group 3 = AltGr;
+    group 4 = AltGr;
+
+    indicator.allowExplicit= False;
+    indicator "Caps Lock" { 
+	whichModState= Locked;
+	modifiers= Lock;
+    };
+    indicator "Num Lock" {
+	whichModState= Locked;
+	modifiers= NumLock;
+    };
+    indicator "Shift Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+    indicator.allowExplicit= True;
+};
diff --git a/compat/complete b/compat/complete
new file mode 100644
index 00000000..68f89c80
--- /dev/null
+++ b/compat/complete
@@ -0,0 +1,10 @@
+// $Xorg: complete,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+default xkb_compatibility "complete"  {
+    include "basic"
+    augment "iso9995"
+    augment "mousekeys"
+    augment "accessx(full)"
+    augment "misc"
+    augment "xfree86"
+};
+
diff --git a/compat/default b/compat/default
new file mode 100644
index 00000000..7cea0f8c
--- /dev/null
+++ b/compat/default
@@ -0,0 +1,11 @@
+// $Xorg: default,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+default xkb_compatibility "default"  {
+    include "basic"
+    augment "mousekeys"
+    augment "accessx(basic)"
+    augment "misc"
+    augment "iso9995"
+// ??should be changed/renamed/removed
+//    augment "xfree86"
+    augment "japan"
+};
diff --git a/compat/group_led b/compat/group_led
new file mode 100644
index 00000000..0805fa6a
--- /dev/null
+++ b/compat/group_led
@@ -0,0 +1,22 @@
+// $XFree86: xc/programs/xkbcomp/compat/group_led,v 1.1.2.2 1999/07/22 14:21:30 hohndel Exp $
+// This is a "default" compatibility with a small modification:
+// an "Scroll Lock" LED now shows the active keyboard group
+default xkb_compatibility "group_led"  {
+    include "basic"
+    augment "mousekeys"
+    augment "accessx(basic)"
+    augment "misc"
+    augment "iso9995"
+    augment "japan"
+//  This is to make Mode_switch working even in group 2
+    virtual_modifiers AltGr;
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=+1);
+    };
+    indicator "Scroll Lock" {
+	allowExplicit;
+        groups= All-Group1;
+    };
+};
diff --git a/compat/iso9995 b/compat/iso9995
new file mode 100644
index 00000000..d513c1ce
--- /dev/null
+++ b/compat/iso9995
@@ -0,0 +1,84 @@
+// $Xorg: iso9995,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+
+// Fairly complete set of symbol interpretations 
+// to provide reasonable default behavior
+
+// $XFree86: xc/programs/xkbcomp/compat/iso9995,v 1.3 2003/02/21 03:16:34 dawes Exp $
+
+default partial xkb_compatibility "default"  {
+    virtual_modifiers LevelThree,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret ISO_Lock+Any {
+	action= ISOLock(affect= all,modifiers=modMapMods);
+    };
+
+    interpret ISO_Level2_Latch+Shift {
+	useModMapMods= level1;
+	action= LatchMods(modifiers=Shift);
+    };
+
+    interpret ISO_Level3_Shift+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelThree;
+	action= SetMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Shift {
+	action= SetMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Latch+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelThree;
+	action= LatchMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Latch {
+	action= LatchMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Lock+Any {
+	useModMapMods= level1;
+	virtualModifier= LevelThree;
+	action= LockMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Level3_Lock {
+	action= LockMods(modifiers=LevelThree);
+    };
+
+    interpret ISO_Group_Latch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= LatchGroup(group=2);
+    };
+
+    interpret ISO_Next_Group {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= LockGroup(group=+1);
+    };
+
+    interpret ISO_Prev_Group {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= LockGroup(group=-1);
+    };
+    interpret ISO_First_Group {
+	action= LockGroup(group=1);
+    };
+
+    interpret ISO_Last_Group {
+	action= LockGroup(group=2);
+    };
+
+    indicator "Group 2" {
+	!allowExplicit;
+	groups= All-Group1;
+    };
+};
diff --git a/compat/japan b/compat/japan
new file mode 100644
index 00000000..34bcc096
--- /dev/null
+++ b/compat/japan
@@ -0,0 +1,29 @@
+// $Xorg: japan,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+
+// Japanese keyboards need Eisu and Kana shift and 
+// lock keys, which are typically bound to the
+// second shift level for some other modifier key.
+// These interpretations disable the default
+// interpretation (which would have these keys set
+// the same modifier as the level one symbol).
+
+default partial xkb_compatibility "japan"  {
+
+    interpret.repeat= False;
+
+    interpret Eisu_Shift+Lock {
+	action= NoAction();
+    };
+
+    interpret Eisu_toggle+Lock {
+	action= NoAction();
+    };
+
+    interpret Kana_Shift+Lock {
+	action= NoAction();
+    };
+
+    interpret Kana_Lock+Lock {
+	action= NoAction();
+    };
+};
diff --git a/compat/keypad b/compat/keypad
new file mode 100644
index 00000000..469edec2
--- /dev/null
+++ b/compat/keypad
@@ -0,0 +1,60 @@
+// $Xorg: keypad,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+
+// Interpretations needed to implement the numeric keypad
+// as an overlay instead of a modifier.
+
+partial hidden xkb_compatibility "overlay"  {
+    include "keypad(overlay1)"
+};
+partial hidden xkb_compatibility "overlay1"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Num_Lock {
+	virtualModifier= NumLock;
+	action= LockControls(ctrls=overlay1);
+    };
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockControls(ctrls=overlay1);
+    };
+
+    indicator.allowExplicit= True;
+    indicator.driveskbd= True;
+    replace indicator "Num Lock" {
+	whichModState= Locked;
+	modifiers= NumLock;
+	controls= Overlay1;
+    };
+    indicator.allowExplicit= True;
+};
+partial hidden xkb_compatibility "overlay2"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Num_Lock {
+	virtualModifier= NumLock;
+	action= LockControls(ctrls=overlay2);
+    };
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockControls(ctrls=overlay1);
+    };
+
+    indicator.allowExplicit= True;
+    indicator.driveskbd= True;
+    replace indicator "Num Lock" {
+	whichModState= Locked;
+	modifiers= NumLock;
+	controls= Overlay2;
+    };
+    indicator.allowExplicit= True;
+};
diff --git a/compat/leds b/compat/leds
new file mode 100644
index 00000000..3d616063
--- /dev/null
+++ b/compat/leds
@@ -0,0 +1,24 @@
+// Use keyboard LEDs to show alternative group
+//
+// $XFree86$
+
+partial xkb_compatibility "scroll" {
+   indicator "Scroll Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "num"    {
+   indicator "Num Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "caps"   {
+   indicator "Caps Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
diff --git a/compat/misc b/compat/misc
new file mode 100644
index 00000000..e1dbfd54
--- /dev/null
+++ b/compat/misc
@@ -0,0 +1,121 @@
+// $XdotOrg: xc/programs/xkbcomp/compat/misc,v 1.1.4.4 2004/03/05 13:41:28 eich Exp $
+// $Xorg: misc,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+//
+//
+//
+// $XFree86: xc/programs/xkbcomp/compat/misc,v 1.4 2003/05/15 13:31:57 pascal Exp $
+
+default partial xkb_compatibility "misc"  {
+
+    virtual_modifiers	Alt,Meta,Super,Hyper,ScrollLock;
+
+    // Interpretations for some other useful keys
+
+    interpret Terminate_Server {
+        action = Terminate();
+    };
+
+    setMods.clearLocks= True;
+
+    // Sets the "Alt" virtual modifier
+
+    interpret Alt_L+Any     {
+        useModMapMods= level1;
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_L	{
+	action = SetMods(modifiers=Alt);
+    };
+
+    interpret Alt_R+Any     {
+        useModMapMods= level1;
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_R	{
+	action = SetMods(modifiers=Alt);
+    };
+
+    // Sets the "Meta" virtual modifier
+
+    interpret Meta_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Meta;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Meta_L	{
+	action = SetMods(modifiers=Meta);
+    };
+
+    interpret Meta_R+Any     {
+        useModMapMods= level1;
+	virtualModifier= Meta;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Meta_R	{
+	action = SetMods(modifiers=Alt);
+    };
+
+    // Sets the "Super" virtual modifier
+
+    interpret Super_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Super;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Super_L	{
+	action = SetMods(modifiers=Super);
+    };
+
+    interpret Super_R+Any     {
+        useModMapMods= level1;
+	virtualModifier= Super;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Super_R	{
+	action = SetMods(modifiers=Super);
+    };
+
+    // Sets the "Hyper" virtual modifier
+
+    interpret Hyper_L+Any     {
+//        useModMapMods= level1;
+	virtualModifier= Hyper;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Hyper_L	{
+	action = SetMods(modifiers=Hyper);
+    };
+
+    interpret Hyper_R+Any     {
+        useModMapMods= level1;
+	virtualModifier= Hyper;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Hyper_R	{
+	action = SetMods(modifiers=Hyper);
+    };
+
+    // Sets the "ScrollLock" virtual modifier and
+    // makes it actually lock when pressed.  Sets
+    // up a map for the scroll lock indicator.
+    interpret Scroll_Lock+Any	{
+	virtualModifier= ScrollLock;
+	action = LockMods(modifiers=modMapMods);
+    };
+
+    indicator "Scroll Lock" {
+	allowExplicit;
+	whichModState= Locked;
+	modifiers= ScrollLock;
+    };
+};
diff --git a/compat/mousekeys b/compat/mousekeys
new file mode 100644
index 00000000..6e9a208d
--- /dev/null
+++ b/compat/mousekeys
@@ -0,0 +1,182 @@
+
+// $Xorg: mousekeys,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+
+// Interpretations for arrow keys and a bunch of other 
+// common keysyms which make it possible to bind "mouse" 
+// keys using xmodmap and activate or deactivate them 
+// from the keyboard.
+
+default partial xkb_compatibility "mousekeys" {
+
+    // Keypad actions.
+    //
+    interpret.repeat= True;
+
+    interpret KP_1 { 
+	action = MovePtr(x=-1,y= +1); 
+    };
+    interpret KP_End { 
+	action = MovePtr(x=-1,y= +1); 
+    };
+
+    interpret KP_2 { 
+	action = MovePtr(x=+0,y= +1); 
+    };
+    interpret KP_Down { 
+	action = MovePtr(x=+0,y= +1); 
+    };
+
+    interpret KP_3 { 
+	action = MovePtr(x=+1,y=+1); 
+    };
+    interpret KP_Next { 
+ 	action = MovePtr(x=+1,y=+1); 
+    };
+
+    interpret KP_4 { 
+	action = MovePtr(x=-1,y=+0); 
+    };
+    interpret KP_Left { 
+	action = MovePtr(x=-1,y=+0); 
+    };
+
+    interpret KP_6 { 
+	action = MovePtr(x=+1,y=+0); 
+    };
+    interpret KP_Right { 
+ 	action = MovePtr(x=+1,y=+0); 
+    };
+
+    interpret KP_7 { 
+	action = MovePtr(x=-1,y=-1); 
+    };
+    interpret KP_Home { 
+	action = MovePtr(x=-1,y=-1); 
+    };
+
+    interpret KP_8 { 
+	action = MovePtr(x=+0,y=-1); 
+    };
+    interpret KP_Up { 
+	action = MovePtr(x=+0,y=-1); 
+    };
+
+    interpret KP_9 { 
+	action = MovePtr(x=+1,y=-1); 
+    };
+    interpret KP_Prior { 
+	action = MovePtr(x=+1,y=-1); 
+    };
+
+    interpret KP_5 { 
+	action = PointerButton(button=default); 
+    };
+    interpret KP_Begin { 
+	action = PointerButton(button=default); 
+    };
+
+    interpret KP_F2 { 
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+    interpret KP_Divide { 
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+
+    interpret KP_F3 { 
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+    interpret KP_Multiply { 
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+
+    interpret KP_F4 { 
+	action = SetPtrDflt(affect=defaultButton,button=3); 
+    };
+    interpret KP_Subtract { 
+	action = SetPtrDflt(affect=defaultButton,button=3); 
+    };
+
+    interpret KP_Separator { 
+	action = PointerButton(button=default,count=2); 
+    };
+    interpret KP_Add { 
+	action = PointerButton(button=default,count=2);
+    };
+
+    interpret KP_0 { 
+	action = LockPointerButton(button=default,affect=lock); 
+    };
+    interpret KP_Insert { 
+	action = LockPointerButton(button=default,affect=lock); 
+    };
+
+    interpret KP_Decimal { 
+	action = LockPointerButton(button=default,affect=unlock); 
+    };
+    interpret KP_Delete { 
+	action = LockPointerButton(button=default,affect=unlock); 
+    };
+
+    interpret.repeat= False;
+
+
+    // New Keysym Actions.
+    //
+    interpret Pointer_Button_Dflt {
+	action= PointerButton(button=default);
+    };
+    interpret Pointer_Button1 {
+	action= PointerButton(button=1);
+    };
+    interpret Pointer_Button2 {
+	action= PointerButton(button=2);
+    };
+    interpret Pointer_Button3 {
+	action= PointerButton(button=3);
+    };
+    interpret Pointer_DblClick_Dflt {
+	action= PointerButton(button=default,count=2);
+    };
+    interpret Pointer_DblClick1 {
+	action= PointerButton(button=1,count=2);
+    };
+    interpret Pointer_DblClick2 {
+	action= PointerButton(button=2,count=2);
+    };
+    interpret Pointer_DblClick3 {
+	action= PointerButton(button=3,count=2);
+    };
+    interpret Pointer_Drag_Dflt	{
+	action= LockPointerButton(button=default);
+    };
+    interpret Pointer_Drag1 {
+	action= LockPointerButton(button=1);
+    };
+    interpret Pointer_Drag2 {
+	action= LockPointerButton(button=2);
+    };
+    interpret Pointer_Drag3 {
+	action= LockPointerButton(button=3);
+    };
+
+    interpret Pointer_EnableKeys {
+	action= LockControls(controls=MouseKeys);
+    };
+    interpret Pointer_Accelerate {
+	action= LockControls(controls=MouseKeysAccel);
+    };
+    interpret Pointer_DfltBtnNext {
+	action= SetPtrDflt(affect=defaultButton,button= +1);
+    };
+    interpret Pointer_DfltBtnPrev {
+	action= SetPtrDflt(affect=defaultButton,button= -1);
+    };
+
+
+    // Allow an indicator for MouseKeys.
+    indicator "Mouse Keys" {
+//	!allowExplicit;
+	indicatorDrivesKeyboard;
+	controls= MouseKeys;
+    };
+};
diff --git a/compat/norepeat b/compat/norepeat
new file mode 100644
index 00000000..07b0b7a6
--- /dev/null
+++ b/compat/norepeat
@@ -0,0 +1,11 @@
+// $Xorg: norepeat,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+
+// Put any otherwise normal keys that you don't want to repeat in
+// this file
+
+default partial xkb_compatibility "norepeat"  {
+    interpret Return {
+	action= NoAction();
+	repeat= False;
+    };
+};
diff --git a/compat/pc b/compat/pc
new file mode 100644
index 00000000..5ce7d767
--- /dev/null
+++ b/compat/pc
@@ -0,0 +1,18 @@
+// $Xorg: pc,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+default partial xkb_compatibility "pc"  {
+
+    // Sets the "Alt" virtual modifier
+
+    virtual_modifiers	Alt;
+
+    setMods.clearLocks= True;
+    interpret Alt_L+Any     { 
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+
+    interpret Alt_R+Any	{
+	virtualModifier= Alt;
+	action = SetMods(modifiers=modMapMods);
+    };
+};
diff --git a/compat/pc98 b/compat/pc98
new file mode 100644
index 00000000..23f3f798
--- /dev/null
+++ b/compat/pc98
@@ -0,0 +1,62 @@
+// $Xorg: pc98,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+
+
+
+
+// $XFree86: xc/programs/xkbcomp/compat/pc98,v 3.1 1997/10/26 13:25:33 dawes Exp $
+
+// Minimal set of symbol interpretations to provide 
+// reasonable default behavior (Num lock, shift and 
+// caps lock and mode switch) and set up the 
+// automatic updating of common keyboard LEDs.
+
+default xkb_compatibility "basic"  {
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= True;
+
+    interpret Shift_Lock+AnyOf(Shift+Lock) {
+	action= LockMods(modifiers=Shift);
+    };
+
+//    interpret Any+Lock {
+//	action= LockMods(modifiers=Lock);
+//   }; 
+
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= LockMods(modifiers=NumLock);
+    };
+
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=2,clearLocks);
+    };
+
+    interpret Any + Any {
+	action= SetMods(modifiers=modMapMods);
+    };
+
+    group 2 = AltGr;
+    group 3 = AltGr;
+    group 4 = AltGr;
+
+    indicator.allowExplicit= False;
+    indicator "Caps Lock" { 
+	whichModState= Locked;
+	modifiers= Lock;
+    };
+    indicator "Num Lock" {
+	whichModState= Locked;
+	modifiers= NumLock;
+    };
+    indicator "Shift Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+    indicator.allowExplicit= True;
+};
diff --git a/compat/xfree86 b/compat/xfree86
new file mode 100644
index 00000000..2da65fd6
--- /dev/null
+++ b/compat/xfree86
@@ -0,0 +1,57 @@
+// $XFree86$
+//  XFree86 special keysyms
+
+default partial xkb_compatibility "basic"  {
+
+    interpret.repeat= True;
+
+    interpret  XF86_Switch_VT_1 {
+        action = SwitchScreen(Screen=1, !SameServer);
+    };
+    interpret  XF86_Switch_VT_2 {
+        action = SwitchScreen(Screen=2, !SameServer);
+    };
+    interpret  XF86_Switch_VT_3 {
+        action = SwitchScreen(Screen=3, !SameServer);
+    };
+    interpret  XF86_Switch_VT_4 {
+        action = SwitchScreen(Screen=4, !SameServer);
+    };
+    interpret  XF86_Switch_VT_5 {
+        action = SwitchScreen(Screen=5, !SameServer);
+    };
+    interpret  XF86_Switch_VT_6 {
+        action = SwitchScreen(Screen=6, !SameServer);
+    };
+    interpret  XF86_Switch_VT_7 {
+        action = SwitchScreen(Screen=7, !SameServer);
+    };
+    interpret  XF86_Switch_VT_8 {
+        action = SwitchScreen(Screen=8, !SameServer);
+    };
+    interpret  XF86_Switch_VT_9 {
+        action = SwitchScreen(Screen=9, !SameServer);
+    };
+    interpret  XF86_Switch_VT_10 {
+        action = SwitchScreen(Screen=10, !SameServer);
+    };
+    interpret  XF86_Switch_VT_11 {
+        action = SwitchScreen(Screen=11, !SameServer);
+    };
+    interpret  XF86_Switch_VT_12 {
+        action = SwitchScreen(Screen=12, !SameServer);
+    };
+
+    interpret XF86_Ungrab {
+        action = Private(type=0x86, data="Ungrab");
+    };
+    interpret XF86_ClearGrab {
+        action = Private(type=0x86, data="ClsGrb");
+    };
+    interpret XF86_Next_VMode {
+        action = Private(type=0x86, data="+VMode");
+    };
+    interpret XF86_Prev_VMode {
+        action = Private(type=0x86, data="-VMode");
+    };
+};
diff --git a/compat/xtest b/compat/xtest
new file mode 100644
index 00000000..a35ced91
--- /dev/null
+++ b/compat/xtest
@@ -0,0 +1,58 @@
+// $Xorg: xtest,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+default xkb_compatibility "xtest"  {
+
+    // Minimal set of symbol interpretations to provide
+    // reasonable behavior for testing.   The X Test 
+    // Suite assumes that it can set any modifier by 
+    // simulating a KeyPress and clear it by simulating 
+    // a KeyRelease.  Because of the way that XKB 
+    // implements locking/latching modifiers, this 
+    // approach fails in some cases (typically the 
+    // lock or num lock modifiers).  These symbol
+    // interpretations make all modifier keys just
+    // set the corresponding modifier so that xtest
+    // will see the behavior it expects.
+
+    virtual_modifiers NumLock,AltGr;
+
+    interpret.repeat= False;
+    setMods.clearLocks= True;
+    latchMods.clearLocks= True;
+    latchMods.latchToLock= False;
+
+    interpret Shift_Lock+AnyOf(Shift+Lock) {
+	action= SetMods(modifiers=Shift);
+    };
+
+    interpret Num_Lock+Any {
+	virtualModifier= NumLock;
+	action= SetMods(modifiers=NumLock);
+    };
+
+    interpret Mode_switch {
+	useModMapMods= level1;
+	virtualModifier= AltGr;
+	action= SetGroup(group=2);
+    };
+
+    interpret Any + Any {
+	action= SetMods(modifiers=modMapMods);
+    };
+
+    group 2 = AltGr;
+    group 3 = AltGr;
+    group 4 = AltGr;
+
+    indicator.allowExplicit= False;
+    indicator "Caps Lock" { 
+	modifiers= Lock;
+    };
+    indicator "Num Lock" {
+	modifiers= NumLock;
+    };
+    indicator "Shift Lock" {
+	whichModState= Locked;
+	modifiers= Shift;
+    };
+    indicator.allowExplicit= True;
+};
diff --git a/configure.in b/configure.in
index 78c2df96..c0ec15bf 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
-AC_INIT(xfree86.xml.in)
+AC_INIT(rules/base.xml.in)
 
-PACKAGE=xfree86_xkb_xml
+PACKAGE=xkbdesc
 GETTEXT_PACKAGE=$PACKAGE
 MAJOR_VERSION=0
-MINOR_VERSION=5
+MINOR_VERSION=1
 VERSION=$MAJOR_VERSION.$MINOR_VERSION
 
 AC_SUBST(MAJOR_VERSION)
@@ -32,6 +32,31 @@ AC_SUBST(xkb_base)
 
 AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile 
 Makefile
-xfree86_xkb_xml.spec
+compat/Makefile
+geometry/Makefile
+geometry/digital.vndr/Makefile
+geometry/ibm.vndr/Makefile
+geometry/sgi.vndr/Makefile
+keycodes/Makefile
+keycodes/digital.vndr/Makefile
+keycodes/sgi.vndr/Makefile
+keymap/Makefile
+keymap/digital.vndr/Makefile
+keymap/sgi.vndr/Makefile
+keymap/sun.vndr/Makefile
+semantics/Makefile
+rules/Makefile
+symbols/Makefile
+symbols/digital.vndr/Makefile
+symbols/fujitsu.vndr/Makefile
+symbols/hp.vndr/Makefile
+symbols/macintosh.vndr/Makefile
+symbols/nec.vndr/Makefile
+symbols/sgi.vndr/Makefile
+symbols/sony.vndr/Makefile
+symbols/sun.vndr/Makefile
+symbols/xfree68.vndr/Makefile
+types/Makefile
+xkbdesc.spec
 ])
 
diff --git a/geometry/.cvsignore b/geometry/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/geometry/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/geometry/Makefile.am b/geometry/Makefile.am
new file mode 100644
index 00000000..684553ae
--- /dev/null
+++ b/geometry/Makefile.am
@@ -0,0 +1,15 @@
+SUBDIRS = digital.vndr  ibm.vndr  sgi.vndr
+
+geom_DATA = \
+amiga ataritt chicony \
+dell everex fujitsu \
+hp keytronic kinesis \
+macintosh microsoft nec \
+northgate pc sony \
+sun winbook README
+
+EXTRA_DIST= $(geom_DATA)
+                                                                                          
+geomdir = $(xkb_base)/geometry
+
+
diff --git a/geometry/README b/geometry/README
new file mode 100644
index 00000000..245270d2
--- /dev/null
+++ b/geometry/README
@@ -0,0 +1,10 @@
+The geometry component of a keyboard mapping specifies primarily the geometry of
+the keyboard. It contains the geometry symbolic name and the keyboard geometry
+description. The geometry component might also contain aliases for some keys or
+symbolic names for some indicators and might affect the set of indicators that
+are physically present. Key aliases defined in the geometry component of a
+keyboard mapping override those defined in the keycodes component.
+
+
+
+/* $XFree86$ */
diff --git a/geometry/amiga b/geometry/amiga
new file mode 100644
index 00000000..357c4c0e
--- /dev/null
+++ b/geometry/amiga
@@ -0,0 +1,270 @@
+// $Xorg: amiga,v 1.3 2000/08/17 19:54:35 cpqbld Exp $
+
+
+
+// $XFree86: xc/programs/xkbcomp/geometry/amiga,v 3.2 1997/10/26 13:25:34 dawes Exp $
+
+default xkb_geometry "usa1" {
+
+    description= "Amiga (usa1)";
+    width= 490;
+    height= 175;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "TLDE" { { [ 28,18] }, { [2,1], [ 21,17] } };
+    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "RTRN" {
+	approx = { [ 16, 0], [42,37] },
+	{ [16, 0], [42, 0], [42,37],
+	  [ 0,37], [ 0,19], [16,19] },
+	{ [18, 1], [40, 1], [40,36],
+	  [ 2,36], [ 2,20], [18,20] } };
+    shape "LFSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
+    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 22;
+    row.left= 1;
+    key.shape= "FCTS";
+    key.gap=  1;
+    section "Function" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="NORM" },
+		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,
+		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 56;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, shape="TLDE" },
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		   <BKSL>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", -15 }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+		   <AC11>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <LALT>, 10 }, <LAMI>,
+		   { <SPCE>, "SPCE" },
+		   <RAMI>, <RALT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 56;
+	left= 326;
+	row {
+	    top= 1;
+	    key.shape = "DELE";
+	    keys { <DELE>, <HELP> };
+	};
+	row {
+	    top= 39;
+	    left = 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 58;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 56;
+	left= 392;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
+
+xkb_geometry "de" {
+
+    description= "Amiga (de)";
+    width= 490;
+    height= 175;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "TLDE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "RTRN" {
+	{ [ 0, 0], [28,0], [28,37], [5,37], [5,18], [ 0,18] },
+	{ [ 2, 1], [26,1], [26,36], [7,36], [7,17], [ 2,17] } };
+    shape "LFSH" { { [ 32,18] }, { [2,1], [ 29,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
+    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 22;
+    row.left= 1;
+    key.shape= "FCTS";
+    key.gap=  1;
+    section "Function" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="NORM" },
+		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,
+		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 56;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, shape="TLDE" },
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		   <BKSL>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <LALT>, 14 }, <LAMI>,
+		   { <SPCE>, "SPCE" },
+		   <RAMI>, <RALT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 56;
+	left= 326;
+	row {
+	    top= 1;
+	    key.shape = "DELE";
+	    keys { <DELE>, <HELP> };
+	};
+	row {
+	    top= 39;
+	    left = 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 58;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 56;
+	left= 392;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
diff --git a/geometry/ataritt b/geometry/ataritt
new file mode 100644
index 00000000..e53cd94c
--- /dev/null
+++ b/geometry/ataritt
@@ -0,0 +1,257 @@
+// $Xorg: ataritt,v 1.3 2000/08/17 19:54:35 cpqbld Exp $
+
+
+
+// $XFree86: xc/programs/xkbcomp/geometry/ataritt,v 3.2 1997/10/26 13:25:34 dawes Exp $
+
+default xkb_geometry "us" {
+
+    description= "Atari TT (us)";
+    width= 480;
+    height= 173;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTRN" { approx = { [0,19], [32,37] },
+		   { [ 14, 0], [32, 0], [32,37], [0,37], [0,19], [14,19] },
+		   { [ 16, 1], [30, 1], [30,36], [2,36], [2,20], [16,20] } };
+    shape "CTRL" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
+    shape "FCTS" { { [ 28,10] }, { [2,1], [ 26,9] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 21;
+    row.left= 1;
+    key.shape = "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 36;
+	key.shape= "FCTS";
+	row {
+	    top= 1;
+	    keys { <FK01>, <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 63;
+	row {
+	    top= 1;
+	    keys { <ESC>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, <TLDE>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", -13 }, <DELE>
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <BKSL>, 34 }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <ALT>, 24 },
+		   { <SPCE>, "SPCE" },
+		   <CAPS>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 63;
+	left= 319;
+	row {
+	    top= 1;
+	    key.shape = "BKSP";
+	    keys { <HELP>, <UNDO> };
+	};
+	row {
+	    top= 20;
+	    keys { <INS>, <UP>, <HOME> };
+	};
+	row {
+	    top= 39;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 63;
+	left= 381;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
+
+xkb_geometry "de" {
+
+    description= "Atari TT (de)";
+    width= 480;
+    height= 173;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" { approx = { [0,19], [32,37] },
+		   { [ 14, 0], [32, 0], [32,37], [0,37], [0,19], [14,19] },
+		   { [ 16, 1], [30, 1], [30,36], [2,36], [2,20], [16,20] } };
+    shape "CTRL" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "RTSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
+    shape "FCTS" { { [ 28,11] }, { [2,1], [ 26,10] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 21;
+    row.left= 1;
+    key.shape = "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 36;
+	key.shape= "FCTS";
+	row {
+	    top= 1;
+	    keys { <FK01>, <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 63;
+	row {
+	    top= 1;
+	    keys { <ESC>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, <TLDE>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", -13 }, <DELE>
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <BKSL>, 34 }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" }, <LSGT>, 
+		    <AB01>, <AB02>, <AB03>, <AB04>,
+		    <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <ALT>, 24 }, { <SPCE>, "SPCE" }, <CAPS>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 63;
+	left= 319;
+	row {
+	    top= 1;
+	    key.shape = "BKSP";
+	    keys { <HELP>, <UNDO> };
+	};
+	row {
+	    top= 20;
+	    keys { <INS>, <UP>, <HOME> };
+	};
+	row {
+	    top= 39;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 63;
+	left= 381;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
diff --git a/geometry/chicony b/geometry/chicony
new file mode 100644
index 00000000..9bdd15b0
--- /dev/null
+++ b/geometry/chicony
@@ -0,0 +1,190 @@
+// -*- indent-tabs-mode: nil -*-
+// $XFree86: xc/programs/xkbcomp/geometry/chicony,v 1.1 2003/05/29 12:41:57 pascal Exp $
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+// Geometry specification for Chicony KB-9820 keyboard.
+
+// 86 keys
+default xkb_geometry "us" {
+    description = "Chicony KB-9820 infra-red keyboard";
+    width = 350;
+    height = 180;
+    //baseColor = "grey60";
+    labelColor = "white";
+
+    shape "EDGE" { cornerRadius = 25,
+                   { [0, 8], [142.5, 0], [202.5, 0], [347, 8],
+                     [347, 60], [327, 100], [322, 160],
+                     [202.5, 165], [142.5, 165],
+                     [25, 160], [20, 100], [0, 60] } };
+    shape "KEYS" { cornerRadius = 2, { [271, 109] } };
+    shape "MOUS" { cornerRadius = 12, { [24, 24] } };
+    shape "MOUS2" { cornerRadius = 9, { [18, 18] } };
+    shape "BTNS"  { cornerRadius = 5, { [10, 10] } };
+
+    solid "Edges" {
+        top = 0;
+        left = 0;
+        shape = "EDGE";
+	color = "grey60";
+    };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 38;
+	top = 22;
+	color = "black";
+    };
+
+    solid "Mouse" {
+        shape = "MOUS";
+        left = 315;
+        top = 30;
+        color = "grey30";
+    };
+
+    outline "Mouse2" {
+        shape = "MOUS2";
+        left = 318;
+        top = 33;
+        color = "black";
+    };
+    
+    solid "Button1" {
+        shape = "BTNS";
+        left = 10;
+        top = 32;
+        color = "grey30";
+    };
+
+    solid "Button2" {
+        shape = "BTNS";
+        left = 20;
+        top = 42;
+        color = "grey30";
+    };
+
+    outline "Buttons" {
+        shape = "MOUS";
+        left = 8;
+        top = 30;
+        color = "black";
+    };
+
+    shape.cornerRadius = 1;
+    shape "ESC"    { { [17, 12] }, { [1.5, 0], [15.5, 10] } };
+    shape "SMALL"  { { [15, 12] }, { [1.5, 0], [13.5, 10] } };
+    shape "THIN"   { { [14, 18] }, { [2, 0], [12, 15] } };
+    shape "NARR"   { { [16, 18] }, { [2, 0], [14, 15] } };
+    shape "NORM"   { { [17, 18] }, { [2, 0], [15, 15] } };
+    shape "WIDER"  { { [18, 18] }, { [2, 0], [16, 15] } };
+    shape "CAPS"   { { [22, 18] }, { [2, 0], [20, 15] } };
+    shape "RTSH"   { { [23, 18] }, { [2, 0], [21, 15] } };
+    shape "WIDEST" { { [30, 18] }, { [2, 0], [28, 15] } };
+    shape "SPCE"   { { [68, 18] }, { [2, 0], [66, 15] } };
+
+    section "Function" {
+	key.shape = "SMALL";
+	key.gap = 0.79;
+	key.color = "grey60";
+	left = 38;
+	top = 22;
+	row {
+	    top = 1;
+	    keys {  { <ESC>, shape="ESC", 1 },
+	    	    { <FK01>, 1.5 }, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+		    <NMLK>, <PRSC>, <SCLK>, <PAUS>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+	key.shape = "NORM";
+	key.gap = 1;
+	key.color = "grey60";
+        left = 38;
+	top = 111;
+	row {
+	    top = 1;
+	    keys { <EASY>, <LCTL>, <LWIN>, <LALT>,
+	           { <SPCE>, shape="SPCE" },
+                   <RALT>,
+                   { <RWIN>, shape="THIN" },
+                   { <MENU>, shape="THIN" },
+                   { <INS>, shape="THIN" },
+                   { <DELE>, shape="THIN" } };
+	};
+    }; // End of "Control" section
+
+    section "Editing" {
+        key.shape = "NORM";
+	key.gap = 1;
+	key.color = "grey60";
+	left = 291;
+	top = 34;
+        row.vertical = True;
+	row {
+	    top = 1;
+	    keys { <HOME>, <PGUP>, <PGDN>, <END> };
+	};
+    }; // End of "Editing" section
+
+    section "Navigation" {
+	key.gap = 1;
+	key.shape = "NARR";
+	key.color = "grey60";
+	left = 257;
+	top = 92;
+	row {
+	    left = 16;
+	    top = 1;
+	    keys { <UP> };
+	};
+	row {
+	    top = 20;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+
+    section "Alpha" {
+	key.gap = 1;
+	key.shape = "NORM";
+	key.color = "grey60";
+        left = 38;
+	top = 35;
+	row {
+	    top = 1;
+	    keys { { <TLDE>, shape="NARR" },
+                   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, shape="WIDER" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { <TAB>,
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, <AD13>
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, shape="WIDEST" }
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, shape="WIDEST" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, shape="RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
diff --git a/geometry/dell b/geometry/dell
new file mode 100644
index 00000000..935bccaa
--- /dev/null
+++ b/geometry/dell
@@ -0,0 +1,185 @@
+// $Xorg: dell,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86$
+//
+default xkb_geometry "dell101" {
+
+    description= "Dell 101";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 21 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
diff --git a/geometry/digital.vndr/.cvsignore b/geometry/digital.vndr/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/geometry/digital.vndr/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/geometry/digital.vndr/Makefile.am b/geometry/digital.vndr/Makefile.am
new file mode 100644
index 00000000..3e918b9f
--- /dev/null
+++ b/geometry/digital.vndr/Makefile.am
@@ -0,0 +1,6 @@
+geom_DATA = \
+lk  pc  unix
+
+EXTRA_DIST= $(geom_DATA)
+                                                                                          
+geomdir = $(xkb_base)/geometry/digital.vndr
diff --git a/geometry/digital.vndr/lk b/geometry/digital.vndr/lk
new file mode 100644
index 00000000..1ccd3316
--- /dev/null
+++ b/geometry/digital.vndr/lk
@@ -0,0 +1,730 @@
+// $Xorg: lk,v 1.3 2000/08/17 19:54:36 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: lk,v 
+// Revision 1.2  1996/06/18  09:12:47  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/08/18  21:15:16  William_Walker
+// 	Upgrade XKB to Protocol Rev. 0.64
+// 	[1995/08/18  20:41:46  William_Walker]
+//
+// Revision 1.1.2.5  1995/08/11  19:35:47  William_Walker
+// 	Sync up with Erik's pool.
+// 	[1995/08/11  18:35:58  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/27  12:17:28  William_Walker
+// 	Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:23:07  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/09  20:54:36  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:40:38  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05  19:21:16  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:05:43  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:16:00
+// 
+xkb_geometry "lk201" {
+    width	       = 530;
+    height	       = 170;
+    shape.cornerRadius = 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[23,19] },
+        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
+        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
+    shape "SPCE" { { [171,19] },{ [3,2], [168,16]} };
+    shape "LEDS" { [ 30,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left= 27;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    section "Function" { top = 20;
+        row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+		    { <FK06>, 19 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 19 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 98 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 20; left = 350;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 41;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 61;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 81; left = 20;
+	    keys { <UP> };
+        };
+        row { top = 101;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 60; left = 426;
+        row { top = 1;
+	    keys { <KPF1>, <KPF2>, <KPF3>, <KPF4> };
+        };
+        row { top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 60;
+        row { top = 1; left = 15;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21; left = 15;
+	    keys {  { <TAB>, "MED" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  <LCTL>,
+		    { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LONG" },
+		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "LONG" }
+	    };
+        };
+        row { top = 81;	left = 26;
+	    keys {  { <LCMP>, "LONG" },
+	    	    { <SPCE>, "SPCE" }
+	    };
+        };
+    };
+
+    section.left = 341;
+    section.top  = 3;
+
+    section "Indicators" {
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.top = 10;
+        indicator.shape= "LED";
+        indicator "Scroll Lock" { left = 9;  };
+        indicator "Caps Lock"   { left = 27; };
+        indicator "Compose"     { left = 45; };
+        indicator "Wait"        { left = 63; };
+        text.top = 4;
+        text.color = "black";
+        text "HoldScreenLabel" {left = 5; text="Hold\n"; };
+        text "CapsLockLabel" {left = 23; text="Lock\n"; };
+        text "ComposeLabel" {left = 37; text="Compose\n"; };
+        text "WaitLabel" {left = 60; text="Wait\n"; };
+    };
+};
+
+xkb_geometry "lk401" {
+
+    width		= 480;
+    height		= 180;
+    shape.cornerRadius	= 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[23,19] },
+        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
+        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
+    shape "SPCE" { { [131,19] },{ [3,2], [128,16]} };
+    shape "LEDS" { [ 36,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left= 17;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    text "Logo" {left = 20; top = 10; text="digital\n"; };
+
+    section "Function" { top = 20;
+    	row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+	    	    { <FK06>, 15 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 15 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 75 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 20; left = 320;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 41;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 61;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 81; left= 20;
+	    keys { <UP> };
+        };
+        row { top = 101;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 60; left = 385;
+        row { top = 1;
+	    keys { <KPF1>, <KPF2>, <KPF3>, <KPF4> };
+        };
+        row {
+	    top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 60;
+        row { top = 1; left = 15;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21; left = 15;
+	    keys {	{ <TAB>, "MED" },
+	    	    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  <LCTL>,
+	    	    { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys { 	{ <LFSH>, "LONG" },
+		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "LONG" }
+	    };
+        };
+        row { top = 81; left = 29;
+	    keys { 	{ <LCMP>, "MED" },
+		    { <LALT>, "MED" },
+		    { <SPCE>, "SPCE" },
+		    { <RALT>, "MED" },
+		    { <RCMP>, "MED" }
+	    };
+        };
+    };
+
+    section.left = 69;
+    section.top  = 3;
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.shape   = "LED";
+        indicator.top 	  = 1;
+        indicator "Scroll Lock" { left = 3;  };
+        indicator "Caps Lock"   { left = 22; };
+    };
+    section "IndicatorLabels" {
+	text.top = 4;
+	text.color = "black";
+	text "ScrollLockLabel" {left = 3;  text="Scroll\nLock"; };
+	text "CapsLockLabel"   {left = 22; text="Caps\nLock"; };
+    };
+};
+
+xkb_geometry "lk450" {
+
+    width		= 480;
+    height		= 180;
+    shape.cornerRadius	= 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[23,19] },
+        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
+        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
+    shape "SPCE" { { [131,19] },{ [3,2], [128,16]} };
+    shape "LEDS" { [ 36,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left= 17;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    text "Logo" {left = 20; top = 10; text="digital\n"; };
+
+    section "Function" { top = 20;
+    	row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+	    	    { <FK06>, 15 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 15 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 75 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 20; left = 320;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 41;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 61;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 81; left= 20;
+	    keys { <UP> };
+        };
+        row { top = 101;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 60; left = 385;
+        row { top = 1;
+	    keys { <KPF1>, <KPF2>, <KPF3>, <KPF4> };
+        };
+        row {
+	    top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 60;
+        row { top = 1; left = 15;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21; left = 15;
+	    keys {	{ <TAB>, "MED" },
+	    	    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  <LCTL>,
+	    	    { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys { 	{ <LFSH>, "LONG" },
+		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "LONG" }
+	    };
+        };
+        row { top = 81; left = 29;
+	    keys { 	{ <LCMP>, "MED" },
+		    { <LALT>, "MED" },
+		    { <SPCE>, "SPCE" },
+		    { <RALT>, "MED" },
+		    { <RCMP>, "MED" }
+	    };
+        };
+    };
+
+    section.left = 69;
+    section.top  = 3;
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.shape   = "LED";
+        indicator.top 	  = 1;
+        indicator "Scroll Lock" { left = 3;  };
+        indicator "Caps Lock"   { left = 22; };
+    };
+    section "IndicatorLabels" {
+	text.top = 4;
+	text.color = "black";
+	text "ScrollLockLabel" {left = 3;  text="Scroll\nLock"; };
+	text "CapsLockLabel"   {left = 22; text="Caps\nLock"; };
+    };
+};
+
+xkb_geometry "lk401bj"
+{
+    width		= 480;
+    height		= 180;
+    shape.cornerRadius  = 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+    	approx = { [0,0],[23,19] },
+        { [0,0], [23,0], [23,39], [5,39], [5,19], [0,19] },
+        { [3,2], [20,2], [20,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "CAPS" { { [28,19] }, { [3,2], [18,16] } };
+    shape "SPCE" { { [131,19] },{ [3,2], [128,16]} };
+    shape "LEDS" { [ 30,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left= 17;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    text "Logo" {left = 20; top = 10; text="digital\n"; };
+
+    section "Function" { top = 20;
+        row { top = 1;
+    	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+		    { <FK06>, 15 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 15 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 75 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 20; left = 320;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 41;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 61;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 81;	left = 20;
+	    keys { <UP> };
+        };
+        row { top = 101;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 60; left = 385;
+        row { top = 1;
+	    keys { <PF1>, <PF2>, <PF3>, <PF4> };
+        };
+        row { top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 60;
+        row { top = 1; left = 15;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21;	left = 15;
+	    keys {  { <TAB>, "MED" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 41;
+	    keys {  <LCTL>,
+		    { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LONG" },
+		    <AB00>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "LONG" }
+	    };
+        };
+        row { top = 81;	left = 29;
+	    keys {  { <LCMP>, "MED" },
+		    { <LALT>, "MED" },
+		    { <SPCE>, "SPCE" },
+		    { <RALT>, "MED" },
+		    { <RCMP>, "MED" }
+	    };
+        };
+    };
+
+    section.left = 69;
+    section.top  = 3;
+
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.top = 1;
+        indicator.shape= "LED";
+        indicator "Scroll Lock" { left = 3; };
+        indicator "Caps Lock" { left = 22; };
+        text.top = 4;
+        text.color = "black";
+        text "ScrollLockLabel" {left = 3; text="Scroll\nLock"; };
+        text "CapsLockLabel" {left = 19; text="Caps\nLock"; };
+    };
+};
+
+xkb_geometry "lk401jj" {
+
+    width		= 460;
+    height		= 180;
+    shape.cornerRadius  = 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[28,23] },
+        { [0,0], [28,0], [28,39], [5,39], [5,19], [0,19] },
+        { [3,2], [25,2], [25,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "LONG1" { { [32,19] }, { [3,2], [29,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [28,19] }, { [3,2], [25,16] } };
+    shape "MED1" { { [23,19] }, { [3,2], [20,16] } };
+    shape "CTRL" { { [43,19] }, { [3,2], [38,16] } };
+    shape "SPCE" { { [55,19] },{ [3,2], [53,16]} };
+    shape "LEDS" { [ 56,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left	= 5;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap		=  1;
+
+    text "Logo" {left = 7; top = 10; text="digital\n"; };
+
+    section "Function" { top = 40;
+        row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+		    { <FK06>, 18 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <FK11>, 18 }, <FK12>, <FK13>, <FK14>,
+		    { <FK17>, 73 }, <FK18>, <FK19>, <FK20>
+	    };
+        };
+    };
+
+    section "Editing" { top = 40; left = 313;
+        row { top = 1;
+	    keys { <HELP>, { <DO>, "LONG" } };
+        };
+        row { top = 31;
+	    keys { <FIND>, <INS>, <DELE> };
+        };
+        row { top = 51;
+	    keys { <SELE>, <PGUP>, <PGDN> };
+        };
+        row { top = 71;	left= 20;
+	    keys { <UP> };
+        };
+        row { top = 91;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 70; left = 377;
+        row { top = 1;
+	    keys { <PF1>, <PF2>, <PF3>, <PF4> };
+        };
+        row { top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6>, <KPCO> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "TALL" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "LONG" }, <KPDL> };
+        };
+    };
+
+    section "Alpha" { top = 70;
+        row { top = 1; left = 7;
+	    keys {  { <AE00>, "MED1" }, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    <AB00>, { <BKSP>, "MED1" }
+	    };
+        };
+        row { top = 21; left = 7;
+	    keys {  { <TAB>, "LONG1" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 41;
+	    keys {  { <LCTL>, "CTRL" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys {  <CAPS>, { <LFSH>, "LONG1" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    <AB11>, { <RTSH>, "MED" }
+	    };
+        };
+        row { top = 81;	left = 7;
+	    keys {  { <LCMP>, "LONG" },
+		    { <LALT>, "LONG" },
+		    { <MUHE>, "LONG" },
+		    { <SPCE>, "SPCE" },
+		    { <KANJ>, "LONG" },
+		    { <HIRA>, "LONG" },
+		    <RALT>, <RCMP>
+	    };
+        };
+    };
+
+    section.left = 315;
+    section.top  = 20;
+
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.top = 11;
+        indicator.shape= "LED";
+        indicator "Scroll Lock" { left = 6;  };
+        indicator "Caps Lock"   { left = 26; };
+        text.top = 4;
+        text.color = "black";
+        text "ScrollLockLabel" {left = 3; text="Scroll\nLock"; };
+        text "CapsLockLabel" {left = 22; text="Caps\nLock"; };
+    };
+};
+
diff --git a/geometry/digital.vndr/pc b/geometry/digital.vndr/pc
new file mode 100644
index 00000000..1529ed20
--- /dev/null
+++ b/geometry/digital.vndr/pc
@@ -0,0 +1,350 @@
+// $Xorg: pc,v 1.3 2000/08/17 19:54:36 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: pc,v 
+// Revision 1.2  1996/06/18  09:12:50  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/08/18  21:15:18  William_Walker
+// 	Upgrade XKB to Protocol Rev. 0.64
+// 	[1995/08/18  20:41:49  William_Walker]
+//
+// Revision 1.1.2.4  1995/08/11  19:35:48  William_Walker
+// 	Sync up with Erik's pool.
+// 	[1995/08/11  18:36:03  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/27  12:17:29  William_Walker
+// 	Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:23:10  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05  19:21:19  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:05:51  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: pc,v  Revision: 1.2  (DEC) Date: 1996/02/02 14:40:25
+// 
+partial xkb_geometry "common" {
+    width		= 480;
+    height		= 200;
+
+    shape.cornerRadius = 1;
+    shape "NORM" { primary = { [18,19] }, { [3,2], [15,16] } };
+    shape "KP0"  { primary = { [37,19] }, { [3,2], [34,16] } };
+    shape "KPAD" { primary = { [18,39] }, { [3,2], [15,36] } };
+    shape "LEDS" { [78,22] };
+    shape "LED"  { [5,2] };
+
+    text.color         = "black";
+    section.left       = 17;
+    row.left	       = 1;
+    key.shape	       = "NORM";
+    key.gap	       =  1;
+
+    section "Function" { top = 40;
+        row { top = 1;
+	    keys {  <ESC>,
+	    	    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+	    	    { <FK05>, 10 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 10 }, <FK10>, <FK11>, <FK12>
+	    };
+        };
+    };
+
+    section "Editing" { top = 40; left = 308;
+        row { top = 1;
+    	    keys { <PRSC>, <SCLK>, <PAUS> };
+        };
+        row { top = 41;
+	    keys { <INS>, <HOME>, <PGUP> };
+        };
+        row { top = 61;
+	    keys { <DELE>, <END>, <PGDN> };
+        };
+        row { top = 101; left = 20;
+	    keys { <UP> };
+        };
+        row { top = 121;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+        };
+    };
+
+    section "Keypad" { top = 80; left = 374;
+        row { top = 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+        };
+        row { top = 21;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
+        };
+        row { top = 41;
+	    keys { <KP4>, <KP5>, <KP6> };
+        };
+        row { top = 61;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
+        };
+        row { top = 81;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+        };
+    };
+};
+
+partial xkb_geometry "leds_on_keys" {
+    section.top  = 40;
+    section.left = 17;
+    section "LedPanel" {
+        indicator.onColor  = "#00ff00";
+        indicator.offColor = "#001000";
+        indicator.shape    = "LED";
+        indicator "Scroll Lock" { left = 317; top = 5;  };
+        indicator "Num Lock"    { left = 364; top = 45; };
+        indicator "Caps Lock"   { left = 10;   top = 85; };
+    };
+
+    section.left = 375;
+    section.top  = 40;
+    section "LogoPanel" {
+        solid "logo_panel" { top = 0; left = 0;
+            shape = "LEDS";
+	    color = "grey";
+        };
+        text "Logo" {left = 28; top = 10; text="digital\n"; };
+    };
+};
+
+partial xkb_geometry "leds_alone" {
+    section.left = 375;
+    section.top  = 40;
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.top = 16;
+        indicator.onColor  = "#00ff00";
+        indicator.offColor = "#001000";
+        indicator.shape    = "LED";
+        indicator "Num Lock" 	{ left = 3;  };
+        indicator "Caps Lock"	{ left = 26; };
+        indicator "Scroll Lock" { left = 50; };
+        text "Logo" {left = 2; top = 3; text="digital\n"; };
+    };
+    section "IndicatorLabels" {
+	text.top = 11;
+    	text "NumLockLabel"    {left = 10; text="Num\nLock";    };
+    	text "CapsLockLabel"   {left = 33; text="Caps\nLock";   };
+    	text "ScrollLockLabel" {left = 58; text="Scroll\nLock"; };
+    };
+};
+
+xkb_geometry "pc101" {
+    include "digital/pc(common)"
+
+    shape.cornerRadius = 1;
+    shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
+    shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "RTRN" { primary = { [41,19] }, { [3,2], [38,16] } };
+    shape "CAPS" { primary = { [32,19] }, { [3,2], [29,16] } };
+    shape "LFSH" { primary = { [41,19] }, { [3,2], [38,16] } };
+    shape "RTSH" { primary = { [51,19] }, { [3,2], [49,16] } };
+    shape "MODK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "BKSL" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "SPCE" { primary = { [132,19] },{ [3,2], [129,16]} };
+
+    section.left       = 17;
+    row.left	       = 1;
+    key.shape	       = "NORM";
+    key.gap	       =  1;
+
+    section "Alpha" { top = 80;
+        row { top = 1;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "BKSP" }
+	    };
+        };
+        row { top = 21;
+	    keys {  { <TAB>, "TABK" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <BKSL>, "BKSL" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>,
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, 
+                    <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "RTSH" }
+	    };
+        };
+        row { top = 81;
+	    key.shape = "MODK";
+	    keys {  <LCTL>,
+		    { <LALT>, 20 },
+		    { <SPCE>, "SPCE" },
+		    <RALT>,
+		    { <RCTL>, 21 }
+	    };
+        };
+    };
+};
+
+xkb_geometry "pc102" {
+    include "digital/pc(common)"
+
+    shape.cornerRadius = 1;
+    shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
+    shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "RTRN" { 
+        approx = { [0,0],[28,19] },
+        { [0,0], [27,0], [27,39], [5,39], [5,19], [0,19] },
+        { [3,2], [24,2], [24,36], [8,36], [8,16], [3,16] }
+    };
+    shape "CAPS" { primary = { [32,19] }, { [3,2], [29,16] } };
+    shape "LFSH" { primary = { [22,19] }, { [3,2], [19,16] } };
+    shape "RTSH" { primary = { [51,19] }, { [3,2], [49,16] } };
+    shape "MODK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "BKSL" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "SPCE" { primary = { [132,19] },{ [3,2], [129,16]} };
+
+    section.left       = 17;
+    row.left	       = 1;
+    key.shape	       = "NORM";
+    key.gap	       =  1;
+
+    section "Alpha" { top = 80;
+        row { top = 1;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "BKSP" }
+	    };
+        };
+        row { top = 21;
+	    keys {  { <TAB>, "TABK" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+
+        };
+        row { top = 41;
+	    keys {  { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12>
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LFSH" },
+		    <BKSL>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+	            <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "RTSH" }
+	    };
+        };
+        row { top = 81;
+	    key.shape = "MODK";
+	    keys {  <LCTL>,
+		    { <LALT>, 20 },
+		    { <SPCE>, "SPCE" },
+		    <RALT>,
+		    { <RCTL>, 21 }
+	    };
+        };
+    };
+};
+
+xkb_geometry "pcxaj" {
+    include "digital/pc(common)"
+
+    shape.cornerRadius = 1;
+    shape "BKSP" { primary = { [36,19] }, { [3,2], [33,16] } };
+    shape "TABK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "RTRN" { primary = { [22,19] }, { [3,2], [19,16] } };
+    shape "CAPS" { primary = { [32,19] }, { [3,2], [29,16] } };
+    shape "LFSH" { primary = { [41,19] }, { [3,2], [38,16] } };
+    shape "RTSH" { primary = { [32,19] }, { [3,2], [29,16] } };
+    shape "MODK" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "BKSL" { primary = { [27,19] }, { [3,2], [24,16] } };
+    shape "SPCE" { primary = { [114,19]}, { [3,2], [111,16]} };
+
+    section.left       = 17;
+    row.left	       = 1;
+    key.shape	       = "NORM";
+    key.gap	       =  1;
+
+    section "Alpha" { top = 80;
+        row { top = 1;
+	    keys {  <AE00>, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "BKSP" }
+	    };
+        };
+        row { top = 21;
+	    keys {  { <TAB>, "TABK" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <BKSL>, "BKSL" }
+	    };
+        };
+        row { top = 41;
+	    keys {  { <CAPS>, "CAPS" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <AC12>,
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 61;
+	    keys {  { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, 
+		    <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
+		    { <RTSH>, "RTSH" }
+	    };
+        };
+        row { top = 81;
+	    key.shape = "MODK";
+	    keys {  <LCTL>, <LALT>, 
+		    { <MUHE>, "NORM" }, 
+		    { <SPCE>, "SPCE" },
+		    { <KANJ>, "NORM" },
+		    { <HIRA>, "NORM" },
+		    <RALT>, <RCTL>
+	    };
+        };
+    };
+};
diff --git a/geometry/digital.vndr/unix b/geometry/digital.vndr/unix
new file mode 100644
index 00000000..2ca477e8
--- /dev/null
+++ b/geometry/digital.vndr/unix
@@ -0,0 +1,230 @@
+// $Xorg: unix,v 1.3 2000/08/17 19:54:36 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: unix,v 
+// Revision 1.2  1996/06/18  09:12:53  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.2.3  1995/06/27  12:17:30  William_Walker
+// 	Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:23:12  William_Walker]
+//
+// Revision 1.1.2.2  1995/06/05  19:21:23  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:05:56  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: unix,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:16:
+// 
+xkb_geometry "unix" {
+
+    width		= 340;
+    height		= 160;
+    shape.cornerRadius 	= 1;
+
+    shape "NORM" { primary = { [18,19] }, { [3,2], [15,16] } };
+    shape "AE00" { primary = { [28,19] }, { [3,2], [25,16] } };
+    shape "BKSP" { primary = { [46,19] }, { [3,2], [43,16] } };
+    shape "TABK" { primary = { [37,19] }, { [3,2], [34,16] } };
+    shape "CTRL" { primary = { [46,19] }, { [3,2], [43,16] } };
+    shape "RTRN" { primary = { [46,19] }, { [3,2], [43,16] } };
+    shape "SHFT" { primary = { [56,19] }, { [3,2], [53,16] } };
+    shape "MODK" { primary = { [37,19] }, { [3,2], [34,16] } };
+    shape "SPCE" { primary = { [132,19] },{ [3,2], [129,16]} };
+
+    section.left= 17;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap	=  1;
+
+    text.color      = "black";
+    text "Logo" {left = 20; top = 10; text="digital\n"; };
+
+    section "Function" { top = 30;
+        row { top = 1;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, 
+		    { <FK06>, 20 }, <FK07>, <FK08>, <FK09>, <FK10>,
+		    { <LEFT>, 20 }, <DOWN>, <UP>, <RGHT>
+	    };
+        };
+    };
+
+    section "Alpha" { top = 50;
+        row { top = 1;
+	    keys {  { <AE00>, "AE00" }, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    { <BKSP>, "BKSP" }
+	    };
+        };
+        row { top = 21;
+	    keys {  { <TAB>, "TABK" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    <BKSL>, <AB00>
+	    };
+
+        };
+        row { top = 41; left = -4;
+	    keys {  { <LCTL>, "CTRL" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, 
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 61; left = -4;
+	    keys {  { <LFSH>, "SHFT" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, 
+		    <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, "SHFT" }
+	    };
+        };
+        solid "ExtendKey" { top = 81; left= 1;
+            shape= "NORM";
+            color= "grey20";
+        };
+        text.top = 89;
+        text.color = "black";
+        text "ExtendLabel" {left = 6; text="Ext\nend"; };
+        row { top = 81; left = 19;
+	    key.shape = "MODK";
+	    keys {  { <LCMP>, "NORM" }, <LALT>,
+		    { <SPCE>, "SPCE" },
+		    <RALT>, <RCMP> 
+	    };
+        };
+    };
+};
+
+xkb_geometry "lk421jj" {
+
+    width		= 315;
+    height		= 170;
+    shape.cornerRadius  = 1;
+
+    shape "NORM" { { [18,19] }, { [3,2], [15,16] } };
+    shape "RTRN" {
+	approx = { [0,0],[28,23] },
+        { [0,0], [28,0], [28,39], [5,39], [5,19], [0,19] },
+        { [3,2], [25,2], [25,36], [8,36], [8,16], [3,16] }
+    };
+    shape "LONG"  { { [37,19] }, { [3,2], [34,16] } };
+    shape "LONG1" { { [32,19] }, { [3,2], [29,16] } };
+    shape "TALL" { { [18,39] }, { [3,2], [15,36] } };
+    shape "MED" { { [23,19] }, { [3,2], [20,16] } };
+    shape "CTRL" { { [43,19] }, { [3,2], [38,16] } };
+    shape "SPCE" { { [55,19] },{ [3,2], [53,16]} };
+    shape "LEDS" { [ 56,15] };
+    shape "LED"  { [  5, 2] };
+
+    section.left	= 5;
+    row.left	= 1;
+    key.shape	= "NORM";
+    key.gap		=  1;
+
+    text "Logo" {left = 7; top = 10; text="digital\n"; };
+
+    section "Function" { top = 45;
+        row { top = 1; left = 7;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+		    { <FK06>, 18 }, <FK07>, <FK08>, <FK09>, <FK10>
+	    };
+        };
+    };
+
+    section "Editing" { top = 45; left= 230;
+        row { top = 1;
+	    keys { <LEFT>, <DOWN>, <UP>, <RGHT> };
+        };
+    };
+
+    section "Alpha" { top = 65;
+        row { top = 1; left = 7;
+	    keys {  { <AE00>, "MED" }, 
+		    <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>, 
+		    <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+		    <AB00>, { <BKSP>, "MED" }
+	    };
+        };
+        row { top = 21;	left = 7;
+	    keys {  { <TAB>, "LONG1" },
+		    <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, 
+		    <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, 
+		    { <RTRN>, "RTRN" }
+	    };
+        };
+        row { top = 41;
+	    keys {  { <LCTL>, "CTRL" },
+		    <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, 
+		    <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, <BKSL>
+	    };
+        };
+        row { top = 61;
+	    keys {  <CAPS>, { <LFSH>, "LONG1" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    <AB11>, { <RTSH>, "LONG1" }
+	    };
+        };
+        row { top = 81;	left = 7;
+	    keys {  <AA00>, <LCMP>,
+		    { <LALT>, "LONG" },
+		    { <MUHE>, "LONG" },
+		    { <SPCE>, "SPCE" },
+		    { <KANJ>, "LONG" },
+		    { <HIRA>, "LONG" },
+		    <RALT>, <RCMP>
+	    };
+        };
+    };
+
+    section.left = 233;
+    section.top  = 20;
+
+    section "Indicators" {
+        solid "led_panel" { top = 0; left = 0;
+	    cornerRadius = 1;
+	    shape = "LEDS";
+	    color = "grey";
+        };
+        indicator.onColor = "#00ff00";
+        indicator.offColor= "#001000";
+        indicator.top = 11;
+        indicator.shape= "LED";
+        indicator "Scroll Lock" { left = 6;  };
+        indicator "Caps Lock"   { left = 26; };
+        text.top = 3;
+        text.color = "black";
+        text "ScrollLockLabel" {left = 3; text="Scroll\nLock"; };
+        text "CapsLockLabel" {left = 22; text="Caps\nLock"; };
+    };
+};
+
+
diff --git a/geometry/everex b/geometry/everex
new file mode 100644
index 00000000..5be3266b
--- /dev/null
+++ b/geometry/everex
@@ -0,0 +1,174 @@
+// $Xorg: everex,v 1.3 2000/08/17 19:54:35 cpqbld Exp $
+//
+// $XFree86$
+//
+default xkb_geometry "STEPnote" {
+
+    description= "Everex STEPnote";
+    width= 281;
+    height= 150;
+
+    shape.cornerRadius= 1;
+
+    shape "NORM" { 
+	{ [17,17] },
+	{ [ 2, 1], [ 15, 15 ] }
+    };
+    shape "NARR" {
+	{ [  15, 17 ] },
+	{ [   2,  1 ], [ 13, 15 ] }
+    };
+    shape "FKEY" {
+	{ [ 15.1, 15.5 ] },
+	{ [  1,  1 ], [ 14.1, 14.5 ] }
+    };
+    shape "ESC" {
+	{ [  16.4, 15.5 ] },
+	{ [   1, 1  ], [ 14.1, 14.5 ] }
+    };
+    shape "WIDE" {	// backspace, tab and Fn
+	{ [  25, 17 ] },
+	{ [   2,  1 ], [ 23, 15 ] }
+    };
+    shape "RTRN" {
+	{ [  27.5, 17 ] },
+	{ [  2,  1 ], [ 25.5, 15 ] }
+    };
+    shape "CAPS" {
+	{ [  30, 17 ] },
+	{ [   2,  1 ], [ 28, 15 ] }
+    };
+    shape "LFSH" {
+	{ [  38.5, 17 ] },
+	{ [  2,  1 ], [ 36.5, 15 ] }
+    };
+    shape "RTSH" {
+	{ [  21, 17 ] },
+	{ [   2,  1 ], [ 19, 15 ] }
+    };
+    shape "SPCE" {
+	{ [  88.8, 17 ] },
+	{ [  2,  1 ], [ 86.8, 15 ] }
+    };
+    shape "WELL" { 
+	{ [ 269, 105 ] }
+    };
+    shape "LED" {
+	cornerRadius= 1.5,
+	{ [ 3, 10 ] }
+    };
+
+    section.left= 6;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  0.5;
+
+    key.color= "grey20";
+    labelColor= "white";
+    baseColor= "grey20";
+
+    indicator.top= 20;
+    indicator.shape= "LED";
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+
+    indicator "Power" 		{ left= 40; };
+    indicator "Battery" 	{ left=101; };
+    indicator "Suspend" 	{ left=112; };
+    indicator "HardDrive" 	{ left=123; };
+    indicator "Floppy" 		{ left=134; };
+    indicator "KeyPad" 		{ left=145; };
+    indicator "Num Lock" 	{ left=156; };
+    indicator "Caps Lock" 	{ left=167; };
+    indicator "Scroll Lock"	{ left=178; };
+
+    solid "KeyWell" {
+	top= 35;
+	left= 6;
+	shape= "WELL";
+	color= "grey10";
+    };
+    section "Whole" {
+	top= 35;
+	row {
+	    top= 0.5;
+	    key.color= "grey30";
+	    key.shape= "FKEY";
+	    keys { 
+		{ <ESC>, "ESC" },
+		<FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>,
+		<FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>,
+		<NMLK>, <PRSC>, <SCLK>, <PAUS>
+	    };
+	};
+	row {
+	    top= 16.5;
+	    keys { 
+		{ <TLDE>, "NARR" },
+		<AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		<AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		{ <BKSP>, shape="WIDE", color="grey30" }, 
+		{ <HOME>, shape="NARR", color="grey30" }
+	    };
+	};
+	row {
+	    top= 34;
+	    keys { 
+	    	{  <TAB>, shape="WIDE", color="grey30" },
+		<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>,
+		<AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
+		{ <BKSL>, "NARR" }, 
+		{ <PGUP>, shape="NARR", color="grey30" }
+	    };
+	};
+	row {
+	    top= 51.5;
+	    keys { 
+		{ <CAPS>, shape="CAPS", color="grey30" },
+		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		<AC11>, 
+		{ <RTRN>, shape="RTRN", color="grey30" }, 
+		{ <PGDN>, shape="NARR", color="grey30" }
+	    };
+	};
+	row {
+	    top= 69;
+	    keys { 
+		{ <LFSH>, shape="LFSH", color="grey30" },
+		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		{ <RTSH>, shape="RTSH", color="grey30" }, 
+		{   <UP>, shape="NARR", color="grey30" },
+		{  <END>, shape="NARR", color="grey30" }
+	    };
+	};
+	row {
+	    top= 86.5;
+	    key.color= "grey30";
+	    keys { 
+		{ <FUNC>, "WIDE" }, 
+		<LCTL>, <LALT>,
+		{ <SPCE>, shape="SPCE", 18, color="grey20" },
+		<RALT>,  <INS>, <DELE>,
+		{ <LEFT>, "NARR" }, { <DOWN>, "NARR" },
+		{ <RGHT>, "NARR" }
+	    };
+	};
+	solid "FakeKey" {
+	    top= 86.5;
+	    left= 62.1;
+	    shape= "NORM";
+	    color= "grey20";
+	};
+	overlay "KPAD" {
+	    <AE07>=<KP7>,  <AE08>=<KP8>, <AE09>=<KP9>,  <AE10>=<KPMU>,
+	    <AD07>=<KP4>,  <AD08>=<KP5>, <AD09>=<KP6>,  <AD10>=<KPSU>,
+	    <AC07>=<KP1>,  <AC08>=<KP2>, <AC09>=<KP3>,  <AC10>=<KPAD>,
+	    <AB07>=<KP0>,                <AB09>=<KPDL>, <AB10>=<KPSL>
+	};
+    }; // End of "Whole" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
diff --git a/geometry/fujitsu b/geometry/fujitsu
new file mode 100644
index 00000000..02fe0bc2
--- /dev/null
+++ b/geometry/fujitsu
@@ -0,0 +1,315 @@
+// $Xorg: fujitsu,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+default xkb_geometry "138" {
+
+    // This is an approximate layout for a (US/ASCII) Fujitsu keyboard.  
+
+    description= "Fujitsu English keyboard";
+
+    width= 480;
+    height= 215;
+
+    shape "EDGE" { cornerRadius= 2, { [ 480, 215 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" { 
+	    approx = { [ 0, 0], [28,37] },
+	    { [ 0, 0], [28, 0], [28,37],
+	      [ 5,37], [ 5,19], [ 0,19] },
+	    { [ 1, 1], [26, 1], [26,36],
+	      [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "LFSH" { { [ 41,18] }, { [2,1], [ 39,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [ 31,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "SPCE" { { [151,18] }, { [2,1], [149,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "EXEC" { { [ 57,18] }, { [2,1], [ 55,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 15;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { 
+		  <BREA>, { <PRSC>, 6 }, 
+		{ <FK13>, 30 }, <FK14>, <FK15>, <FK16>,
+		{ <FK17>, 6 }, <FK18>, <FK19>, <FK20>,
+		{ <FK21>, 6 }, <FK22>, <FK23>, <FK24>,
+		{ <FK29>, 68 }, <FK30>, <FK31>, <FK32>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {
+		  <KNJI>, { <PAUS>, 6 },
+		{ <FK01>, 30 }, <FK02>, <FK03>, <FK04>,
+		{ <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
+		{ <FK09>, 6 }, <FK10>, <FK11>, <FK12>,
+		{ <UNK0>, 6 }, <UNK1>, <UNK2>,
+		{ <FK25>, 6 }, <FK26>, <FK27>, <FK28>
+	    };
+	};
+	row {
+	    top= 39;
+	    left= 316;
+	    keys {
+		  <PGUP>, <HOME>, <PGDN>
+	    };
+	};
+	row {
+	    top= 54;
+	    keys { 
+		  <UNDO>, { <ESC>, 6 }, 
+		  <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		  <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		  <AE11>, <AE12>, <TLDE>, <BKSP>,
+		{ <KPMU>, 68 }, <KPDV>, <KPAD>, <KPSU>
+
+	    };
+	};
+	row {
+	    top= 58;
+	    left= 316;
+	    keys {
+		  <UNK3>, <DEL>, <INS>
+	    };
+	};
+	row {
+	    top= 73;
+	    keys { <COPY>, 
+		 { <TAB>, 6, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
+		 { <KP7>, 68 }, <KP8>, <KP9>, <KPEQ>
+	    };
+	};
+	row {
+	    top= 92;
+	    keys { <PAST>, 
+		 { <LCTL>, 6, "LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <BKSL>,
+		 { <UP>, 49 },
+		 { <KP4>, 25 }, <KP5>, <KP6>, <KPDC>
+	    };
+	};
+	row {
+	    top= 102;
+	    left= 316;
+	    keys { <LEFT>, { <RGHT>, 19 }
+	    };
+	};
+	row {
+	    top= 111;
+	    keys { <CUT>, 
+		 { <LFSH>, 6 , "LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   <AB11>, { <RTSH>, "RTSH" },
+		 { <DOWN>, 25 },
+		 { <KP1>, 25 }, <KP2>, <KP3>, { <KPEN>, "KPEN" }
+	    };
+	};
+	row {
+	    top= 130;
+	    keys { <HELP>, { <CAPS>, 6 },
+		   <LALT>, <LMTA>, 
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <RALT>, <COMP>, <LNFD>, 
+		 { <KP0>, 68, "KP0" }, <KP00>
+	    };
+	};
+	row {
+	    top= 149;
+	    left= 316;
+	    keys { 
+		 { <EXEC>, "EXEC" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
+
+xkb_geometry "140" {
+
+    // This is an approximate layout for a Fujitsu Japanese keyboard.  
+
+    description= "Fujitsu Japanese keyboard";
+
+    width= 480;
+    height= 215;
+
+    shape "EDGE" { cornerRadius= 2, { [ 480, 215 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" { 
+	    approx = { [ 0, 0], [28,37] },
+	    { [ 0, 0], [28, 0], [28,37],
+	      [ 5,37], [ 5,19], [ 0,19] },
+	    { [ 1, 1], [26, 1], [26,36],
+	      [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "LFSH" { { [ 41,18] }, { [2,1], [ 39,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [ 31,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "SPCE" { { [113,18] }, { [2,1], [111,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "HNKN" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "EXEC" { { [ 57,18] }, { [2,1], [ 55,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 15;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { 
+		  <BREA>, { <PRSC>, 6 }, 
+		{ <FK13>, 30 }, <FK14>, <FK15>, <FK16>,
+		{ <FK17>, 6 }, <FK18>, <FK19>, <FK20>,
+		{ <FK21>, 6 }, <FK22>, <FK23>, <FK24>,
+		{ <FK29>, 68 }, <FK30>, <FK31>, <FK32>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {
+		  <KNJI>, { <PAUS>, 6 },
+		{ <FK01>, 30 }, <FK02>, <FK03>, <FK04>,
+		{ <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
+		{ <FK09>, 6 }, <FK10>, <FK11>, <FK12>,
+		{ <UNK0>, 6 }, <UNK1>, <UNK2>,
+		{ <FK25>, 6 }, <FK26>, <FK27>, <FK28>
+	    };
+	};
+	row {
+	    top= 39;
+	    left= 316;
+	    keys {
+		  <PGUP>, <HOME>, <PGDN>
+	    };
+	};
+	row {
+	    top= 54;
+	    keys { 
+		  <UNDO>, { <ESC>, 6 }, 
+		  <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		  <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		  <AE11>, <AE12>, <BKSL>, <BKSP>,
+		{ <KPMU>, 68 }, <KPDV>, <KPAD>, <KPSU>
+
+	    };
+	};
+	row {
+	    top= 58;
+	    left= 316;
+	    keys {
+		  <UNK3>, <DEL>, <INS>
+	    };
+	};
+	row {
+	    top= 73;
+	    keys { <COPY>, 
+		 { <TAB>, 6, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
+		 { <KP7>, 68 }, <KP8>, <KP9>, <KPEQ>
+	    };
+	};
+	row {
+	    top= 92;
+	    keys { <PAST>, 
+		 { <LCTL>, 6, "LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <TLDE>,
+		 { <UP>, 49 },
+		 { <KP4>, 25 }, <KP5>, <KP6>, <KPDC>
+	    };
+	};
+	row {
+	    top= 102;
+	    left= 316;
+	    keys { <LEFT>, { <RGHT>, 19 }
+	    };
+	};
+	row {
+	    top= 111;
+	    keys { <CUT>, 
+		 { <LFSH>, 6 , "LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		   <AB11>, { <RTSH>, "RTSH" }, 
+		 { <DOWN>, 25 },
+		 { <KP1>, 25 }, <KP2>, <KP3>, { <KPEN>, "KPEN" }
+	    };
+	};
+	row {
+	    top= 130;
+	    keys { <HELP>, { <CAPS>, 6 },
+		   <LALT>, <LMTA>, <UNK4>,
+		 { <SPCE>, "SPCE" },
+		   <UNK5>, <RMTA>, <COMP>, <LNFD>, <UNK6>,
+		 { <KP0>, 68, "KP0" }, <KP00>
+	    };
+	};
+	row {
+	    top= 149;
+	    left= 134;
+	    keys { 
+		 { <UNK7>, "HNKN" }, { <UNK8>, "HNKN" }, 
+		 { <EXEC>, 132, "EXEC" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
diff --git a/geometry/hp b/geometry/hp
new file mode 100644
index 00000000..c93cb0cd
--- /dev/null
+++ b/geometry/hp
@@ -0,0 +1,456 @@
+// $Xorg: hp,v 1.4 2001/02/09 02:05:50 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/geometry/hp,v 1.8 2003/08/09 14:30:46 pascal Exp $
+
+default xkb_geometry "pc101" {
+
+    description= "HP PC101";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [132,18] }, { [2,1], [130,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 310;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 375;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
+xkb_geometry "hil" {
+
+    description= "HP hil";
+    width= 455;
+    height= 170;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "TABK" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "BKSL" { { [ 24,18] }, { [2,1], [ 22,17] } };
+    shape "RTRN" { { [ 38,18] }, { [2,1], [ 36,17] } };
+    shape "LFSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [151,18] }, { [2,1], [150,17] } };
+    shape "KP0"  { { [ 38,18] }, { [2,1], [ 36,17] } };
+    shape "KPTB" { { [ 18,38] }, { [2,1], [ 16,37] } };
+    shape "TLDE" { { [ 24,18] }, { [2,1], [ 22,17] } };
+    shape "FKT1" { { [ 17,14] }, { [2,1], [ 15,13] } };
+    shape "FKT2" { { [ 23,14] }, { [2,1], [ 21,13] } };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 14;
+	row {
+	    top= 1;
+	    keys {  { <BRK>, "FKT1" }, { <STOP>, "FKT1" } ,
+		    { <FK01>, "FKT2", 10 }, { <FK02>, "FKT2" },
+		    { <FK03>, "FKT2" }, { <FK04>, "FKT2" }, 
+		    { <MENU>, "FKT1" }, { <SYST>, "FKT1" },
+		    { <FK05>, "FKT2" }, { <FK06>, "FKT2" }, 
+		    { <FK07>, "FKT2" }, { <FK08>, "FKT2" }, 
+		    { <CLRL>, "FKT1", 10 }, { <CLR>, "FKT1" },
+		    { <FK09>, "FKT1", 19 }, { <FK10>, "FKT1" },
+		    { <FK11>, "FKT1" }, { <FK12>, "FKT1" }
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, "TLDE" }, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP" }, <INSL>, <DELL>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" },
+		   <INSC>, <DELC>
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <CAPS>, <LCTL>,
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN" },
+		   <HOME>, <PGUP>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {  <ESC>, { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }, <SELE>,
+		    <UP>, <PGDN>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <PRSC>, { <LALT>, 30 },
+		   { <SPCE>, "SPCE" },
+		   <RALT>, { <LEFT>, 30 }, <DOWN>, <RGHT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Keypad" {
+	top= 52;
+	left= 360;
+	row {
+	    top= 1;
+	    keys { <KPMU>, <KPDV>, <KPAD>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPEN> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPSP> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPTB>, "KPTB" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "default" geometry
+
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+// Geometry specification for HP Omnibook keyboards.
+// Compatible Models: 6100, 6000.
+
+xkb_geometry "omnibook" {
+    width = 282;
+    height = 128;
+    baseColor = "grey80";
+    labelColor = "white";
+
+    shape "FN0"  { cornerRadius = 1, { [15.5, 12] }, { [1, 0], [14.5, 11] } };
+    shape "NORM" { cornerRadius = 1, { [18, 16] }, { [2, 0], [16, 14] } };
+    shape "BKSP" { cornerRadius = 1, { [31, 16] }, { [2, 0], [29, 14] } };
+    shape "TABK" { cornerRadius = 1, { [27, 16] }, { [2, 0], [25, 14] } };
+    shape "CAPS" { cornerRadius = 1, { [32, 16] }, { [2, 0], [30, 14] } };
+    shape "RTSH" { cornerRadius = 1, { [45, 16] }, { [2, 0], [43, 14] } };
+    shape "MODK" { cornerRadius = 1, { [28, 16] }, { [2, 0], [26, 14] } };
+    shape "SPCE" { cornerRadius = 1, { [90, 16] }, { [2, 0], [88, 14] } };
+    shape "ARRS" { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 11] } };
+    
+    shape "LED"  { cornerRadius = 1, { [2, 4] } };
+
+    shape "KEYS" { cornerRadius = 1,
+                   { [0, 13],
+                     [197, 13], [197, 0],
+                     [280, 0], [280, 125],
+                     [224, 125], [224, 112],
+                     [0, 112] }
+    };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 1;
+	top = 1;
+	color = "black";
+    };
+
+    shape "NULL1" { cornerRadius = 1, { [54, 16] } };
+
+    solid "NullPanel1" {
+	shape = "NULL1";
+	left = 226;
+	top = 96;
+	color = "grey80";
+    };
+
+    shape "NULL2" { cornerRadius = 1, { [19, 14] } };
+
+    solid "NullPanel2" {
+	shape = "NULL2";
+	left = 243;
+	top = 97;
+	color = "black";
+    };
+
+    indicator.onColor = "green";
+    indicator.offColor = "grey10";
+    indicator.top = 4;
+    indicator.shape = "LED";
+    indicator "Caps Lock"    { left = 45; };
+    indicator "Num Lock"     { left = 60; };
+    indicator "Scroll Lock"  { left = 75; };
+    indicator "HDDActivity" { onColor = "red"; left = 90; };
+
+    key.color = "grey60";
+
+    section "Function" {
+        key.gap = 0.99;
+        left = 1;
+        top = 1;
+	key.shape = "FN0";
+	row {
+	    left = 197;
+	    top = 1;
+	    keys {  <PRSC>, <PAUS>, <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top = 14;
+	    keys {  <ESC>,
+                    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+                    <SCLK>, <DELE>, <END>, <PGDN>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+        left = 1;
+	top = 34;
+        key.gap = 1;
+	row {
+	    top = 62;
+	    key.shape = "NORM";
+	    keys { <LCTL>, <FN>, <LWIN>, <LALT>,
+		   { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Navigation" {
+	key.shape = "ARRS";
+	left = 225;
+	top = 97;
+        key.gap = 1.4;
+	row {
+	    left= 18;
+	    top = 1;
+	    keys { <UP> };
+	};
+	row {
+	    top = 16;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+
+    shape "STIK" { cornerRadius = 4, { [7, 7] } };
+
+    solid "STIK" {
+	priority = 255;
+	color = "red";
+	shape = "STIK";
+	top = 73;
+	left = 126;
+    };
+};
+
+// 86 keys
+xkb_geometry "omnibook_intl" {
+    include "hp(omnibook)"
+    description = "HP Omnibook 6000/6100, Intl";
+
+    shape "RTRN" { cornerRadius = 1,
+                   { [22, 0], [22, 33], [5, 33], [5, 16], [0, 16], [0, 0] },
+                   { [20, 0], [20, 31], [7, 31], [7, 14], [2, 14], [2, 0] } };
+    shape "LFSH" { cornerRadius = 1, { [23, 16] }, { [2, 0], [21, 14] } };
+
+    section "Alpha" {
+	key.gap = 1;
+	key.color = "grey60";
+	key.shape = "NORM";
+        left = 1;
+	top = 27;
+	row {
+	    top = 1;
+	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 18;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top = 35;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top = 52;
+	    keys { { <LFSH>, "LFSH" }, <LSGT>,
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
diff --git a/geometry/ibm.vndr/.cvsignore b/geometry/ibm.vndr/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/geometry/ibm.vndr/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/geometry/ibm.vndr/Makefile.am b/geometry/ibm.vndr/Makefile.am
new file mode 100644
index 00000000..883420e6
--- /dev/null
+++ b/geometry/ibm.vndr/Makefile.am
@@ -0,0 +1,6 @@
+geom_DATA = \
+thinkpad
+
+EXTRA_DIST= $(geom_DATA)
+                                                                                          
+geomdir = $(xkb_base)/geometry/ibm.vndr
diff --git a/geometry/ibm.vndr/thinkpad b/geometry/ibm.vndr/thinkpad
new file mode 100644
index 00000000..c9b769cc
--- /dev/null
+++ b/geometry/ibm.vndr/thinkpad
@@ -0,0 +1,267 @@
+// -*- indent-tabs-mode: nil -*-
+// $XFree86: xc/programs/xkbcomp/geometry/ibm/thinkpad,v 1.3 2003/08/09 14:30:48 pascal Exp $
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+// Geometry specification for IBM ThinkPad keyboard.
+// Compatible Models: THINKPAD 560Z 2640-90U, THINKPAD 560Z 2640-91U,
+//    THINKPAD 560Z 2640-B0U, THINKPAD 560Z 2640-B1U, THINKPAD 560Z 2640-RR3,
+//    THINKPAD 600 2645-31U, THINKPAD 600 2645-35U, THINKPAD 600 2645-41U,
+//    THINKPAD 600 2645-42U, THINKPAD 600 2645-45U, THINKPAD 600 2645-48U,
+//    THINKPAD 600 2645-51U, THINKPAD 600 2645-85U, THINKPAD 600 2645-A1U,
+//    THINKPAD 600 2645-RR1, THINKPAD 600 2645-RR2, THINKPAD 600E 2645-3AU,
+//    THINKPAD 600E 2645-4AU, THINKPAD 600E 2645-4BU, THINKPAD 600E 2645-55U,
+//    THINKPAD 600E 2645-5AU, THINKPAD 600E 2645-5BU, THINKPAD 600E 2645-5JU,
+//    THINKPAD 600E 2645-8AO, THINKPAD 600E 2645-8AU, THINKPAD 600E 2645-8BU,
+//    THINKPAD 600E 2645-AAU, THINKPAD 600E 2645-RRB, THINKPAD 600E 2645-RRD,
+//    THINKPAD 600E 2645-RRF, THINKPAD 600E 2645-RRS, THINKPAD A22E 2645-45U
+
+xkb_geometry "common" {
+    width = 290;
+    height = 150;
+    baseColor = "grey80";
+    labelColor = "white";
+
+    shape "FN0"  { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 10] } };
+    shape "NORM" { cornerRadius = 1, { [18, 18] }, { [2.5, 0], [15.5, 14] } };
+    shape "BKSP" { cornerRadius = 1, { [37, 18] }, { [2.5, 0], [34.5, 14] } };
+    shape "TABK" { cornerRadius = 1, { [27, 18] }, { [2.5, 0], [24.5, 14] } };
+    shape "CAPS" { cornerRadius = 1, { [31, 18] }, { [1, 0], [30, 16] },
+				                   { [1, 0], [26, 16] },
+				                   { [2.5, 0], [24.5, 14] } };
+    shape "RTSH" { cornerRadius = 1, { [50, 18] }, { [2.5, 0], [46.5, 14] } };
+    shape "MODK" { cornerRadius = 1, { [27.5, 18] }, { [2.5, 0], [25, 14] } };
+    shape "SPCE" { cornerRadius = 1, { [100, 18] }, { [2.5, 0], [97.5, 14] } };
+    shape "ARRS" { cornerRadius = 1, { [16, 13] }, { [1.5, 0], [14.5, 11] } };
+
+    shape "LED"  { cornerRadius = 2, { [3, 3] } };
+
+    shape "KEYS" { cornerRadius = 2,
+                   { [0, 0], [19, 0], [19, 13], [172, 13],
+	             [172, 0], [286, 0], [286, 138], [216, 138],
+	             [216, 124], [0, 124] } };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 2;
+	top = 5;
+	color = "black";
+    };
+
+    shape "NULL1" { cornerRadius = 1,
+                    { [0, 0], [50, 0], [50, 18], [34, 18], [34, 4],
+		      [16, 4], [16, 18], [0, 18] } };
+
+    solid "NullPanel1" {
+	shape = "NULL1";
+	left = 237;
+	top = 110;
+	color = "grey80";
+    };
+
+    shape "NULL2" { cornerRadius = 1, { [17, 13] } };
+
+    solid "NullPanel2" {
+	shape = "NULL2";
+	left = 219;
+	top = 129;
+	color = "grey80";
+    };
+
+    shape "NULL3" { cornerRadius = 1,
+                    { [0, 26],
+		      [72, 26], [72, 13], [76, 13], [76, 26],
+		      [149, 26], [149, 13], [153, 13], [153, 26],
+		      [226, 26], [226, 0], [230, 0], [230, 26],
+		      [284, 26], [285, 27],
+		      [0, 27] } };
+
+    solid "NullPanel3" {
+	shape = "NULL3";
+	left = 3;
+	top = 6;
+	color = "grey80";
+    };
+
+    indicator.onColor = "green";
+    indicator.offColor = "grey10";
+    indicator.top = 4;
+    indicator.shape = "LED";
+    indicator "HDDActivity" { onColor = "red"; left = 100; };
+    indicator "Num Lock"     { left = 108; };
+    indicator "Caps Lock"    { left = 114; };
+    indicator "Scroll Lock"  { left = 120; };
+    indicator "Power"	     { left = 128; };
+
+    key.gap = 1;
+    key.color = "grey60";
+
+    section "Function" {
+	left = 2;
+	top = 5;
+	key.shape = "FN0";
+	row {
+	    top = 1;
+	    keys {  <ESC>, { <PRSC>, 155 }, <SCLK>, <PAUS> };
+	};
+	row {
+	    top = 14;
+	    keys {  <FK01>, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 6 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 6 }, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+	left= 2;
+	top = 109;
+	key.shape = "MODK";
+	row {
+	    top = 1;
+	    keys { { <FN>, "NORM" }, <LCTL>, <LALT>,
+		   { <SPCE>, "SPCE" }, <RALT>, <RCTL>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Editing" {
+	top = 5;
+	left = 233;
+        key.shape = "FN0";
+	row {
+	    top = 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top = 14;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+    }; // End of "Editing" section
+
+    section "Navigation" {
+	top = 114;
+	left = 236;
+	key.shape = "ARRS";
+	row {
+	    top = 1;
+	    left = 17;
+	    keys { <UP> };
+	};
+	row {
+	    top = 15;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+    
+    shape "STIK" { cornerRadius = 4, { [7, 7] } };
+
+    solid "STIK" {
+	priority = 255;
+	color = "red";
+	shape = "STIK";
+	top = 85;
+	left = 126;
+    };
+};
+
+// 85 keys
+// US/English (FRU 02K4785).
+xkb_geometry "us" {
+    include "thinkpad(common)"
+    description = "IBM ThinkPad 560Z/600/600E/A22E, US";
+
+    shape "RTRN" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } };
+    shape "LFSH" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } };
+    shape "BKSL" { cornerRadius = 1, { [28, 18] }, { [2.5, 0], [25.5, 14] } };
+
+    section "Alpha" {
+	left = 2;
+	top = 33;
+	key.gap = 1;
+	key.color = "grey60";
+	key.shape = "NORM";
+	row {
+	    top = 1;
+	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, "LFSH" },
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
+
+// 86 keys
+// Tested on: DE/German, UK/English (FRU 02K4787).
+xkb_geometry "intl" {
+    include "thinkpad(common)"
+    description = "IBM ThinkPad 560Z/600/600E/A22E, Intl";
+
+    shape "RTRN" { cornerRadius = 1, { [28, 0], [28, 37], [4, 37], [4, 18],
+                                       [0, 18], [0, 0] },
+                                     { [25.5, 0], [25.5, 33], [6.5, 33],
+				       [6.5, 14], [2.5, 14], [2.5, 0] } };
+    shape "LFSH" { cornerRadius = 1, { [24, 18] }, { [2.5, 0], [21.5, 14] } };
+
+    section "Alpha" {
+	left = 2;
+	top = 33;
+	key.gap = 1;
+	key.color = "grey60";
+	key.shape = "NORM";
+	row {
+	    top = 1;
+	    keys { <AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, "LFSH" }, <AB00>,
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		   { <RTSH>, "RTSH" }
+	    };
+	};
+    }; // End of "Alpha" section
+};
diff --git a/geometry/keytronic b/geometry/keytronic
new file mode 100644
index 00000000..2e4e37a1
--- /dev/null
+++ b/geometry/keytronic
@@ -0,0 +1,255 @@
+// $Xorg: keytronic,v 1.4 2001/02/09 02:05:50 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86$
+//
+default xkb_geometry "FlexPro" {
+
+    // This is an approximate layout for a Key Tronic FlexPro
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Key Tronic FlexPro keyboard";
+
+    width= 515;
+    height= 200;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 200 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "TABK" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "BKSL" { { [ 23,18] }, { [2,1], [21,17] } };
+    shape "RTRN" {
+        approx = { [16, 0], [38,37] },
+        { [16, 0], [38, 0], [38,37], 
+	  [ 0,37], [ 0,19], [16,19] },
+        { [18, 1], [36, 1], [36,36], 
+	  [ 2,36], [ 2,20], [18,20] } };
+    shape "CAPS" { { [36,18] }, { [2,1], [34,17] } };
+    shape "SHFT" { { [46,18] }, { [2,1], [44,17] } };
+    shape "LCTL" { { [32,18] }, { [2,1], [30,17] } };
+    shape "RCTL" { { [38,18] }, { [2,1], [36,17] } };
+    shape "LALT" { { [28,18] }, { [2,1], [26,17] } };
+    shape "RALT" { { [33,18] }, { [2,1], [31,17] } };
+    shape "LSPC" { { [66,22] }, { [0,0], [66,22] } };
+    shape "RSPC" { { [76,22] }, { [0,0], [76,22] } };
+    shape "KP0"  { { [37,18] }, { [2,1], [35,17] } };
+    shape "KPEN" { { [18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { cornerRadius= 3, { [80,35] } };
+
+    outline "Edges" {
+   	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 9;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Function" {
+	top= 56;
+	row {
+	    top = 1;
+	    key.color= "grey20";
+	    keys { <FK01>, <FK02> };
+	};
+	row {
+	    top = 20;
+	    key.color= "grey20";
+	    keys { <FK03>, <FK04> };
+	};
+	row {
+	    top = 39;
+	    keys { <FK05>, <FK06> };
+	};
+	row {
+	    top = 58;
+	    key.color= "grey20";
+	    keys { <FK07>, <FK08> };
+	};
+	row {
+	    top = 77;
+	    key.color= "grey20";
+	    keys { <FK09>, <FK10> };
+	};
+	row {
+	    top = 96;
+	    keys { <FK11>, <FK12> };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 56;
+	left= 53;
+	row {
+	    top= 1;
+	    keys { 
+		{ <ESC>, color="grey20" }, { <BKSL>, "BKSL", color="grey20" }, 
+		<AE01>, <AE02>, <AE03>, <AE04>,
+		<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		<AE10>, <AE11>, <AE12>,
+		{ <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 
+		{ <TLDE>, color="grey20" },  { <TAB>, "TABK", color="grey20" },
+		<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		<AD11>, <AD12>,
+		{ <RTRN>, "RTRN", -14, color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 
+		{ <LCTL>, color="grey20" }, { <CAPS>, "CAPS", color="grey20" },
+		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 
+		{ <LFSH>, color="grey20" }, 
+		{ <LFSH>, "SHFT", color="grey20" }, 
+		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		{ <RTSH>, "SHFT", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.color= "grey20";
+	    keys { 
+		<LALT>, 
+		{ <LCTL>, shape="LCTL" }, 
+		{ <LALT>, shape="LALT" },
+		{ <SPCE>, shape="LSPC", 4, color="white" },
+		{ <SPCE>, shape="RSPC",color="white" },
+		{ <RALT>, shape="RALT", 4 }, 
+		{ <RCTL>, shape="RCTL" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 12;
+	left= 365;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 45;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 64;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 102;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 121;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+    	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 3, { [ 76, 20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
+    solid "LedPanel" {
+    	shape= "LEDS";
+	top=  11;
+	left= 430;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 13;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 440; };
+    indicator "Caps Lock"    { left= 467; };
+    indicator "Scroll Lock"  { left= 489; };
+    text.top= 22;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 438; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 465; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 487; text="Scroll\nLock"; };
+
+    logo "FlexProLogoImage" 	{ 
+	top= 12;
+	left= 45;
+	name= "KeyTronic"; 
+	shape= "LOGO"; 
+    };
+    text "KeyTronicLogoText"	{
+	top= 15;
+	left= 50;
+	width= 55;
+	text= "FlexPro";
+	font= "times";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 36;
+    };
+
+    section "Keypad" {
+	top= 56;
+	left= 430;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <LEFT> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPSU>, color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, { <KPAD>, color= "grey20" } };
+    	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+};
diff --git a/geometry/kinesis b/geometry/kinesis
new file mode 100644
index 00000000..548d0920
--- /dev/null
+++ b/geometry/kinesis
@@ -0,0 +1,193 @@
+// $Xorg: kinesis,v 1.3 2000/08/17 19:54:35 cpqbld Exp $
+//
+// $XFree86$
+//
+default xkb_geometry "model100" {
+
+    // This is an approximate layout for a Kinesis Ergonomic keyboard
+    // Generated completely by eye.  I didn't actually *measure* a real 
+    // keyboard.
+
+    description= "Kinesis Ergonomic Keyboard";
+    width= 421;
+    height= 185;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "WIDE" { { [ 21,18] }, { [2,1], [19,17] } };
+    shape "TALL" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "FKEY" { cornerRadius=0, { [ 10,13] } };
+    shape "LED"  { cornerRadius= 1.5, { [ 3,  3] } };
+    shape "LOGO" { { [ 40, 10 ] } };
+    shape "EDGE" { cornerRadius=5, { [ 421, 185 ] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section "LeftFunction" {
+	left= 15;
+	top=  11;
+	key.shape= "FKEY";
+	key.gap= 3;
+	row {
+	    left= 1;
+	    top= 1;
+	    keys { 
+	    	<ESC>,  <FK01>, <FK02>, <FK03>, <FK04>,
+		<FK05>, <FK06>, <FK07>, <FK08>
+	    };
+	};
+    }; // End of "LeftFunction" section
+
+    section "RightFunction" {
+	left= 290;
+	top=  11;
+	key.shape= "FKEY";
+	key.gap= 3;
+	row {
+	    left= 1;
+	    top= 0.2;
+	    keys {
+		<FK09>, <FK10>, <FK11>, <FK12>, <PRSC>, 
+		<SCLK>, <PAUS>, <FK16>, <FK17>
+	    };
+	};
+    }; // End of "RightFunction" section
+
+    row.vertical= True;
+    row.top= 1;
+    key.gap= 0.5;
+
+    logo "KinesisLogoImage" 	{ 
+	top= 25;
+	left= 240;
+	name= "Kinesis"; 
+	shape= "LOGO"; 
+    };
+
+    indicator.shape= "LED";
+    indicator.top= 30;
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator "Caps Lock" { left= 23; };
+
+    section "LeftAlpha" {
+	top=  34;
+	left= 15;
+	row {
+	    left= 2;
+	    key.shape= "WIDE";
+	    keys { <AE12>, <TAB>, <CAPS>, <LFSH> };
+	};
+	row {
+	    top= 4;
+	    left= 24;
+	    keys { <AE01>, <AD01>, { <AC01>, color="grey20" }, <AB01>, <TLDE> };
+	};
+	row {
+	    left= 43;
+	    keys { <AE02>, <AD02>, { <AC02>, color="grey20" }, <AB02>, <INS> };
+	};
+	row {
+	    left= 62;
+	    keys { <AE03>, <AD03>, { <AC03>, color="grey20" }, <AB03>, <LEFT> };
+	};
+	row {
+	    left= 81;
+	    keys { <AE04>, <AD04>, { <AC04>, color="grey20" }, <AB04>, <RGHT> };
+	};
+	row {
+	    left= 100;
+	    keys { <AE05>, <AD05>, <AC05>, <AB05> };
+	};
+    }; // End of "LeftAlpha" section
+
+    indicator "NumLock"  { left= 318; };
+    indicator "Overlay"  { left= 387; };
+    section "RightAlpha" {
+	top= 34;
+	left= 290;
+	row {
+	    left= 2;
+	    keys { <AE06>, <AD06>, <AC06>, <AB06> };
+	};
+	row {
+	    left= 21;
+	    keys { <AE07>, <AD07>, { <AC07>, color="grey20" }, <AB07>, <UP> };
+	};
+    	row {
+	    left= 40;
+	    keys { <AE08>, <AD08>, { <AC08>, color="grey20" }, <AB08>, <DOWN> };
+	};
+	row {
+	    left= 59;
+	    keys { <AE09>, <AD09>, { <AC09>, color="grey20" }, <AB09>, <AD11> };
+	};
+	row {
+	    top= 4;
+	    left= 78;
+	    keys { <AE10>, <AD10>, { <AC10>, color="grey20" }, <AB10>, <AD12> };
+	};
+	row {
+	    left= 97;
+	    key.shape= "WIDE";
+	    keys { <AE11>, <BKSL>, <AC11>, <RTSH> };
+	};
+	overlay "KPAD" {
+	    <AE07>=<NMLK>, <AE08>=<KPEQ>, <AE09>=<KPSL>, <AE10>=<KPMU>,
+	    <AD07>=<KP7>,  <AD08>=<KP8>,  <AD09>=<KP9>,  <AD10>=<KPSU>,
+	    <AC07>=<KP4>,  <AC08>=<KP5>, <AC09>=<KP6>,  <AC10>=<KPAD>,
+	    <AB07>=<KP1>,  <AB08>=<KP2>, <AB09>=<KP3>,  <AB10>=<KPEN>,
+	    <AE10>=<KPDL>, <AE11>=<KPEN>
+	};
+    }; // End of "RightAlpha" section
+
+    section "LeftEdit" {
+	top= 109;
+	left= 123;
+	angle= 20;
+	row.top= -18;
+	row {
+	    top=  1;
+	    left= 1;
+	    keys { { <BKSP>, "TALL" } };
+	};
+	row {
+	    left= 20;
+	    keys { <LCTL>, { <DELE>, "TALL" } };
+	};
+	row {
+	    left= 39;
+	    keys { <LALT>, <HOME>, <END> };
+	};
+    }; // End of "RightEdit" section
+
+    section "RightEdit" {
+	top= 109;
+	left= 302;
+	angle= -20;
+	row.top= -18;
+	row {
+	    left= -57;
+	    keys { <RALT>, <PGUP>, <PGDN> };
+	};
+	row {
+	    left= -38;
+	    keys { <RCTL>, { <RTRN>, "TALL" } };
+	};
+	row {
+	    top=  1;
+	    left= -19;
+	    keys { { <SPCE>, "TALL" } };
+	};
+	overlay "KPAD" {
+	    <SPCE>= <KP0>
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
diff --git a/geometry/macintosh b/geometry/macintosh
new file mode 100644
index 00000000..f97251fc
--- /dev/null
+++ b/geometry/macintosh
@@ -0,0 +1,174 @@
+// $XFree86: xc/programs/xkbcomp/geometry/macintosh,v 1.3 2003/08/09 14:30:47 pascal Exp $
+//
+// Some modifications (<eqdar@castalie.org>) :
+// - Added a <LSGT> key
+// - Fixed the shape of the <RTRN> key
+// - Moved <BKSL> to the 'AC' row
+// - Added a special Macintosh sysctl key
+// - Minor changes (Function keys shape, LED position...)
+
+default xkb_geometry "macintosh" {
+
+    description= "Apple Extended Keyboard II";
+    width = 475;
+    height = 194;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TLDE" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "BKSP" { { [ 33,18] }, { [2,1], [ 31,17] } };
+    shape "TAB"  { { [ 33,18] }, { [2,1], [ 31,17] } };
+    shape "RTRN" { 
+        { [0,0],[23,0],[23,37],[4,37],[4,18],[0,18] }, 
+        { [2,1],[21,1],[21,36],[6,36],[6,17],[2,17] } };
+    shape "CAPS" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "LCTL" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "LALT" { { [ 22,18] }, { [2,1], [ 20,17] } };
+    shape "LMTA" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "LFSH" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RCTL" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RALT" { { [ 22,18] }, { [2,1], [ 20,17] } };
+    shape "RMTA" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "RTSH" { { [ 47,18] }, { [2,1], [ 45,17] } };
+    shape "SPCE" { { [123,18] }, { [2,1], [121,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    // Macintosh keyboards have a special sysctl key at the top right
+    shape "AAPL" { 
+        { [ 0,0], [ 18,0], [ 18,18], [ 0,18] },
+        { [ 1,1], [ 17,1], [ 17,17], [ 1,17] },
+        { [ 8,5], [ 8,12], [  2,9] } };
+
+    shape "LEDS" { cornerRadius = 0, { [ 55,19] } };
+    shape "LED"  { cornerRadius = 0, { [  8, 2] } };
+
+    solid "LedPanel" {
+	shape= "LEDS";
+        top = 48;
+        left = 378;
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top = 50;
+    indicator.shape= "LED";
+    indicator "NumLock"    { left = 381; };
+    indicator "CapsLock"   { left = 398; };
+    indicator "ScrollLock" { left = 415; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"    { left = 381; text = "Num\nLock";    };
+    text "CapsLockLabel"   { left = 398; text = "Caps\nLock";   };
+    text "ScrollLockLabel" { left = 415; text = "Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Function" {
+        top = 48;
+	row {
+	    top= 1;
+            keys { <ESC>, 
+                   { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+                   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+                   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+                   { <PRSC>, 10 }, <SCLK>, <PAUS>,
+                   // This is the sysctl key on macintosh keyboards
+                   // keycode is 222 with a 4.21 kernel, which is <I5E>
+                   { <I5E>, "AAPL", 67 }
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+        top = 87;
+	row {
+	    top= 1;
+            keys { { <TLDE>, "TLDE" }, <AE01>, <AE02>, <AE03>,
+                   <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TAB" },  <AD01>, <AD02>, <AD03>,
+                   <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>,
+                   <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>,
+                   <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>,
+                   <AC10>, <AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+            keys { { <LFSH>, "LFSH" }, <LSGT>, <AB01>, <AB02>,
+                   <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>,
+                   <AB09>, <AB10>, { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" },
+                   { <LMTA>, "LMTA" },
+                   { <SPCE>, "SPCE" }, 
+                   { <RMTA>, "RMTA" },
+	           { <RALT>, "RALT" }, { <RCTL>, "RCTL" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        top = 87;
+        left = 314;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    // Begin of "Keypad" section
+    section "Keypad" {
+        top = 87;
+        left = 380;
+	row {
+	    top= 1;
+            keys { <NMLK>, <KPEQ>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" },  <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "default" geometry
diff --git a/geometry/microsoft b/geometry/microsoft
new file mode 100644
index 00000000..0894937a
--- /dev/null
+++ b/geometry/microsoft
@@ -0,0 +1,256 @@
+// $Xorg: microsoft,v 1.3 2000/08/17 19:54:35 cpqbld Exp $
+//
+// $XFree86$
+//
+default xkb_geometry "natural" {
+
+    // Approximate layout for a Microsoft Natural Keyboard
+    description= "Microsoft Natural Keyboard";
+    width= 550;
+    height= 190;
+
+    shape.cornerRadius= 1;
+    shape "LDEF" { { [ 18,18] }, { [2,1], [15,15] } };
+    shape "TABK" { { [ 26,18] }, { [2,1], [23,15] } }; 
+    shape "CAPS" { { [ 30,18] }, { [2,1], [23,15] } }; 
+    shape "LFSH" { { [ 41,18] }, { [2,1], [38,15] } };
+    shape "KEY6" { { [ 22,18] }, { [2,1], [15,15] } };
+    shape "KEYT" { { [ 33,18] }, { [2,1], [15,15] } };
+    shape "KEYG" { { [ 29,18] }, { [2,1], [15,15] } };
+    shape "LCTL" { 
+	approx= { [ 32, 22 ] },
+	{ [  0, 0], [ 32, 0 ], [ 32, 23 ], [ 0, 22 ] },
+	{ [  2, 1], [ 29, 1 ], [ 29, 17 ], [ 2, 15 ] } 
+    };
+    shape "LWIN" { 
+	approx= { [ 32, 23 ] },
+	{ [  0, 0], [ 32, 0 ], [ 32, 24 ], [ 0, 23 ] },
+	{ [  2, 1], [ 29, 1 ], [ 29, 18 ], [ 2, 17 ] } 
+    };
+    shape "LALT" { 
+	approx= { [ 32, 24 ] },
+	{ [  0, 0], [ 32, 0 ], [ 32, 25 ], [ 0, 24 ] },
+	{ [  2, 1], [ 29, 1 ], [ 29, 20 ], [ 2, 19 ] } 
+    };
+    shape "RDEF" { { [ 18,18] }, { [3,1], [15,15] } };
+    shape "KEY7" {	{ [ 28, 18 ] }, { [ 14, 1], [26, 15] } };
+    shape "KEYH" {	{ [ 24, 18 ] }, { [ 10, 1], [22, 15] } };
+    shape "KEYN" {	{ [ 32, 18 ] }, { [ 18, 1], [30, 15] } };
+    shape "BKSP" {	{ [ 41, 18 ] }, { [  3, 1], [39, 15] } };
+    shape "BKSL" {	{ [ 24, 18 ] }, { [  3, 1], [22, 15] } };
+    shape "RTRN" {	{ [ 37, 18 ] }, { [  3, 1], [35, 15] } };
+    shape "RTSH" {	{ [ 43, 18 ] }, { [  3, 1], [41, 15] } };
+    shape "RALT" { 
+	approx= { [ 27, 24 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 24 ], [ 0, 25 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 19 ], [ 3, 20 ] } 
+    };
+    shape "RWIN" { 
+	approx= { [ 27, 23 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 23 ], [ 0, 24 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 18 ], [ 3, 19 ] } 
+    };
+    shape "MENU" { 
+	approx= { [ 27, 21 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 21 ], [ 0, 23 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 16 ], [ 3, 17 ] } 
+    };
+    shape "RCTL" { 
+	approx= { [ 27, 19 ] },
+	{ [  0, 0], [ 27, 0 ], [ 27, 19 ], [ 0, 21 ] },
+	{ [  3, 1], [ 25, 1 ], [ 25, 14 ], [ 3, 15 ] } 
+    };
+    shape "KPAD" { { [ 18, 37 ] },	{ [ 3, 1 ], [ 16, 34 ] } };
+    shape "KP0"  { { [ 37, 18 ] },	{ [ 3, 1 ], [ 35, 15 ] } };
+    shape "SPCE" {
+	{ [  4, 3], [42,10], [44, 0], [88, 0], [90,10], [130, 3], 
+	  [134,26], [99,30], [67,33], [33,30], [  0,26] },
+	{ [  6, 4.5], [43,11], [45, 1], [87, 1], [89,11], [128, 4.5], 
+	  [131,23], [99,28], [67,32], [33,28], [  3,23] }
+    };
+
+    shape "EDGE" {
+	cornerRadius= 2,
+	{ [  25,   0 ],  [ 177,  17 ],  [ 329,   0 ], [ 542,   0 ],
+	  [ 542, 150 ],  [ 354, 150 ],  [ 177, 185 ], [   0, 150 ] }
+    };
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    row.left= 1;
+    key.shape= "LDEF";
+    key.gap=  1;
+    section "LeftFunction" {
+	top= 10;
+	left= 40;
+	angle= 10;
+	row {
+	    top= 1;
+	    keys {  <ESC>, { <FK01>, 12 }, <FK02>, <FK03>, <FK04>, <FK05> };
+	};
+    }; // End of "LeftFunction" section
+
+    section "LeftAlpha" {
+	top= 47;
+	left= 30;
+	angle= 10;
+	row {
+	    top= 1;
+	    keys {	<AE00>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, { <AE06>, "KEY6" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {	{ <TAB>, "TABK" },
+			<AD01>, <AD02>, <AD03>, <AD04>, { <AD05>, "KEYT" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS" },
+			<AC01>, <AC02>, <AC03>, <AC04>, { <AC05>, "KEYG" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH" }, 
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys {  { <LCTL>, "LCTL" }, { <LWIN>, "LWIN" }, { <LALT>, "LALT" } };
+	};
+    }; // End of "LeftAlpha" section
+
+    key.shape= "RDEF";
+    section "RightFunction" {
+	top= 32;
+	left= 195;
+	angle= -10;
+	row {
+	    top= 1;
+	    left= 1;
+	    keys {  <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12> };
+	};
+    }; // End of "RightFunction" section
+
+    section "RightAlpha" {
+	top= 71;
+	left= 190;
+	angle= -10;
+	row.left= 1;
+	row {
+	    top= 1;
+	    keys {	{ <AE07>, "KEY7" },
+			<AE08>, <AE09>, <AE10>, <AE11>, <AE12>, 
+			{ <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 
+		<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
+		{ <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys {	{ <AC06>, "KEYH" },
+			<AC07>, <AC08>, <AC09>, <AC10>, <AC11>,
+			{ <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <AB06>, "KEYN" },
+			<AB07>, <AB08>, <AB09>, <AB10>,
+			{ <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    left= 40;
+	    keys { 	{ <RALT>, "RALT" }, { <RWIN>, "RWIN" }, 
+			{ <MENU>, "MENU" }, { <RCTL>, "RCTL" }
+	    };
+	};
+    }; // End of "RightAlpha" section
+
+    section "SpaceBar" {
+	top= 139;
+	left= 111;
+	key.shape= "SPCE";
+	row { keys { <SPCE> }; };
+    };
+
+    section "Editing" {
+	top= 15;
+	left= 385;
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+    	};
+	row {
+	    top= 109;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LED"  { 
+	cornerRadius= 0,
+	{ [  3,  1 ] }
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.left= 177;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { top= 90; };
+    indicator "Caps Lock"    { top= 107; };
+    indicator "Scroll Lock"  { top= 127; };
+    
+    section "Keypad" {
+	top= 47;
+	left= 456;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
diff --git a/geometry/nec b/geometry/nec
new file mode 100644
index 00000000..189d9ca7
--- /dev/null
+++ b/geometry/nec
@@ -0,0 +1,159 @@
+// $Xorg: nec,v 1.4 2001/02/09 02:05:50 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/geometry/nec,v 3.4 2001/01/17 23:45:49 dawes Exp $
+
+default xkb_geometry "pc98" {
+
+    description= "Generic PC98";
+    width= 405;
+    height= 172;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 17,18] }, { [2,1], [ 15,17] } };
+    shape "RTRN" { { [ 20,37] }, { [2,1], [ 18,35] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [115,18] }, { [2,1], [113,17] } };
+    shape "FUNC" { { [ 21,18] }, { [2,1], [ 19,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "TABK" { { [ 30,18] }, { [2,1], [ 28,17] } };
+    shape "ARRW" { { [ 35,18] }, { [2,1], [ 33,17] } };
+
+    section.left= 8;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 29;
+	row {
+	    top= 1;
+	    key.shape="FUNC";
+	    keys {  { <BRK>, "NORM" }, { <PRSC>, "NORM", 5 },
+		    { <FK01>, 6 }, <FK02>, <FK03>, <FK04>, <FK05>, 
+		    { <FK06>, 6 }, <FK07>, <FK08>, <FK09>, <FK10>, 
+		    { <FK11>, 6 }, <FK12>, <FK13>, <FK14>, <FK15>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 54;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="BKSP"}, 
+		   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, <BKSL>,
+		   { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", 6 }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <LCTL>, <CAPS>,
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { { <ALGR>, 35 } , <LALT>, { <NFER>, "FUNC" },
+		   { <SPCE>, "SPCE" }, { <XFER>, "FUNC" }
+		   
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 54;
+	left= 281;
+	row {
+	    top= 1;
+	    keys { <INS>, <DELE> };
+	};
+        row {
+	    top= 20;
+	    keys { <PGDN>, <PGUP> };
+	};
+	row {
+	    top= 39;
+	    keys { { <UP>, "ARRW" } };
+	};
+	row {
+	    top= 58;
+	    keys { <LEFT>, <RGHT> };
+	};
+	row {
+	    top= 77;
+	    keys { { <DOWN>, "ARRW" } };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 54;
+	left= 320;
+	row {
+	    top= 1;
+	    keys { <HOME>, <HELP>, <KPSU>, <KPDV> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPMU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, <KPEQ> };
+	};
+	row {
+	    top= 77;
+	    keys { <KP0>, <KPSP>, <KPDC>, <KPEN> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "pc98" geometry
diff --git a/geometry/northgate b/geometry/northgate
new file mode 100644
index 00000000..fd376cee
--- /dev/null
+++ b/geometry/northgate
@@ -0,0 +1,172 @@
+// $Xorg: northgate,v 1.3 2000/08/17 19:54:36 cpqbld Exp $
+//
+// $XFree86$
+//
+default xkb_geometry "omnikey101" {
+
+    description= "North Gate Omnikey 101";
+    width= 470;
+    height= 175;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [34,18] }, { [2,1], [32,17] } };
+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+	approx = { [15, 0], [40,37] },
+	{ [15, 0], [40, 0], [40,37],
+	  [ 0,37], [ 0,19], [15,19] },
+	{ [17, 1], [38, 1], [38,36],
+	  [ 2,36], [ 2,20], [17,20] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
+    shape "RTSH" { { [ 30,18] }, { [2,1], [28,17] } };
+    shape "MODK" { { [ 26,18] }, { [2,1], [24,17] } };
+    shape "SPCE" { { [129,18] }, { [2,1], [127,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  32;
+	left= 375;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 46.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 384; };
+    indicator "Caps Lock"    { left= 409; };
+    indicator "Scroll Lock"  { left= 434; };
+    text.top= 34;
+    text.color= "black";
+    text "NumLockLabel"	{ left= 380.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 32;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18}, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 9 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 9 }, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 65;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		   { <RTRN>, "RTRN", -14, color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }, <BKSL>
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LALT>,
+		   { <LCTL>, 23 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RCTL>,
+		    { <RALT>, 23 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 32;
+	left= 308;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 65;
+	left= 374;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
diff --git a/geometry/pc b/geometry/pc
new file mode 100644
index 00000000..8a538719
--- /dev/null
+++ b/geometry/pc
@@ -0,0 +1,1159 @@
+// $Xorg: pc,v 1.4 2001/02/09 02:05:50 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/geometry/pc,v 3.14 2003/08/09 14:30:47 pascal Exp $
+
+default xkb_geometry "pc101" {
+
+    description= "Generic 101";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 21 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 21 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "default" geometry
+
+xkb_geometry "pc102" {
+
+    description= "Generic 102";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" {
+        { [16,0],[ 43,0],[43,37],[2,37],[2,19],[16,19] }, 
+        { [18,1],[ 41,1],[41,36],[4,36],[4,20],[18,20] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 25,18] }, { [2,1], [ 23,16] } };
+    shape "RTSH" { { [ 49,18] }, { [2,1], [ 47,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SPCE" { { [134,18] }, { [2,1], [132,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, "TABK", color="grey20" },
+		    { <FK01>, 10 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>, <BKSL>, 
+		   { <BKSP>, color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, -15, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "pc102" geometry
+
+xkb_geometry "pc104" {
+
+    description= "Generic 104";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
+    shape "SPCE" { { [113,18] }, { [2,1], [111,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "SMOD";
+	    key.color= "grey20";
+	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "pc104" geometry
+
+xkb_geometry "pc105" {
+
+    description= "Generic 105";
+    width= 470;
+    height= 210;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } };
+    shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 25,18] }, { [2,1], [ 23,16] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
+    shape "SPCE" { { [113,18] }, { [2,1], [111,16] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,16] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  52;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 67;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 55;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 52;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 91;
+	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "SMOD";
+	    key.color= "grey20";
+	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 91;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 91;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "pc105" geometry
+
+
+// Added for japanese 106 keyboard
+//                     by tsuka@kawalab.dnj.ynu.ac.jp .
+xkb_geometry "jp106" {
+
+    description= "Japanese 106";
+    width= 470;
+    height= 180;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" {
+        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 375;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 379; };
+    indicator "Caps Lock"    { left= 404; };
+    indicator "Scroll Lock"  { left= 429; };
+    text.top= 28;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
+		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
+                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
+	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		    <AE13>, { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 310;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 375;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "jp106" geometry
+
+// Added for brazilian ABNT2 by Ricardo Y. Igarashi(iga@that.com.br)
+xkb_geometry "abnt2" {
+
+    description= "Brazilian ABNT2";
+    width= 470;
+    height= 180;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" {
+        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 24,18] }, { [2,1], [ 22,17] } };
+    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [133,18] }, { [2,1], [131,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 375;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 379; };
+    indicator "Caps Lock"    { left= 404; };
+    indicator "Scroll Lock"  { left= 429; };
+    text.top= 28;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 378; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 403; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 428; text="Scroll\nLock"; };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
+		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
+                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
+	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		    { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" }, <BKSL>,
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, { <RCTL>, 17 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 310;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 375;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "abnt2" geometry
+
+
+// Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
+
+xkb_geometry "pc86" {
+    description = "Noname keyboard with 86 keys, DE";
+    width = 287;
+    height = 143;
+    baseColor = "grey20";
+
+    shape "EDGE" { cornerRadius = 2, { [287, 143] } };
+    shape "LED"  { cornerRadius = 2, { [3, 3] } };
+    shape "LEDS" { cornerRadius = 0, { [75, 5] } };
+    shape "KEYS" { cornerRadius = 0, { [271, 109] } };
+
+    outline "Edges" {
+        top = 0;
+        left = 0;
+        shape = "EDGE";
+        color = "black";
+    };
+
+    solid "KeyPanel" {
+	shape = "KEYS";
+	left = 8;
+	top = 22;
+	color = "grey70";
+    };
+
+    solid "LedPanel" {
+	shape = "LEDS";
+	left = 212;
+	top = 10;
+	color = "black";
+    };
+
+    indicator.onColor = "green";
+    indicator.offColor = "green30";
+    indicator.top = 11;
+    indicator.shape = "LED";
+    indicator "Num Lock"     { left = 212 + 7; };
+    indicator "Caps Lock"    { left = 212 + 23; };
+    indicator "Scroll Lock"  { left = 212 + 39; };
+    text.fontSize = 6;
+    text.top = 10;
+    text.color = "white";
+    text "NumLockLabel"     { left = 212 + 7 + 5; text = "Num\nLock"; };
+    text "CapsLockLabel"    { left = 212 + 23 + 5; text = "Caps\nLock"; };
+    text "ScrollLockLabel"  { left = 212 + 39 + 5; text = "Scroll\nLock"; };
+
+    shape.cornerRadius = 1;
+    shape "SMALL"  { { [15, 12] }, { [1.5, 0], [13.5, 10] } };
+    shape "NARR"   { { [13, 18] }, { [1.5, 0], [11.5, 14] } };
+    shape "NORM"   { { [18, 18] }, { [3, 0], [15, 14] } };
+    shape "NORM_1" { { [22, 18] }, { [4, 0], [22, 18] },
+                                   { [7, 0], [19, 14] } };
+    shape "WIDER"  { { [23, 18] }, { [3, 0], [20, 14] } };
+    shape "WIDEST" { { [27, 18] }, { [3, 0], [24, 14] } };
+    shape "SPCE"   { { [75, 18] }, { [3, 0], [72, 14] } };
+
+    section "Function" {
+	key.shape = "SMALL";
+	key.gap = 0.99;
+	key.color = "grey30";
+	left = 8;
+	top = 22;
+	row {
+	    top = 1;
+	    keys {  <ESC>,
+	    	    <FK01>, <FK02>, <FK03>, <FK04>,
+		    <FK05>, <FK06>, <FK07>, <FK08>,
+		    <FK09>, <FK10>, <FK11>, <FK12>,
+		    <NMLK>, <PRSC>, <SCLK>, <PAUS>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Control" {
+	key.shape = "NORM";
+	key.gap = 1;
+	key.color = "grey30";
+        left = 8;
+	top = 111;
+	row {
+	    top = 1;
+	    keys { <LCTL>, <FN>, <LALT>,
+	           { <SPCE>, shape="SPCE", 39 }, <RALT>,
+		   <INS>, <DELE>
+	    };
+	};
+    }; // End of "Control" section
+
+    section "Editing" {
+        key.shape = "NARR";
+	key.gap = 1;
+	key.color = "grey30";
+	left = 265;
+	top = 34;
+        row.vertical = True;
+	row {
+	    top = 1;
+	    keys { <HOME>, <PGUP>, <PGDN>, <END> };
+	};
+    }; // End of "Editing" section
+
+    section "Navigation" {
+	key.gap = 1;
+	key.shape = "NARR";
+	key.color = "grey30";
+	left = 236;
+	top = 92;
+	row {
+	    left = 14;
+	    top = 1;
+	    keys { <UP> };
+	};
+	row {
+	    top = 20;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Navigation" section
+
+    section "Alpha" {
+	key.gap = 1;
+	key.shape = "NORM";
+	key.color = "grey10";
+        left = 8;
+	top = 35;
+	row {
+	    top = 1;
+	    keys { { <AE01>, shape="NORM_1" }, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+                   { <BKSP>, shape="WIDER", color="grey30" }
+	    };
+	};
+	row {
+	    top = 20;
+	    keys { { <TAB>, shape="NARR", color="grey30" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <AD13>, shape="NARR" }
+	    };
+	};
+	row {
+	    top = 39;
+	    keys { { <CAPS>, color="grey30" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, { <RTRN>, shape="WIDEST", color="grey30" }
+	    };
+	};
+	row {
+	    top = 58;
+	    keys { { <LFSH>, shape="WIDEST", color="grey30" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+		    { <RTSH>, shape="WIDER", color="grey30" }
+	    };
+	};
+	row {
+            left = 57;
+	    top = 77;
+	    keys { <AE00>, <LSGT> };
+	};
+    }; // End of "Alpha" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+}; // End of "pc86" geometry
diff --git a/geometry/sgi.vndr/.cvsignore b/geometry/sgi.vndr/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/geometry/sgi.vndr/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/geometry/sgi.vndr/Makefile.am b/geometry/sgi.vndr/Makefile.am
new file mode 100644
index 00000000..c72d1c2b
--- /dev/null
+++ b/geometry/sgi.vndr/Makefile.am
@@ -0,0 +1,6 @@
+geom_DATA = \
+indigo  indy  O2
+
+EXTRA_DIST= $(geom_DATA)
+                                                                                          
+geomdir = $(xkb_base)/geometry/sgi.vndr
diff --git a/geometry/sgi.vndr/O2 b/geometry/sgi.vndr/O2
new file mode 100644
index 00000000..52ba1a63
--- /dev/null
+++ b/geometry/sgi.vndr/O2
@@ -0,0 +1,618 @@
+// $Xorg: O2,v 1.3 2000/08/17 19:54:36 cpqbld Exp $
+//
+// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+//
+// Permission to use, copy, modify, and distribute this
+// software and its documentation for any purpose and without
+// fee is hereby granted, 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 Silicon Graphics not be 
+// used in advertising or publicity pertaining to distribution 
+// of the software without specific prior written permission.
+// Silicon Graphics makes no representation about the suitability 
+// of this software for any purpose. It is provided "as is"
+// without any express or implied warranty.
+// 
+// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+// GRAPHICS 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.
+//
+// $XFree86$
+//
+default xkb_geometry "pc101" {
+
+    // This is an approximate layout for a 101-key (US/ASCII) SGI
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "101-key keyboard for Silicon Graphics O2";
+
+    width= 448;
+    height= 162;
+
+    shape "EDGE" { 
+	cornerRadius= 2, 
+	{ [ 15,    0 ], [ 433,   0 ], [ 433, 10 ], [ 448, 10 ],
+	  [ 448, 162 ], [   0, 162 ], [   0, 10 ], [ 15,  10 ] }
+    };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
+    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
+    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
+    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 12,12] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 6;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {	{ <ESC>, color="grey20" },
+			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 58;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <BKSL>, "BKSL" }
+	    };	
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
+	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
+	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,	{ <LALT>, 20 },
+			{ <SPCE>, "SPCE",color="white" },
+			<RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 25;
+	left= 299;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  3, 1.5] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 364;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 372; };
+    indicator "Caps Lock"    { left= 397; };
+    indicator "Scro llLock"  { left= 422; };
+
+    text.font= "helvetica";
+    text.weight= "bold";
+    text.slant= "r";
+    text.fontWidth= "normal";
+    text.fontSize= 12;
+    text.top= 39.5;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 376.5; text="1"; };
+    text "CapsLockLabel"	{ left= 401.5; text="A"; };
+    text "ScrollLockLabel"	{ left= 426.5; text="S"; };
+    
+    logo "SGILogoImage" 	{ 
+	top= 26.5;
+	left= 396;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text.font= "helvetica";
+    text.weight= "bold";
+    text.slant= "o";
+    text.fontWidth= "narrow";
+    text.fontSize= 18;
+    text "SiliconLogoText"	{
+	top= 27;
+	left= 375;
+	width= 20;
+	text= "Silicon";
+    };
+    text "GraphicsLogoText"	{
+	top= 27;
+	left= 409;
+	width= 20;
+	text= "Graphics";
+    };
+
+    section "Keypad" {
+	top= 58;
+	left= 363;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+    	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+
+xkb_geometry "pc102" {
+
+    // This is an approximate layout for 102-key SGI international
+    // keyboards.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 102-key Keyboard";
+    width= 470;
+    height= 193;
+
+    shape.cornerRadius= 1;
+    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+	approx = { [ 0, 0], [26,37] },
+	{ [ 0, 0], [26, 0], [26,37],
+	  [ 5,37], [ 5,18], [ 0,18] },
+	{ [ 1, 1], [24, 1], [24,36],
+	  [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
+    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
+    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {  	{ <ESC>, color="grey20" },
+			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <RTRN>, "RTRN", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
+			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,
+			{ <LALT>, 19 },
+			{ <SPCE>, "SPCE", color="white" },
+			<RALT>,
+			{ <RCTL>, 19 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 308;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 375;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 384; };
+    indicator "Caps Lock"    { left= 409; };
+    indicator "Scroll Lock"  { left= 434; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 380.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
+
+    logo "SGILogoImage" { 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	setWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 374;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+
+xkb_geometry "jp106" {
+    description= "Silicon Graphics 106-key Japanese keyboard";
+    width= 442;
+    height= 167;
+
+    shape "EDGE" { cornerRadius= 2, { [ 442, 167 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" {
+        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    logo "SGILogoImage" { 
+	top= 5;
+	left= 6;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+
+    text "SGILogoText"	{
+	top= 9;
+	left= 25;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 24;
+    };
+
+    shape "LEDS" { cornerRadius= 0.1, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 362;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 366; };
+    indicator "Caps Lock"    { left= 391; };
+    indicator "Scroll Lock"  { left= 416; };
+    text.top= 28;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 366; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 391; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 416; text="Scroll\nLock"; };
+
+    section.left= 5;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
+		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
+                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
+	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		    <AE13>, { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 296;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 361;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "jp106" geometry
+
diff --git a/geometry/sgi.vndr/indigo b/geometry/sgi.vndr/indigo
new file mode 100644
index 00000000..f7b7a686
--- /dev/null
+++ b/geometry/sgi.vndr/indigo
@@ -0,0 +1,413 @@
+// $Xorg: indigo,v 1.3 2000/08/17 19:54:37 cpqbld Exp $
+//
+// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+//
+// Permission to use, copy, modify, and distribute this
+// software and its documentation for any purpose and without
+// fee is hereby granted, 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 Silicon Graphics not be 
+// used in advertising or publicity pertaining to distribution 
+// of the software without specific prior written permission.
+// Silicon Graphics makes no representation about the suitability 
+// of this software for any purpose. It is provided "as is"
+// without any express or implied warranty.
+// 
+// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+// GRAPHICS 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.
+//
+// $XFree86$
+//
+default xkb_geometry "pc101" {
+
+    // This is an approximate layout for a 101-key (US/ASCII) SGI
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 101-key keyboard";
+
+    width= 472;
+    height= 193;
+
+    shape "EDGE" { cornerRadius= 2, { [ 472, 193 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
+    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
+    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
+    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {	{ <ESC>, color="grey20" },
+			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <BKSL>, "BKSL" }
+	    };	
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
+	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
+	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,	{ <LALT>, 20 },
+			{ <SPCE>, "SPCE",color="white" },
+			<RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 377;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 386; };
+    indicator "Caps Lock"    { left= 411; };
+    indicator "Scroll Lock"  { left= 436; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 382.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 407; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 432; text="Scroll\nLock"; };
+    
+    logo "SGILogoImage" 	{ 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+    	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+xkb_geometry "pc102" {
+
+    // This is an approximate layout for 102-key SGI international
+    // keyboards.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 102-key Keyboard";
+    width= 470;
+    height= 193;
+
+    shape.cornerRadius= 1;
+    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+	approx = { [ 0, 0], [26,37] },
+	{ [ 0, 0], [26, 0], [26,37],
+	  [ 5,37], [ 5,18], [ 0,18] },
+	{ [ 1, 1], [24, 1], [24,36],
+	  [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
+    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
+    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {  	{ <ESC>, color="grey20" },
+			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <RTRN>, "RTRN", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
+			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,
+			{ <LALT>, 19 },
+			{ <SPCE>, "SPCE", color="white" },
+			<RALT>,
+			{ <RCTL>, 19 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 308;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 375;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 384; };
+    indicator "Caps Lock"    { left= 409; };
+    indicator "Scroll Lock"  { left= 434; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 380.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
+
+    logo "SGILogoImage" { 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	setWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 374;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
diff --git a/geometry/sgi.vndr/indy b/geometry/sgi.vndr/indy
new file mode 100644
index 00000000..fc5d485a
--- /dev/null
+++ b/geometry/sgi.vndr/indy
@@ -0,0 +1,601 @@
+// $Xorg: indy,v 1.3 2000/08/17 19:54:37 cpqbld Exp $
+//
+// Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+//
+// Permission to use, copy, modify, and distribute this
+// software and its documentation for any purpose and without
+// fee is hereby granted, 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 Silicon Graphics not be 
+// used in advertising or publicity pertaining to distribution 
+// of the software without specific prior written permission.
+// Silicon Graphics makes no representation about the suitability 
+// of this software for any purpose. It is provided "as is"
+// without any express or implied warranty.
+// 
+// SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+// SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+// AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+// GRAPHICS 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.
+//
+// $XFree86$
+//
+default xkb_geometry "pc101" {
+
+    // This is an approximate layout for a 101-key (US/ASCII) SGI
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 101-key keyboard";
+
+    width= 472;
+    height= 193;
+
+    shape "EDGE" { cornerRadius= 2, { [ 472, 193 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 40,18] }, { [2,1], [37,17] } };
+    shape "CAPS" { { [ 34,18] }, { [2,1], [29,17] } };
+    shape "RTSH" { { [ 49,18] }, { [2,1], [47,17] } };
+    shape "LFSH" { { [ 44,18] }, { [2,1], [42,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {	{ <ESC>, color="grey20" },
+			{ <FK01>, 19}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 11}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 11}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys {	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <BKSL>, "BKSL" }
+	    };	
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color="grey20" },
+	 		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, { <RTRN>, "RTRN", color="grey20" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys {	{ <LFSH>, "LFSH", color="grey20" }, 
+	 		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,	{ <LALT>, 20 },
+			{ <SPCE>, "SPCE",color="white" },
+			<RALT>, { <RCTL>, 20 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 377;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 386; };
+    indicator "Caps Lock"    { left= 411; };
+    indicator "Scroll Lock"  { left= 436; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 382.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 407; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 432; text="Scroll\nLock"; };
+    
+    logo "SGILogoImage" 	{ 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 376;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+    	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+
+xkb_geometry "pc102" {
+
+    // This is an approximate layout for 102-key SGI international
+    // keyboards.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes of a few keys by eye.  I didn't actually
+    // *measure* a real keyboard.
+
+    description= "Silicon Graphics 102-key Keyboard";
+    width= 470;
+    height= 193;
+
+    shape.cornerRadius= 1;
+    shape "EDGE" { cornerRadius=2, { [ 470, 193 ] } };
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [35,18] }, { [2,1], [33,17] } };
+    shape "TABK" { { [27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" {
+	approx = { [ 0, 0], [26,37] },
+	{ [ 0, 0], [26, 0], [26,37],
+	  [ 5,37], [ 5,18], [ 0,18] },
+	{ [ 1, 1], [24, 1], [24,36],
+	  [ 7,36], [ 7,17], [ 1,17] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [25,17] } };
+    shape "RTSH" { { [ 50,18] }, { [2,1], [48,17] } };
+    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [130,18] }, { [2,1], [128,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 19;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 50;
+	row {
+	    top= 1;
+	    keys {  	{ <ESC>, color="grey20" },
+			{ <FK01>, 18}, <FK02>, <FK03>, <FK04>,
+			{ <FK05>, 10}, <FK06>, <FK07>, <FK08>,
+			{ <FK09>, 10}, <FK10>, <FK11>, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 83;
+	row {
+	    top= 1;
+	    keys { 	<TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			<AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			<AE10>, <AE11>, <AE12>,
+			{ <BKSP>, "BKSP", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { 	{ <TAB>, "TABK", color= "grey20" },
+			<AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			<AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			<AD11>, <AD12>,
+			{ <RTRN>, "RTRN", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { 	{ <CAPS>, "CAPS", color= "grey20" },
+			<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			<AC11>, <BKSL>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { 	{ <LFSH>, "LFSH", color= "grey20" }, <LSGT>,
+			<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+			{ <RTSH>, "RTSH", color= "grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys {	<LCTL>,
+			{ <LALT>, 19 },
+			{ <SPCE>, "SPCE", color="white" },
+			<RALT>,
+			{ <RCTL>, 19 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 50;
+	left= 308;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <PRSC>, <SCLK>, <PAUS> };
+	};
+	row {
+	    top= 33;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 53;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 91;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 110;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  1,  3 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  50;
+	left= 375;
+	color= "grey10";
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 64.5;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 384; };
+    indicator "Caps Lock"    { left= 409; };
+    indicator "Scroll Lock"  { left= 434; };
+    text.top= 52;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 380.5; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 405; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 430; text="Scroll\nLock"; };
+
+    logo "SGILogoImage" { 
+	top= 17;
+	left= 22;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+    text "SGILogoText"	{
+	top= 21;
+	left= 40;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	setWidth= "narrow";
+	fontSize= 24;
+    };
+
+    section "Keypad" {
+	top= 83;
+	left= 374;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+};
+
+xkb_geometry "jp106" {
+    description= "Silicon Graphics 106-key Japanese keyboard";
+    width= 442;
+    height= 167;
+
+    shape "EDGE" { cornerRadius= 2, { [ 442, 167 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "TABK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [ 25,17] } };
+    shape "RTRN" {
+        { [0,0],[ 27,0],[27,37],[4,37],[4,18],[0,18] } ,
+        { [2,1],[ 25,1],[25,36],[5,36],[5,17],[2,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,17] } };
+    shape "RTSH" { { [ 32,18] }, { [2,1], [ 30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "SPCE" { { [ 46,18] }, { [2,1], [ 44,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,36] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    logo "SGILogoImage" { 
+	top= 5;
+	left= 6;
+	name= "SGI"; 
+	shape= "LOGO"; 
+    };
+
+    text "SGILogoText"	{
+	top= 9;
+	left= 25;
+	width= 50;
+	text= "SiliconGraphics";
+	font= "helvetica";
+	slant= "o";
+	weight= "bold";
+	fontWidth= "narrow";
+	fontSize= 24;
+    };
+
+    shape "LEDS" { cornerRadius= 0.1, { [ 76 ,20 ] } };
+    shape "LED"  { cornerRadius= 0, { [  5,  1 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  25;
+	left= 362;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 40;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 366; };
+    indicator "Caps Lock"    { left= 391; };
+    indicator "Scroll Lock"  { left= 416; };
+    text.top= 28;
+    text.color= "black";
+    text "NumLockLabel"		{ left= 366; text="Num\nLock"; };
+    text "CapsLockLabel"	{ left= 391; text="Caps\nLock"; };
+    text "ScrollLockLabel"	{ left= 416; text="Scroll\nLock"; };
+
+    section.left= 5;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 25;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 18 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 ,color="grey20"}, {<FK06>,color="grey20"}, 
+		    { <FK07>, color="grey20"}, {<FK08>,color="grey20"},
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS> 
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { {<HZTG>,color="grey20"}, <AE01>, <AE02>, 
+                    <AE03>, <AE04>, <AE05>, <AE06>, <AE07>, 
+	            <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		    <AE13>, { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, 1 ,"RTRN",color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <CAPS>, "CAPS", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    <AB11>, { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LCTL>, { <LALT>, 20 },<NFER>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <XFER>,<HKTG>,<RALT>, { <RCTL>, 17 }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 296;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 361;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+}; // End of "jp106" geometry
diff --git a/geometry/sony b/geometry/sony
new file mode 100644
index 00000000..4e69f0e9
--- /dev/null
+++ b/geometry/sony
@@ -0,0 +1,180 @@
+// $Xorg: sony,v 1.4 2001/02/09 02:05:51 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+default xkb_geometry "nwp5461" {
+
+    description= "Sony NEWS NWS-5000 Keyboard";
+    width= 425;
+    height= 190;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [28,18] }, { [2,1], [26,17] } };
+    shape "TABK" { { [28,18] }, { [2,1], [26,17] } };
+    shape "BKSL" { { [28,18] }, { [2,1], [26,17] } };
+    shape "RTRN" {
+        approx = { [15, 0], [33,37] },
+        { [15, 0], [33, 0], [33,37],
+          [ 0,37], [ 0,19], [15,19] },
+        { [17, 1], [31, 1], [31,36],
+          [ 2,36], [ 2,20], [17,20] }
+    };
+    shape "SHFT" { { [42,18] }, { [2,1], [40,17] } };
+    shape "MODK" { { [33,18] }, { [2,1], [31,17] } };
+    shape "SPCE" { { [85,18] }, { [2,1], [83,17] } };
+    shape "KPEN" { { [18,38] }, { [2,1], [16,37] } };
+    shape "STOP" { { [28,18] }, { [2,1], [26,17] } };
+    shape "CUT"  { { [55,18] }, { [2,1], [53,17] } };
+    shape "EXEC" { { [32,18] }, { [2,1], [30,17] } };
+    shape "UNK"  { { [18,18] }, { [2,1], [16,17] } };
+    shape "CAPS" { { [18,18] }, { [2,1], [16,17] } };
+    shape "FKEY" { { [23,18] }, { [2,1], [21,17] } };
+
+    section.left= 13;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 55;
+	row {
+	    top= 1;
+	    left= 37;
+	    key.shape="FKEY";
+	    keys {    <FK01>, <FK02>, <FK03>, <FK04>, <FK05>, 
+		    { <FK06>, 5 }, <FK07>, <FK08>, <FK09>, <FK10>, 
+		    { <FK11>, 5 }, <FK12>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 80;
+	row {
+	    top= 1;
+	    keys { { <ESC>, color="grey20" } , 
+		   <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, 
+		   <AE09>, <AE10>, <AE11>, <AE12>, 
+		   <BKSL>, { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <DELE>, color="grey20" }, 
+		   { <RTRN>, "RTRN", -14, color="grey20" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "MODK", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <TLDE>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "SHFT", color="grey20" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11>,
+		    { <RTSH>, "SHFT", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    key.color= "grey20";
+	    keys { <LALT>, { <CAPS>, "CAPS" },
+		   { <STOP>, "STOP", color="white" },
+		   { <SPCE>, "SPCE", color="white" },
+		   { <CUT>, "CUT", color="white" },
+		   { <UNK0>, "UNK" }, { <UNK1>, "UNK" }, 
+		   { <EXEC>, "EXEC" }
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 80;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <HELP> };
+	};
+        row {
+	    top= 20;
+	    keys { <INS> };
+	};
+        row {
+	    top= 39;
+	    keys { <CLR> };
+	};
+	row {
+	    top= 58;
+	    keys { <PGUP> };
+	};
+	row {
+	    top= 77;
+	    keys { <PGDN> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 334;
+	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { { <KPMU>, 19 }, <KPDV>, <KPAD> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPSU>, color="grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, { <KPSP>, color="grey20" } };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { <KP0>, { <KPDC>, color="grey20" }, <UP> };
+	};
+	row {
+	    top= 96;
+	    key.color= "grey20";
+	    keys { <KPTB>, <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Keypad" section
+
+}; // End of "default" geometry
diff --git a/geometry/sun b/geometry/sun
new file mode 100644
index 00000000..1b8117a8
--- /dev/null
+++ b/geometry/sun
@@ -0,0 +1,1338 @@
+// $Xorg: sun,v 1.4 2001/02/09 02:05:51 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/geometry/sun,v 1.6 2001/12/14 20:01:58 dawes Exp $
+//
+xkb_geometry "type4" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type4 US
+    // keyboard.  
+
+    description= "Sun Type4 keyboard";
+
+    width= 452;
+    height= 185;
+
+    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "DELE" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "RTRN" { 
+	    approx = { [ 0, 0], [28,37] },
+	    { [ 0, 0], [28, 0], [28,37],
+	      [ 5,37], [ 5,19], [ 0,19] },
+	    { [ 1, 1], [26, 1], [26,36],
+	      [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 17;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 58;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <FK01>, 9 }, <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>, <FK11>, <FK12>,
+		   <BKSL>, { <DELE>, "DELE" },
+		 { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <ESC>, 9 }, 
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		   <AE11>, <AE12>,
+		 { <BKSP>, "BKSP" },
+		 { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> 
+
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, 
+		 { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" },
+		 { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } 
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, 
+		 { <LCTL>, 9, shape="LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <TLDE>,
+		 { <KP4>, 33 }, <KP5>, <KP6>
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, 
+		 { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH" }, <LNFD>,
+		 { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" }
+	    };
+	};
+	row {
+	    top= 96;
+	    keys { { <HELP>, "HELP" }, { <CAPS>, 9 },
+		   <LALT>, <LMTA>, { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <ALGR>,
+		 { <KP0>, 9, shape="KP0" }, <KPDL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } };
+    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
+    solid "LedPanel" {
+	shape= "LEDS";
+	top=  28;
+	left= 358;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 43;
+    indicator.shape= "LED";
+    indicator "Caps Lock"	{ left= 364; };
+    indicator "Compose"		{ left= 383; };
+    indicator "Scroll Lock"	{ left= 402; };
+    indicator "Num Lock"	{ left= 421; };
+    text.top= 34;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 380; text="Compose"; };
+    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
+};
+
+default xkb_geometry "type5" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type5
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    description= "Sun Type5 keyboard";
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [157,18] }, { [2,1], [155,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+};
+
+xkb_geometry "type5euro" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type5
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    description= "Sun Type5 keyboard";
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 24,18] }, { [2,1], [22,17] } };
+    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [157,18] }, { [2,1], [155,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+	top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <ESC>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <BKSL>, "BKSL" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+};
+
+
+xkb_geometry "type5unix" {
+
+    // This is an approximate layout for a (US/ASCII) Sun Type5
+    // keyboard.  I just took a similar layout (101 key PC keyboard)
+    // and adjusted the sizes.
+
+    description= "Sun Type5 Unix keyboard";
+
+    width= 515;
+    height= 170;
+
+    shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } };
+    shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [157,18] }, { [2,1], [155,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "LOGO" { { [ 16,16] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 14;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+    section "Function" {
+    top= 24;
+	row {
+	    top= 1;
+	    keys { { <HELP>, "HELP" }, { <NONE>, 9 },
+		   { <FK01>, 19 }, <FK02>, <FK03>, <FK04>,
+		   { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		   { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		   { <PRSC>,  9 }, <SCLK>, <PAUS>,
+		   { <MUTE>,  9 }, <VOL->, <VOL+>, <POWR>
+	    };
+	};
+    }; // End of "Function" section
+
+    section "Alpha" {
+	top= 61;
+	row {
+	    top= 1;
+	    keys { <STOP>, <AGAI>,
+		 { <ESC>, 9}, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   <BKSL>, <TLDE>
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { <FRNT>, <COPY>, { <LCTL>, 9, shape="LCTL" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>,
+		 { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, 
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		 { <RTSH>, "RTSH", color="grey20" }
+	    };
+	};
+	row {
+	    top= 77;
+	    keys { <FIND>, <CUT>, { <CAPS>, 9, shape="CAPS" },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, "SPCE" },
+		   <RMTA>, <COMP>, <ALGR>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 61;
+	left= 352;
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+	row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 61;
+	left= 420;
+	row {
+	    top= 1;
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
+    }; // End of "Keypad" section
+};
+
+xkb_geometry "type5_se" {
+
+    // kbd: type = 4, layout = 43
+
+    description= "Sun Type5 keyboard (Sweden)";
+
+    width=       510;
+    height=      170;
+
+    baseColor=   "grey";
+    labelColor=  "black";
+
+    shape.cornerRadius=	1;
+
+    shape "EDGE" { cornerRadius= 2, { [ 510, 170 ] } };
+    shape "LOGO" { cornerRadius= 2,
+      { [ 0, 8], [ 8, 16], [ 16, 8], [ 8, 0] }
+    };
+
+    shape "NORM" { { [ 18, 18] }, { [ 2, 1], [ 16, 17] } };
+    shape "BKSP" { { [ 38, 18] }, { [ 2, 1], [ 36, 17] } };
+    shape "TABK" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } };
+    shape "RTRN" { 
+      {	[ 0, 0], [ 29, 0], [ 29, 37], [ 5, 37], [ 5, 18], [ 0, 18] },
+      { [ 2, 1], [ 27, 1], [ 27, 36], [ 7, 36], [ 7, 17], [ 2, 17] }
+    };
+    shape "CAPS" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
+    shape "LFSH" { { [ 24, 18] }, { [ 2, 1], [ 22, 17 ] } };
+    shape "RTSH" { { [ 51, 18] }, { [ 2, 1], [ 49, 17 ] } };
+    shape "LCTL" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
+    shape "MODK" { { [ 28, 18] }, { [ 2, 1], [ 26, 17 ] } };
+    shape "SPCE" { { [157, 18] }, { [ 2, 1], [155, 17 ] } };
+    shape "KP0"  { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
+    shape "KPAD" { { [ 18, 37] }, { [ 2, 1], [ 16, 36 ] } };
+    shape "HELP" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
+
+    section "Function" {
+        key.color= "grey10";
+        priority=  1;
+        top=       24;
+        left=      14;
+        width=     481;
+        height=    19;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                { <HELP>, "HELP",   1 }, {  <ESC>, "NORM",   9 },
+                { <FK01>, "NORM",  19 }, { <FK02>, "NORM",   1 },
+                { <FK03>, "NORM",   1 }, { <FK04>, "NORM",   1 },
+                { <FK05>, "NORM",  11 }, { <FK06>, "NORM",   1 },
+                { <FK07>, "NORM",   1 }, { <FK08>, "NORM",   1 },
+                { <FK09>, "NORM",  11 }, { <FK10>, "NORM",   1 },
+                { <FK11>, "NORM",   1 }, { <FK12>, "NORM",   1 },
+                { <PRSC>, "NORM",   9 }, { <SCLK>, "NORM",   1 },
+                { <PAUS>, "NORM",   1 }, { <MUTE>, "NORM",  11 },
+                { <VOL->, "NORM",   1 }, { <VOL+>, "NORM",   1 },
+		{ <POWR>, "NORM",   1, color= "white" }
+            };
+        };
+    }; // End of "Function" section
+
+    section "Alpha" {
+        key.color= "white";
+        priority=  2;
+        top=       61;
+        left=      14;
+        width=     333;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                { <STOP>, "NORM",   1, color= "grey10" },
+		{ <AGAI>, "NORM",   1, color= "grey10" },
+                { <TLDE>, "NORM",   9 }, { <AE01>, "NORM",   1 },
+                { <AE02>, "NORM",   1 }, { <AE03>, "NORM",   1 },
+                { <AE04>, "NORM",   1 }, { <AE05>, "NORM",   1 },
+                { <AE06>, "NORM",   1 }, { <AE07>, "NORM",   1 },
+                { <AE08>, "NORM",   1 }, { <AE09>, "NORM",   1 },
+                { <AE10>, "NORM",   1 }, { <AE11>, "NORM",   1 },
+                { <AE12>, "NORM",   1 },
+                { <BKSP>, "BKSP",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                { <PROP>, "NORM",   1, color= "grey10" },
+		{ <UNDO>, "NORM",   1, color= "grey10" },
+                {  <TAB>, "TABK",   9, color= "grey10" },
+		{ <AD01>, "NORM",   1 },
+                { <AD02>, "NORM",   1 }, { <AD03>, "NORM",   1 },
+                { <AD04>, "NORM",   1 }, { <AD05>, "NORM",   1 },
+                { <AD06>, "NORM",   1 }, { <AD07>, "NORM",   1 },
+                { <AD08>, "NORM",   1 }, { <AD09>, "NORM",   1 },
+                { <AD10>, "NORM",   1 }, { <AD11>, "NORM",   1 },
+                { <AD12>, "NORM",   1 },
+		{ <RTRN>, "RTRN",   1, color= "grey10" }
+            };
+        };
+        row {
+            top=  39;
+            left= 1;
+            keys {
+                { <FRNT>, "NORM",   1, color= "grey10" },
+		{ <COPY>, "NORM",   1, color= "grey10" },
+                { <CAPS>, "CAPS",   9, color= "grey10" }, 
+	        { <AC01>, "NORM",   1 },
+                { <AC02>, "NORM",   1 }, { <AC03>, "NORM",   1 },
+                { <AC04>, "NORM",   1 }, { <AC05>, "NORM",   1 },
+                { <AC06>, "NORM",   1 }, { <AC07>, "NORM",   1 },
+                { <AC08>, "NORM",   1 }, { <AC09>, "NORM",   1 },
+                { <AC10>, "NORM",   1 }, { <AC11>, "NORM",   1 },
+		{ <AC12>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 1;
+            keys {
+                { <OPEN>, "NORM",   1, color= "grey10" },
+		{ <PAST>, "NORM",   1, color= "grey10" },
+		{ <LFSH>, "LFSH",   9, color= "grey10" },
+		{ <AB00>, "NORM",   1 }, { <AB01>, "NORM",   1 },
+                { <AB02>, "NORM",   1 }, { <AB03>, "NORM",   1 },
+                { <AB04>, "NORM",   1 }, { <AB05>, "NORM",   1 },
+                { <AB06>, "NORM",   1 }, { <AB07>, "NORM",   1 },
+                { <AB08>, "NORM",   1 }, { <AB09>, "NORM",   1 },
+                { <AB10>, "NORM",   1 },
+                { <RTSH>, "RTSH",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+	    key.color= "grey10";
+            keys {
+                { <FIND>, "NORM",   1 }, {  <CUT>, "NORM",   1 },
+                { <LCTL>, "LCTL",   9 }, { <LALT>, "NORM",   1 },
+                { <LMTA>, "NORM",   1 },
+		{ <SPCE>, "SPCE",   1, color= "white" },
+                { <RMTA>, "NORM",   1 }, { <COMP>, "NORM",   1 },
+                { <ALGR>, "NORM",   1 }
+            };
+        };
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        key.color= "grey10";
+        priority=  3;
+        top=       61;
+        left=      352;
+        width=     58;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                {  <INS>, "NORM",   1 }, { <HOME>, "NORM",   1 },
+                { <PGUP>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                { <DELE>, "NORM",   1 }, {  <END>, "NORM",   1 },
+                { <PGDN>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 20;
+            keys {
+                {   <UP>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+            keys {
+                { <LEFT>, "NORM",   1 }, { <DOWN>, "NORM",   1 },
+                { <RGHT>, "NORM",   1 }
+            };
+        };
+    }; // End of "Editing" section
+
+    section "Keypad" {
+        key.color= "white";
+        priority=  4;
+        top=       61;
+        left=      420;
+        width=     77;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+	    key.color= "grey10";
+            keys {
+                { <NMLK>, "NORM",   1 }, { <KPDV>, "NORM",   1 },
+                { <KPMU>, "NORM",   1 }, { <KPSU>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                {  <KP7>, "NORM",   1 }, {  <KP8>, "NORM",   1 },
+                {  <KP9>, "NORM",   1 },
+                { <KPAD>, "KPAD",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  39;
+            left= 1;
+            keys {
+                {  <KP4>, "NORM",   1 }, {  <KP5>, "NORM",   1 },
+                {  <KP6>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 1;
+            keys {
+                {  <KP1>, "NORM",   1 }, {  <KP2>, "NORM",   1 },
+                {  <KP3>, "NORM",   1 },
+                { <KPEN>, "KPAD",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+            keys {
+                {  <KP0>, "KP0",   1 }, { <KPDL>, "NORM",   1 }
+            };
+        };
+    }; // End of "Keypad" section
+
+    outline "Edges" {
+        top=      0;
+        left=     0;
+        priority= 0;
+        shape= "EDGE";
+    };
+
+    solid "Logos" {
+      color= "blue";
+      top=	5;
+      left=	25;
+      priority=	0;
+      shape= "LOGO";
+    };
+    
+    logo "SUNLogoImage" {
+      top=	5;
+      left=	25;
+      name= "SUN";
+      priority=	1;
+      shape= "LOGO";
+    };
+
+    shape "LED" { cornerRadius= 1,
+      { [ 0, 1.5], [ 1.5, 3], [ 3, 1.5], [ 1.5, 0] }
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.shape= "LED";
+    indicator "Caps Lock" { left= 75; top= 103; priority= 5; };
+    indicator "Compose"	  { left= 314; top= 142; priority= 5; };
+    indicator "Scroll Lock" { left= 378; top= 29; };
+    indicator "Num Lock"  { left= 426; top= 66; };
+};
+
+xkb_geometry "type5c_se" {
+
+    // kbd: type = 4, layout = 43
+
+    description= "Sun Type5c keyboard (Sweden)";
+
+    width=       510;
+    height=      170;
+
+    baseColor=   "grey";
+    labelColor=  "black";
+
+    shape.cornerRadius=	1;
+
+    shape "EDGE" { cornerRadius= 2, { [ 510, 170 ] } };
+    shape "LOGO" { cornerRadius= 2,
+      { [ 0, 8], [ 8, 16], [ 16, 8], [ 8, 0] }
+    };
+
+    shape "NORM" { { [ 18, 18] }, { [ 2, 1], [ 16, 17] } };
+    shape "BKSP" { { [ 38, 18] }, { [ 2, 1], [ 36, 17] } };
+    shape "TABK" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } };
+    shape "META" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } };
+    shape "RTRN" { 
+      {	[ 0, 0], [ 29, 0], [ 29, 37], [ 5, 37], [ 5, 18], [ 0, 18] },
+      { [ 2, 1], [ 27, 1], [ 27, 36], [ 7, 36], [ 7, 17], [ 2, 17] }
+    };
+    shape "CAPS" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
+    shape "LFSH" { { [ 24, 18] }, { [ 2, 1], [ 22, 17 ] } };
+    shape "RTSH" { { [ 51, 18] }, { [ 2, 1], [ 49, 17 ] } };
+    shape "LCTL" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } };
+    shape "MODK" { { [ 28, 18] }, { [ 2, 1], [ 26, 17 ] } };
+    shape "SPCE" { { [139, 18] }, { [ 2, 1], [137, 17 ] } };
+    shape "KP0"  { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
+    shape "KPAD" { { [ 18, 37] }, { [ 2, 1], [ 16, 36 ] } };
+    shape "HELP" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } };
+
+    section "Function" {
+        key.color= "grey10";
+        priority=  1;
+        top=       24;
+        left=      14;
+        width=     481;
+        height=    19;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                { <HELP>, "HELP",   1 }, {  <ESC>, "NORM",   9 },
+                { <FK01>, "NORM",  19 }, { <FK02>, "NORM",   1 },
+                { <FK03>, "NORM",   1 }, { <FK04>, "NORM",   1 },
+                { <FK05>, "NORM",  11 }, { <FK06>, "NORM",   1 },
+                { <FK07>, "NORM",   1 }, { <FK08>, "NORM",   1 },
+                { <FK09>, "NORM",  11 }, { <FK10>, "NORM",   1 },
+                { <FK11>, "NORM",   1 }, { <FK12>, "NORM",   1 },
+                { <PRSC>, "NORM",   9 }, { <SCLK>, "NORM",   1 },
+                { <PAUS>, "NORM",   1 }, { <MUTE>, "NORM",  11 },
+                { <VOL->, "NORM",   1 }, { <VOL+>, "NORM",   1 },
+		{ <POWR>, "NORM",   1, color= "white" }
+            };
+        };
+    }; // End of "Function" section
+
+    section "Alpha" {
+        key.color= "white";
+        priority=  2;
+        top=       61;
+        left=      14;
+        width=     333;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                { <STOP>, "NORM",   1, color= "grey10" },
+		{ <AGAI>, "NORM",   1, color= "grey10" },
+                { <TLDE>, "NORM",   9 }, { <AE01>, "NORM",   1 },
+                { <AE02>, "NORM",   1 }, { <AE03>, "NORM",   1 },
+                { <AE04>, "NORM",   1 }, { <AE05>, "NORM",   1 },
+                { <AE06>, "NORM",   1 }, { <AE07>, "NORM",   1 },
+                { <AE08>, "NORM",   1 }, { <AE09>, "NORM",   1 },
+                { <AE10>, "NORM",   1 }, { <AE11>, "NORM",   1 },
+                { <AE12>, "NORM",   1 },
+                { <BKSP>, "BKSP",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                { <PROP>, "NORM",   1, color= "grey10" },
+		{ <UNDO>, "NORM",   1, color= "grey10" },
+                {  <TAB>, "TABK",   9, color= "grey10" },
+		{ <AD01>, "NORM",   1 },
+                { <AD02>, "NORM",   1 }, { <AD03>, "NORM",   1 },
+                { <AD04>, "NORM",   1 }, { <AD05>, "NORM",   1 },
+                { <AD06>, "NORM",   1 }, { <AD07>, "NORM",   1 },
+                { <AD08>, "NORM",   1 }, { <AD09>, "NORM",   1 },
+                { <AD10>, "NORM",   1 }, { <AD11>, "NORM",   1 },
+                { <AD12>, "NORM",   1 },
+		{ <RTRN>, "RTRN",   1, color= "grey10" }
+            };
+        };
+        row {
+            top=  39;
+            left= 1;
+            keys {
+                { <FRNT>, "NORM",   1, color= "grey10" },
+		{ <COPY>, "NORM",   1, color= "grey10" },
+                { <CAPS>, "CAPS",   9, color= "grey10" }, 
+	        { <AC01>, "NORM",   1 },
+                { <AC02>, "NORM",   1 }, { <AC03>, "NORM",   1 },
+                { <AC04>, "NORM",   1 }, { <AC05>, "NORM",   1 },
+                { <AC06>, "NORM",   1 }, { <AC07>, "NORM",   1 },
+                { <AC08>, "NORM",   1 }, { <AC09>, "NORM",   1 },
+                { <AC10>, "NORM",   1 }, { <AC11>, "NORM",   1 },
+		{ <AC12>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 1;
+            keys {
+                { <OPEN>, "NORM",   1, color= "grey10" },
+		{ <PAST>, "NORM",   1, color= "grey10" },
+		{ <LFSH>, "LFSH",   9, color= "grey10" },
+		{ <AB00>, "NORM",   1 }, { <AB01>, "NORM",   1 },
+                { <AB02>, "NORM",   1 }, { <AB03>, "NORM",   1 },
+                { <AB04>, "NORM",   1 }, { <AB05>, "NORM",   1 },
+                { <AB06>, "NORM",   1 }, { <AB07>, "NORM",   1 },
+                { <AB08>, "NORM",   1 }, { <AB09>, "NORM",   1 },
+                { <AB10>, "NORM",   1 },
+                { <RTSH>, "RTSH",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+	    key.color= "grey10";
+            keys {
+                { <FIND>, "NORM",   1 }, {  <CUT>, "NORM",   1 },
+                { <LCTL>, "LCTL",   9 }, { <LALT>, "NORM",   1 },
+                { <LMTA>, "META",   1 },
+		{ <SPCE>, "SPCE",   1, color= "white" },
+                { <RMTA>, "META",   1 }, { <COMP>, "NORM",   1 },
+                { <ALGR>, "NORM",   1 }
+            };
+        };
+    }; // End of "Alpha" section
+
+    section "Editing" {
+        key.color= "grey10";
+        priority=  3;
+        top=       61;
+        left=      352;
+        width=     58;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+            keys {
+                {  <INS>, "NORM",   1 }, { <HOME>, "NORM",   1 },
+                { <PGUP>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                { <DELE>, "NORM",   1 }, {  <END>, "NORM",   1 },
+                { <PGDN>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 20;
+            keys {
+                {   <UP>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+            keys {
+                { <LEFT>, "NORM",   1 }, { <DOWN>, "NORM",   1 },
+                { <RGHT>, "NORM",   1 }
+            };
+        };
+    }; // End of "Editing" section
+
+    section "Keypad" {
+        key.color= "white";
+        priority=  4;
+        top=       61;
+        left=      420;
+        width=     77;
+        height=    95;
+        row {
+            top=  1;
+            left= 1;
+	    key.color= "grey10";
+            keys {
+                { <NMLK>, "NORM",   1 }, { <KPDV>, "NORM",   1 },
+                { <KPMU>, "NORM",   1 }, { <KPSU>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  20;
+            left= 1;
+            keys {
+                {  <KP7>, "NORM",   1 }, {  <KP8>, "NORM",   1 },
+                {  <KP9>, "NORM",   1 },
+                { <KPAD>, "KPAD",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  39;
+            left= 1;
+            keys {
+                {  <KP4>, "NORM",   1 }, {  <KP5>, "NORM",   1 },
+                {  <KP6>, "NORM",   1 }
+            };
+        };
+        row {
+            top=  58;
+            left= 1;
+            keys {
+                {  <KP1>, "NORM",   1 }, {  <KP2>, "NORM",   1 },
+                {  <KP3>, "NORM",   1 },
+                { <KPEN>, "KPAD",   1, color="grey10" }
+            };
+        };
+        row {
+            top=  77;
+            left= 1;
+            keys {
+                {  <KP0>, "KP0",   1 }, { <KPDL>, "NORM",   1 }
+            };
+        };
+    }; // End of "Keypad" section
+
+    outline "Edges" {
+        top=      0;
+        left=     0;
+        priority= 0;
+        shape= "EDGE";
+    };
+
+    solid "Logos" {
+      color= "blue";
+      top=	5;
+      left=	15;
+      priority=	0;
+      shape= "LOGO";
+    };
+    
+    logo "SUNLogoImage" {
+      top=	5;
+      left=	15;
+      name= "SUN";
+      priority=	1;
+      shape= "LOGO";
+    };
+
+    text.font= "charter";
+    text.weight= "medium";
+    text.slant= "i";
+    text.fontSize= 40;
+    text "SunLogoText" {
+      top=	5;
+      left=    32;
+      color= "blue";
+      text= "Sun";
+    };
+
+    shape "LED" { cornerRadius= 1,
+      { [ 0, 1.5], [ 1.5, 3], [ 3, 1.5], [ 1.5, 0] }
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.shape= "LED";
+    indicator "Caps Lock"   { left= 75; top= 103; priority= 5; };
+    indicator "Compose"     { left= 314; top= 142; priority= 5; };
+    indicator "Scroll Lock" { left= 378; top= 29; };
+    indicator "Num Lock"    { left= 426; top= 66; };
+};
+
+xkb_geometry "type4_se" {
+
+    // kbd: type = 4, layout = 11
+
+    description= "Sun Type4 keyboard (Sweden)";
+    
+
+    width=       453;
+    height=      183;
+
+    baseColor=   "grey";
+    labelColor=  "black";
+
+    shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } };
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } };
+    shape "DELE" { { [ 18,18] }, { [2,1], [16,17] } };
+    shape "RTRN" { 
+	    approx = { [ 0, 0], [28,37] },
+	    { [ 0, 0], [28, 0], [28,37],
+	      [ 5,37], [ 5,19], [ 0,19] },
+	    { [ 1, 1], [26, 1], [26,36],
+	      [ 7,36], [ 7,18], [ 1,18] }
+    };
+    shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } };
+    shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } };
+    shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } };
+    shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } };
+    shape "SPCE" { { [170,18] }, { [2,1], [168,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [35,17] } };
+    shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } };
+    shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } };
+
+    outline "Edges" {
+	top= 0;
+	left= 0;
+	shape= "EDGE";
+    };
+
+    section.left= 17;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  1;
+
+    section "Alpha" {
+	top= 58;
+	row {
+	    top= 1;
+	    key.color=	"grey10";
+	    keys { <STOP>, <AGAI>, { <FK01>, 9 },
+		   <FK02>, <FK03>, <FK04>,
+		   <FK05>, <FK06>, <FK07>, <FK08>,
+		   <FK09>, <FK10>, <FK11>, <FK12>,
+		 { <AF13>, 	color=	"white"},
+		 { <AF14>, 	color=	"white"},
+		   <DELE>, { <PAUS>, 9 },
+		   <PRSC>, <SCLK>, <NMLK>
+	    };
+	};
+	row {
+	    top= 20;
+	    key.color=	"white";
+	    keys {
+		 { <PROP>,	color=	"grey10" },
+		 { <UNDO>,	color=	"grey10" },
+		 {  <ESC>, 9,	color=	"grey10" }, 
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, 
+		   <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, 
+		   <AE11>, <AE12>,
+		 { <BKSP>, "BKSP", 	color=	"grey10" },
+		 { <KPEQ>, 9, 	color=	"grey10" },
+		 { <KPDV>, 	color=	"grey10" },
+		 { <KPMU>, 	color=	"grey10" },
+		 { <KPSU>, 	color=	"grey10" }
+	    };
+	};
+	row {
+	    top= 39;
+	    key.color=	"white";
+	    keys {
+		 { <FRNT>, 	color=	"grey10" },
+		 { <COPY>,	color=	"grey10" },
+		 {  <TAB>, 9, 	"TABK",	color=	"grey10" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>,
+		 { <RTRN>,	"RTRN",	color=	"grey10" },
+		 {  <KP7>, 9, 	color=	"grey10" },
+		 {  <KP8>,  	color=	"grey10" },
+		 {  <KP9>,  	color=	"grey10" },
+		 { <KPAD>,	"KPAD",	color=	"grey10" } 
+	    };
+	};
+	row {
+	    top= 58;
+	    key.color=	"white";
+	    keys {
+		 { <OPEN>, 	color=	"grey10" },
+		 { <PAST>, 	color=	"grey10" },
+		 { <CAPS>, 9,	"LCTL",	color=	"grey10" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		   <AC11>, <AC12>,
+		 {  <KP4>, 33,	color=	"grey10" },
+		 {  <KP5>,  	color=	"grey10" },
+		 {  <KP6>,  	color=	"grey10" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.color=	"white";
+	    keys { 
+		 { <FIND>, 	color=	"grey10" },
+		 {  <CUT>, 	color=	"grey10" },
+		 { <LFSH>, 9 ,	"LFSH",	color=	"grey10" },
+		   <AB00>, <AB01>, <AB02>, <AB03>,
+		   <AB04>, <AB05>, <AB06>, <AB07>,
+		   <AB08>, <AB09>, <AB10>,
+		 { <RTSH>, 	"RTSH",	color=	"grey10" },
+		 { <LNFD>,	color=	"grey10" },
+		 {  <KP1>, 9, 	color=	"grey10" },
+		 {  <KP2>,  	color=	"grey10" },
+		 {  <KP3>,  	color=	"grey10" },
+		 { <KPEN>,	"KPAD",	color=	"grey10" }
+	    };
+	};
+	row {
+	    top= 96;
+	    key.color=	"grey10";
+	    keys {
+		 { <HELP>, "HELP" }, { <LCTL>, 9 },
+		   <LALT>, <LMTA>,
+		 { <SPCE>, 	"SPCE",	color=	"white" },
+		   <RMTA>, <COMP>, <ALGR>,
+		 { <KP0>, 9, 	"KP0" }, <KPDL>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    shape "RIDGE" { cornerRadius= 1, { [  0, 1], [  1, 0 ],
+				       [330, 0], [331, 1],
+				       [330, 2], [  1, 2] } };
+    solid "Ridge" {
+	shape=	"RIDGE";
+	top=	48;
+	left=	18;
+    };
+
+    shape "LEDS" { cornerRadius= 1, { [ 75 ,21 ] } };
+    shape "LED"  { cornerRadius= 0, { [  7,  4 ] } };
+    outline "LedPanel" {
+	shape= "LEDS";
+	top=  28;
+	left= 358;
+    };
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 43;
+    indicator.shape= "LED";
+    indicator "Caps Lock"	{ left= 364; };
+    indicator "Compose"		{ left= 383; };
+    indicator "Scroll Lock"	{ left= 402; };
+    indicator "Num Lock"	{ left= 421; };
+    text.top= 32;
+    text.color= "black";
+    text "CapsLockLabel"	{ left= 364; text="Caps\nLock"; };
+    text "ComposeLabel"		{ left= 380; text="\nCompose"; };
+    text "ScrollLockLabel"	{ left= 402; text="Scroll\nLock"; };
+    text "NumLockLabel"		{ left= 421; text="Num\nLock"; };
+};
diff --git a/geometry/winbook b/geometry/winbook
new file mode 100644
index 00000000..e4de4786
--- /dev/null
+++ b/geometry/winbook
@@ -0,0 +1,144 @@
+// $Xorg: winbook,v 1.3 2000/08/17 19:54:36 cpqbld Exp $
+default xkb_geometry "XP5" {
+
+    description= "WinBook XP5";
+    width= 281;
+    height= 180;
+
+    shape.cornerRadius= 1;
+
+    shape "NORM" { 
+	{ [17,17] },
+	{ [ 2, 1], [ 15, 15 ] }
+    };
+    shape "FKEY" {
+	{ [ 15, 10 ] },
+	{ [  1,  0 ], [ 14, 9.5 ] }
+    };
+    shape "ONE" {
+	{ [ 28, 17 ] },
+	{ [ 11, 0 ], [ 28, 17 ] },
+	{ [ 13, 1 ], [ 26, 15 ] }
+    };
+    shape "WIDE" {	// backspace, caps lock, ctrl alt ?
+	{ [  24.5, 17 ] },
+	{ [   2,  1 ], [ 22.5, 15 ] }
+    };
+    shape "WIDR" { // backslash, left shift
+	{ [ 35, 17 ] },
+	{ [ 2, 1 ], [ 33, 15 ] }
+    };
+    shape "RTRN" {
+	{ [  45, 17 ] },
+	{ [  2,  1 ], [ 43, 15 ] }
+    };
+    shape "SPCE" {
+	{ [  90, 17 ] },
+	{ [  2,  1 ], [ 88, 15 ] }
+    };
+    shape "STIK" {
+	cornerRadius= 4,
+	{ [  8,  8 ] }
+    };
+    shape "BTN" {
+	{ [ 31, 6 ] }
+    };
+
+    section.left= 2;
+    row.left= 1;
+    key.shape= "NORM";
+    key.gap=  0.5;
+
+    key.color= "grey10";
+    labelColor= "white";
+    baseColor= "grey20";
+
+    section "Whole" {
+	top= 10;
+	row {
+	    top= 11; 
+	    key.shape= "FKEY";
+	    keys { 
+	    	<ESC>,  
+	    	<FK01>, <FK02>, <FK03>, <FK04>, <FK05>, <FK06>,
+		<FK07>, <FK08>, <FK09>, <FK10>, <FK11>, <FK12>,
+		<PAUS>, <HOME>, <END>, <PGUP>
+	    };
+	};
+	row {
+	    top= 22;
+	    keys { 
+	    	{ <AEO1>, "ONE" },
+		<AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		<AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		{ <BKSP>, shape="WIDE" }, 
+		<PGDN>
+	    };
+	};
+	row {
+	    top= 40;
+	    keys { 
+	    	<TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>,
+		<AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>,
+		{ <BKSL>, "WIDR" }
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <CAPS>, shape="WIDE" },
+		<AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		<AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+		<AC11>, 
+		{ <RTRN>, shape="RTRN" }
+	    };
+	};
+	row {
+	    top= 76;
+	    keys { 
+		{ <LFSH>, shape="WIDR" },
+		<AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		<AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		<RTSH>, <UP>, <NMLK> 
+	    };
+	};
+	row {
+	    top= 94;
+	    keys { 
+		{ <LCTL>, "WIDE" }, <FUNC>, { <LALT>, "WIDE" }, 
+		<TLDE>, { <SPCE>, shape="SPCE" }, <INS>, <DELE>, 
+		<LEFT>, <DOWN>, <RGHT>
+	    };
+	};
+	overlay "KPAD" {
+	    <AE07>=<KP7>,  <AE08>=<KP8>, <AE09>=<KP9>,  <AE10>=<KPMU>,
+	    <AD07>=<KP4>,  <AD08>=<KP5>, <AD09>=<KP6>,  <AD10>=<KPSU>,
+	    <AC07>=<KP1>,  <AC08>=<KP2>, <AC09>=<KP3>,  <AC10>=<KPAD>,
+	    <AB07>=<KP0>,                <AB09>=<KPDL>, <AB10>=<KPSL>
+	};
+    }; // End of "Whole" section
+
+    solid "STIK" {
+	color= "red";
+	shape= "STIK";
+	top= 81;
+	left= 112;
+    };
+
+    solid "BTN1" {
+    	color= "red";
+	shape= "BTN";
+	top= 137;
+	left= 93;
+    };
+
+    solid "BTN2" {
+	color= "red";
+	shape= "BTN";
+	top= 137;
+	left= 127;
+    };
+
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+
+};
diff --git a/keycodes/README b/keycodes/README
new file mode 100644
index 00000000..b0ca78aa
--- /dev/null
+++ b/keycodes/README
@@ -0,0 +1,10 @@
+The keycodes component of a keyboard mapping specifies the range and
+interpretation of the raw keycodes reported by the device. It sets the keycodes
+symbolic name, the minimum and maximum legal codes for the keyboard, and the
+symbolic name for each key. The keycodes component might also contain aliases
+for some keys, symbolic names for some indicators and a description of which
+indicators are physically present.
+
+
+
+/* $XFree86$ */
diff --git a/keycodes/aliases b/keycodes/aliases
new file mode 100644
index 00000000..7cfc25bd
--- /dev/null
+++ b/keycodes/aliases
@@ -0,0 +1,101 @@
+
+// keycode aliases for phonetic keyboard maps
+//
+// $XFree86$
+
+default
+xkb_keycodes "qwerty" {
+
+   alias <LatQ> = <AD01>;
+   alias <LatW> = <AD02>;
+   alias <LatE> = <AD03>;
+   alias <LatR> = <AD04>;
+   alias <LatT> = <AD05>;
+   alias <LatY> = <AD06>;
+   alias <LatU> = <AD07>;
+   alias <LatI> = <AD08>;
+   alias <LatO> = <AD09>;
+   alias <LatP> = <AD10>;
+
+   alias <LatA> = <AC01>;
+   alias <LatS> = <AC02>;
+   alias <LatD> = <AC03>;
+   alias <LatF> = <AC04>;
+   alias <LatG> = <AC05>;
+   alias <LatH> = <AC06>;
+   alias <LatJ> = <AC07>;
+   alias <LatK> = <AC08>;
+   alias <LatL> = <AC09>;
+
+   alias <LatZ> = <AB01>;
+   alias <LatX> = <AB02>;
+   alias <LatC> = <AB03>;
+   alias <LatV> = <AB04>;
+   alias <LatB> = <AB05>;
+   alias <LatN> = <AB06>;
+   alias <LatM> = <AB07>;
+};
+
+xkb_keycodes "azerty" {
+
+   alias <LatA> = <AD01>;
+   alias <LatZ> = <AD02>;
+   alias <LatE> = <AD03>;
+   alias <LatR> = <AD04>;
+   alias <LatT> = <AD05>;
+   alias <LatY> = <AD06>;
+   alias <LatU> = <AD07>;
+   alias <LatI> = <AD08>;
+   alias <LatO> = <AD09>;
+   alias <LatP> = <AD10>;
+
+   alias <LatQ> = <AC01>;
+   alias <LatS> = <AC02>;
+   alias <LatD> = <AC03>;
+   alias <LatF> = <AC04>;
+   alias <LatG> = <AC05>;
+   alias <LatH> = <AC06>;
+   alias <LatJ> = <AC07>;
+   alias <LatK> = <AC08>;
+   alias <LatL> = <AC09>;
+   alias <LatM> = <AC10>;
+
+   alias <LatW> = <AB01>;
+   alias <LatX> = <AB02>;
+   alias <LatC> = <AB03>;
+   alias <LatV> = <AB04>;
+   alias <LatB> = <AB05>;
+   alias <LatN> = <AB06>;
+};
+
+xkb_keycodes "qwertz" {
+
+   alias <LatQ> = <AD01>;
+   alias <LatW> = <AD02>;
+   alias <LatE> = <AD03>;
+   alias <LatR> = <AD04>;
+   alias <LatT> = <AD05>;
+   alias <LatZ> = <AD06>;
+   alias <LatU> = <AD07>;
+   alias <LatI> = <AD08>;
+   alias <LatO> = <AD09>;
+   alias <LatP> = <AD10>;
+
+   alias <LatA> = <AC01>;
+   alias <LatS> = <AC02>;
+   alias <LatD> = <AC03>;
+   alias <LatF> = <AC04>;
+   alias <LatG> = <AC05>;
+   alias <LatH> = <AC06>;
+   alias <LatJ> = <AC07>;
+   alias <LatK> = <AC08>;
+   alias <LatL> = <AC09>;
+
+   alias <LatY> = <AB01>;
+   alias <LatX> = <AB02>;
+   alias <LatC> = <AB03>;
+   alias <LatV> = <AB04>;
+   alias <LatB> = <AB05>;
+   alias <LatN> = <AB06>;
+   alias <LatM> = <AB07>;
+};
diff --git a/keycodes/amiga b/keycodes/amiga
new file mode 100644
index 00000000..7b661a5c
--- /dev/null
+++ b/keycodes/amiga
@@ -0,0 +1,231 @@
+// $Xorg: amiga,v 1.3 2000/08/17 19:54:37 cpqbld Exp $
+
+
+
+// $XFree86: xc/programs/xkbcomp/keycodes/amiga,v 3.2 1997/10/26 13:25:35 dawes Exp $
+
+default xkb_keycodes "usa1" {
+
+    minimum= 8;
+    maximum= 111;
+
+    <ESC>  = 77;
+    <FK01> = 88;
+    <FK02> = 89;
+    <FK03> = 90;
+    <FK04> = 91;
+    <FK05> = 92;
+    <FK06> = 93;
+    <FK07> = 94;
+    <FK08> = 95;
+    <FK09> = 96;
+    <FK10> = 97;
+
+    <TLDE> = 8;
+    <AE01> = 9;
+    <AE02> = 10;
+    <AE03> = 11;
+    <AE04> = 12;
+    <AE05> = 13;
+    <AE06> = 14;
+    <AE07> = 15;
+    <AE08> = 16;
+    <AE09> = 17;
+    <AE10> = 18;
+    <AE11> = 19;
+    <AE12> = 20;
+    <BKSL> = 21;
+    <BKSP> = 73;
+
+    <TAB>  = 74;
+    <AD01> = 24;
+    <AD02> = 25;
+    <AD03> = 26;
+    <AD04> = 27;
+    <AD05> = 28;
+    <AD06> = 29;
+    <AD07> = 30;
+    <AD08> = 31;
+    <AD09> = 32;
+    <AD10> = 33;
+    <AD11> = 34;
+    <AD12> = 35;
+    <RTRN> = 76;
+
+    <LCTL> = 107;
+    <CAPS> = 106;
+    <AC01> = 40;
+    <AC02> = 41;
+    <AC03> = 42;
+    <AC04> = 43;
+    <AC05> = 44;
+    <AC06> = 45;
+    <AC07> = 46;
+    <AC08> = 47;
+    <AC09> = 48;
+    <AC10> = 49;
+    <AC11> = 50;
+
+    <LFSH> = 104;
+    <AB01> = 57;
+    <AB02> = 58;
+    <AB03> = 59;
+    <AB04> = 60;
+    <AB05> = 61;
+    <AB06> = 62;
+    <AB07> = 63;
+    <AB08> = 64;
+    <AB09> = 65;
+    <AB10> = 66;
+    <RTSH> = 105;
+
+    <LALT> = 108;
+    <LAMI> = 110;
+    <SPCE> = 72;
+    <RAMI> = 111;
+    <RALT> = 109;
+
+    <DELE> = 78;
+    <HELP> = 103;
+    <UP>   = 84;
+    <LEFT> = 87;
+    <DOWN> = 85;
+    <RGHT> = 86;
+
+    <KPLP> = 98;
+    <KPRP> = 99;
+    <KPDV> = 100;
+    <KPMU> = 101;
+
+    <KP7>  = 69;
+    <KP8>  = 70;
+    <KP9>  = 71;
+    <KPSU> = 82;
+
+    <KP4>  = 53;
+    <KP5>  = 54;
+    <KP6>  = 55;
+    <KPAD> = 102;
+
+    <KP1>  = 37;
+    <KP2>  = 38;
+    <KP3>  = 39;
+
+    <KP0>  = 23;
+    <KPDC> = 68;
+    <KPEN> = 75;
+};
+
+xkb_keycodes "de" {
+
+    minimum= 8;
+    maximum= 111;
+
+    <ESC>  = 77;
+    <FK01> = 88;
+    <FK02> = 89;
+    <FK03> = 90;
+    <FK04> = 91;
+    <FK05> = 92;
+    <FK06> = 93;
+    <FK07> = 94;
+    <FK08> = 95;
+    <FK09> = 96;
+    <FK10> = 97;
+
+    <TLDE> = 8;
+    <AE01> = 9;
+    <AE02> = 10;
+    <AE03> = 11;
+    <AE04> = 12;
+    <AE05> = 13;
+    <AE06> = 14;
+    <AE07> = 15;
+    <AE08> = 16;
+    <AE09> = 17;
+    <AE10> = 18;
+    <AE11> = 19;
+    <AE12> = 20;
+    <BKSL> = 21;
+    <BKSP> = 73;
+
+    <TAB>  = 74;
+    <AD01> = 24;
+    <AD02> = 25;
+    <AD03> = 26;
+    <AD04> = 27;
+    <AD05> = 28;
+    <AD06> = 29;
+    <AD07> = 30;
+    <AD08> = 31;
+    <AD09> = 32;
+    <AD10> = 33;
+    <AD11> = 34;
+    <AD12> = 35;
+    <RTRN> = 76;
+
+    <LCTL> = 107;
+    <CAPS> = 106;
+    <AC01> = 40;
+    <AC02> = 41;
+    <AC03> = 42;
+    <AC04> = 43;
+    <AC05> = 44;
+    <AC06> = 45;
+    <AC07> = 46;
+    <AC08> = 47;
+    <AC09> = 48;
+    <AC10> = 49;
+    <AC11> = 50;
+    <AC12> = 51;
+
+    <LFSH> = 104;
+    <LSGT> = 56;
+    <AB01> = 57;
+    <AB02> = 58;
+    <AB03> = 59;
+    <AB04> = 60;
+    <AB05> = 61;
+    <AB06> = 62;
+    <AB07> = 63;
+    <AB08> = 64;
+    <AB09> = 65;
+    <AB10> = 66;
+    <RTSH> = 105;
+
+    <LALT> = 108;
+    <LAMI> = 110;
+    <SPCE> = 72;
+    <RAMI> = 111;
+    <RALT> = 109;
+
+    <DELE> = 78;
+    <HELP> = 103;
+    <UP>   = 84;
+    <LEFT> = 87;
+    <DOWN> = 85;
+    <RGHT> = 86;
+
+    <KPLP> = 98;
+    <KPRP> = 99;
+    <KPDV> = 100;
+    <KPMU> = 101;
+
+    <KP7>  = 69;
+    <KP8>  = 70;
+    <KP9>  = 71;
+    <KPSU> = 82;
+
+    <KP4>  = 53;
+    <KP5>  = 54;
+    <KP6>  = 55;
+    <KPAD> = 102;
+
+    <KP1>  = 37;
+    <KP2>  = 38;
+    <KP3>  = 39;
+
+    <KP0>  = 23;
+    <KPDC> = 68;
+    <KPEN> = 75;
+};
diff --git a/keycodes/ataritt b/keycodes/ataritt
new file mode 100644
index 00000000..3cfd503b
--- /dev/null
+++ b/keycodes/ataritt
@@ -0,0 +1,123 @@
+// $Xorg: ataritt,v 1.3 2000/08/17 19:54:37 cpqbld Exp $
+
+
+
+// $XFree86: xc/programs/xkbcomp/keycodes/ataritt,v 3.1 1997/10/26 13:25:35 dawes Exp $
+
+default xkb_keycodes "us" {
+
+    minimum= 8;
+    maximum= 134;
+
+    <ESC>  =   9;
+    <AE01> =  10;
+    <AE02> =  11;
+    <AE03> =  12;
+    <AE04> =  13;
+    <AE05> =  14;
+    <AE06> =  15;
+    <AE07> =  16;
+    <AE08> =  17;
+    <AE09> =  18;
+    <AE10> =  19;
+    <AE11> =  20;
+    <AE12> =  21;
+    <TLDE> =  49;
+    <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;
+    <RTRN> =  36;
+    <DELE> =  91;
+
+    <LCTL> =  37;
+    <AC01> =  38;
+    <AC02> =  39;
+    <AC03> =  40;
+    <AC04> =  41;
+    <AC05> =  42;
+    <AC06> =  43;
+    <AC07> =  44;
+    <AC08> =  45;
+    <AC09> =  46;
+    <AC10> =  47;
+    <AC11> =  48;
+    <BKSL> =  51;
+
+    <LFSH> =  50;
+    <AB01> =  52;
+    <AB02> =  53;
+    <AB03> =  54;
+    <AB04> =  55;
+    <AB05> =  56;
+    <AB06> =  57;
+    <AB07> =  58;
+    <AB08> =  59;
+    <AB09> =  60;
+    <AB10> =  61;
+    <RTSH> =  62;
+
+    <ALT>  =  64;
+    <SPCE> =  65;
+    <CAPS> =  66;
+
+    <FK01> =  67;
+    <FK02> =  68;
+    <FK03> =  69;
+    <FK04> =  70;
+    <FK05> =  71;
+    <FK06> =  72;
+    <FK07> =  73;
+    <FK08> =  74;
+    <FK09> =  75;
+    <FK10> =  76;
+
+    <HELP> = 106;
+    <UNDO> = 105;
+    <INS>  =  90;
+    <HOME> =  79;
+    <UP>   =  80;
+    <LEFT> =  83;
+    <DOWN> =  88;
+    <RGHT> =  85;
+
+    <KPLP> = 107;
+    <KPRP> = 108;
+    <KPDV> = 109;
+    <KPMU> = 110;
+
+    <KP7>  = 111;
+    <KP8>  = 112;
+    <KP9>  = 113;
+    <KPSU> =  82;
+
+    <KP4>  = 114;
+    <KP5>  = 115;
+    <KP6>  = 116;
+    <KPAD> =  86;
+
+    <KP1>  = 117;
+    <KP2>  = 118;
+    <KP3>  = 119;
+
+    <KP0>  = 120;
+    <KPDC> = 121;
+    <KPEN> = 122;
+};
+
+xkb_keycodes "de" {
+    include "ataritt(us)"
+
+    <LSGT> = 104;
+};
diff --git a/keycodes/digital.vndr/lk b/keycodes/digital.vndr/lk
new file mode 100644
index 00000000..2d8c5842
--- /dev/null
+++ b/keycodes/digital.vndr/lk
@@ -0,0 +1,271 @@
+// $Xorg: lk,v 1.3 2000/08/17 19:54:38 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:13:22  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/08/07  17:40:34  William_Walker
+// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// 	[1995/08/06  14:06:25  William_Walker]
+//
+// Revision 1.1.2.4  1995/08/05  15:25:55  William_Walker
+// 	Upgrade to XKB protocol 0.62
+// 	[1995/08/05  14:39:58  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/27  12:17:31  William_Walker
+// 	     Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:24:04  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05  19:21:28  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:07:29  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: lk  Revision: /main/3  (DEC) Date: 1996/01/24 12:13:31 
+// 
+xkb_keycodes "lk_common" {
+    // "Function" keys
+    <FK01>	= 86;
+    <FK02>	= 87;
+    <FK03>	= 88;
+    <FK04>	= 89;
+    <FK05>	= 90;
+    <FK06>	= 100;
+    <FK07>	= 101;
+    <FK08>	= 102;
+    <FK09>	= 103;
+    <FK10>	= 104;
+    <FK11>	= 113;
+    <FK12>	= 114;
+
+    <UP>	= 170;
+    <LEFT>	= 167;
+    <DOWN>	= 169;
+    <RGHT>	= 168;
+
+    // "Keypad" keys
+    <KP7>	= 157;
+    <KP8>	= 158;
+    <KP9>	= 159;
+    <KP4>	= 153;
+    <KP5>	= 154;
+    <KP6>	= 155;
+    <KP1>	= 150;
+    <KP2>	= 151;
+    <KP3>	= 152;
+    <KPEN>	= 149;
+    <KP0>	= 146;
+    <KPDL>	= 148;
+
+    // "Alphanumeric" keys
+    <AE00>	= 191;
+    <AE01>	= 192;
+    <AE02>	= 197;
+    <AE03>	= 203;
+    <AE04>	= 208;
+    <AE05>	= 214;
+    <AE06>	= 219;
+    <AE07>	= 224;
+    <AE08>	= 229;
+    <AE09>	= 234;
+    <AE10>	= 239;
+    <AE11>	= 249;
+    <AE12>	= 245;
+    <BKSP>	= 188;
+
+    <TAB>	= 190;
+    <AD01>	= 193;
+    <AD02>	= 198;
+    <AD03>	= 204;
+    <AD04>	= 209;
+    <AD05>	= 215;
+    <AD06>	= 220;
+    <AD07>	= 225;
+    <AD08>	= 230;
+    <AD09>	= 235;
+    <AD10>	= 240;
+    <AD11>	= 250;
+    <AD12>	= 246;
+    <RTRN>	= 189;
+
+    <LCTL>	= 175;
+    <CAPS>	= 176;
+    <AC01>	= 194;
+    <AC02>	= 199;
+    <AC03>	= 205;
+    <AC04>	= 210;
+    <AC05>	= 216;
+    <AC06>	= 221;
+    <AC07>	= 226;
+    <AC08>	= 231;
+    <AC09>	= 236;
+    <AC10>	= 242;
+    <AC11>	= 251;
+
+    <LFSH>	= 174;
+    <AB01>	= 195;
+    <AB02>	= 200;
+    <AB03>	= 206;
+    <AB04>	= 211;
+    <AB05>	= 217;
+    <AB06>	= 222;
+    <AB07>	= 227;
+    <AB08>	= 232;
+    <AB09>	= 237;
+    <AB10>	= 243;
+    <RTSH>	= 171;
+
+    <SPCE>	= 212;
+
+    <LDM>	= 255; // Support R5 Lock Down Modifiers
+
+    alias <TLDE> = <AE00>;
+};
+
+xkb_keycodes "lkx01" {
+    include "digital/lk(lk_common)"
+    <AB00>	= 201;
+    <FK13>	= 115;
+    <FK14>	= 116;
+    <FK17>	= 128;
+    <FK18>	= 129;
+    <FK19>	= 130;
+    <FK20>	= 131;
+    <HELP>	= 124;
+    <DO>	= 125;
+    <FIND>	= 138;
+    <INS>	= 139;
+    <DELE>	= 140;
+    <SELE>	= 141;
+    <PGUP>	= 142;
+    <PGDN>	= 143;
+    <KPF1>	= 161;
+    <KPF2>	= 162;
+    <KPF3>	= 163;
+    <KPF4>	= 164;
+    <KPSU>	= 160;
+    <KPCO>	= 156;
+    <BKSL>	= 247;
+    <LCMP>	= 177;
+};
+
+xkb_keycodes "lk201" {
+    include "digital/lk(lkx01)"
+    indicator 4 = "Scroll Lock";
+    indicator 3 = "Caps Lock";
+    indicator 2 = "Compose";
+    indicator 1 = "Wait";
+};
+
+xkb_keycodes "lk421" {
+    include	"digital/lk(lkx01)"
+    <LALT>	= 172;
+    <RALT>	= 178;
+    <RCMP>	= 173;
+};
+
+xkb_keycodes "lk401" {
+    include	"digital/lk(lk421)"
+    indicator 4 = "Scroll Lock";
+    indicator 3 = "Caps Lock";
+};
+
+xkb_keycodes "lk44x" {
+    include "digital/lk(lk_common)"
+    <ESC>	= 85;
+    <PRSC>	= 115;
+    <SCLK>	= 116;
+    <PAUS>	= 124;
+    <INS>	= 138;
+    <HOME>	= 139;
+    <PGUP>	= 140;
+    <DELE>	= 141;
+    <END>	= 142;
+    <PGDN>	= 143;
+    <NMLK>	= 161;
+    <KPDV>	= 162;
+    <KPMU>	= 163;
+    <KPSU>	= 164;
+    <KPAD>	= 156;
+    <LALT>	= 172;
+    <RALT>	= 178;
+    <RCTL>	= 173;
+};
+
+xkb_keycodes "lk443" {
+    include "digital/lk(lk44x)"
+    <BKSL>	= 247;
+    indicator 3 = "Caps Lock";
+    indicator 4 = "Scroll Lock";
+    indicator 5 = "Num Lock";
+};
+
+xkb_keycodes "lk444" {
+    include "digital/lk(lk44x)"
+    <BKSL>	= 201;
+    <AC12>	= 247;
+    indicator 3 = "Caps Lock";
+    indicator 4 = "Scroll Lock";
+    indicator 5 = "Num Lock";
+};
+
+// LK201-LT = lk201
+// LK421-AJ = lk421  +AB11
+// LK421-JJ = lk421aj+MUHE+KANJ+HIRA
+// LK401-AJ = lk401
+// LK401-BJ = lk401  +MUHE+KANJ+HIRA
+// LK401-JJ = lk401bj+AB11
+// LK401-LT = lk401
+// LK441-LT = lk443
+
+xkb_keycodes "lk421aj" {
+    include "digital/lk(lk421)"
+    <AB11>  = 252;
+};
+
+xkb_keycodes "lk421jj" {
+    include "digital/lk(lk421aj)"
+    <MUHE>  = 94;
+    <KANJ>  = 95;
+    <HIRA>  = 97;
+};
+
+xkb_keycodes "lk401bj" {
+    include "digital/lk(lk401)"
+    <MUHE>  = 94;
+    <KANJ>  = 95;
+    <HIRA>  = 97;
+};
+
+xkb_keycodes "lk401jj" {
+    include "digital/lk(lk401bj)"
+    <AB11>  = 252;
+};
diff --git a/keycodes/digital.vndr/pc b/keycodes/digital.vndr/pc
new file mode 100644
index 00000000..b0aebc3e
--- /dev/null
+++ b/keycodes/digital.vndr/pc
@@ -0,0 +1,280 @@
+// $Xorg: pc,v 1.3 2000/08/17 19:54:38 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:13:25  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.3  1995/10/25  21:00:14  William_Walker
+// 	Add pc104-key support
+// 	[1995/10/23  15:46:21  William_Walker]
+//
+// Revision 1.1.6.2  1995/08/07  17:40:37  William_Walker
+// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// 	[1995/08/06  14:06:28  William_Walker]
+// 
+// Revision 1.1.2.4  1995/08/05  15:25:56  William_Walker
+// 	Upgrade to XKB protocol 0.62
+// 	[1995/08/05  14:40:02  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/27  12:17:32  William_Walker
+// 	     Rename <TLDE> to ISO9995 compliant <AE00>.
+// 	[1995/06/26  20:24:07  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05  19:21:31  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:07:34  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: pc  Revision: /main/3  (DEC) Date: 1996/01/24 12:13:36 
+// 
+xkb_keycodes "pc_common" {
+    // "Function" keys
+    <FK01>	= 9;
+    <FK02>	= 15;
+    <FK03>	= 23;
+    <FK04>	= 31;
+    <FK05>	= 39;
+    <FK06>	= 47;
+    <FK07>	= 55;
+    <FK08>	= 63;
+    <FK09>	= 71;
+    <FK10>	= 79;
+    <FK11>	= 86;
+    <FK12>	= 94;
+
+    // "Editing" keys
+
+    <UP>	= 99;
+    <LEFT>	= 97;
+    <DOWN>	= 96;
+    <RGHT>	= 106;
+
+    // "Keypad" keys
+    <KP7>	= 108;
+    <KP8>	= 117;
+    <KP9>	= 125;
+
+    <KP4>	= 107;
+    <KP5>	= 115;
+    <KP6>	= 116;
+
+    <KP1>	= 105;
+    <KP2>	= 114;
+    <KP3>	= 122;
+    <KPEN>	= 121;
+
+    <KP0>	= 112;
+    <KPDL>	= 113;
+
+    // "Alphanumeric" keys
+    <AE01>	= 22;
+    <AE02>	= 30;
+    <AE03>	= 38;
+    <AE04>	= 37;
+    <AE05>	= 46;
+    <AE06>	= 54;
+    <AE07>	= 61;
+    <AE08>	= 62;
+    <AE09>	= 70;
+    <AE10>	= 69;
+    <AE11>	= 78;
+    <AE12>	= 85;
+    <BKSP>	= 102;
+
+    <TAB>	= 13;
+    <AD01>	= 21;
+    <AD02>	= 29;
+    <AD03>	= 36;
+    <AD04>	= 45;
+    <AD05>	= 44;
+    <AD06>	= 53;
+    <AD07>	= 60;
+    <AD08>	= 67;
+    <AD09>	= 68;
+    <AD10>	= 77;
+    <AD11>	= 84;
+    <AD12>	= 91;
+
+    <CAPS>	= 20;
+    <AC01>	= 28;
+    <AC02>	= 27;
+    <AC03>	= 35;
+    <AC04>	= 43;
+    <AC05>	= 52;
+    <AC06>	= 51;
+    <AC07>	= 59;
+    <AC08>	= 66;
+    <AC09>	= 75;
+    <AC10>	= 76;
+    <AC11>	= 82;
+    <RTRN>	= 90;
+
+    <LFSH>	= 18;
+    <AB01>	= 26;
+    <AB02>	= 34;
+    <AB03>	= 33;
+    <AB04>	= 42;
+    <AB05>	= 50;
+    <AB06>	= 49;
+    <AB07>	= 58;
+    <AB08>	= 65;
+    <AB09>	= 73;
+    <AB10>	= 74;
+    <RTSH>	= 89;
+
+    <LCTL>	= 17;
+    <LALT>	= 25;
+    <SPCE>	= 41;
+    <RALT>	= 57;
+
+    <LDM>	= 255; // Support R5 Lock Down Modifiers
+
+};
+
+xkb_keycodes "pc10x" {
+    include "digital/pc(pc_common)"
+    <ESC>	= 8;
+    <AE00>	= 14;
+    <PRSC>	= 87;
+    <SCLK>	= 95;
+    <PAUS>	= 98;
+    <INS>	= 103;
+    <HOME>	= 110;
+    <PGUP>	= 111;
+    <DELE>	= 100;
+    <END>	= 101;
+    <PGDN>	= 109;
+    <NMLK>	= 118;
+    <KPDV>	= 119;
+    <KPMU>	= 126;
+    <KPSU>	= 132;
+    <KPAD>	= 124;
+    <RCTL>	= 88;
+
+    alias <TLDE> = <AE00>;
+
+    indicator 3 = "Caps Lock";
+    indicator 4 = "Scroll Lock";
+};
+
+xkb_keycodes "pc101" {
+    include "digital/pc(pc10x)"
+    <BKSL>  = 92;
+    indicator 5 = "Num Lock";
+};
+
+
+xkb_keycodes "pc102" {
+    include "digital/pc(pc10x)"
+    <BKSL>  = 19;
+    <AC12>  = 83;
+    indicator 5 = "Num Lock";
+};
+
+xkb_keycodes "pc104" {
+    include "digital/pc(pc101)"
+    <LWIN>  = 139;
+    <RWIN>  = 140;
+    <MENU>  = 141;
+};
+
+xkb_keycodes "lk411_common" {
+    include "digital/pc(pc_common)"
+    <AE00>      = 8;
+    <AB00>      = 14;
+    <FK13>	= 24;
+    <FK14>	= 10;
+    <FK17>	= 16;
+    <FK18>	= 87;
+    <FK19>	= 95;
+    <FK20>	= 98;
+    <HELP>	= 11;
+    <DO>	= 12;
+    <FIND>	= 110;
+    <INS>	= 103;
+    <DELE>	= 100;
+    <SELE>	= 101;
+    <PGUP>	= 111;
+    <PGDN>	= 109;
+    <KPF1>	= 118;
+    <KPF2>	= 119;
+    <KPF3>	= 126;
+    <KPF4>	= 132;
+    <KPSU>	= 19;
+    <KPCO>	= 124;
+    <LCMP>	= 40;
+    <RCMP>	= 88;
+
+    alias <TLDE> = <AE00>;
+
+    indicator 3 = "Caps Lock";
+    indicator 4 = "Scroll Lock";
+};
+
+xkb_keycodes "lk411" {
+    include "digital/pc(lk411_common)"
+    <BKSL>	= 92;
+};
+
+xkb_keycodes "lk450" {
+    include	"digital/pc(lk411)"
+    indicator 2 = "Compose";
+    indicator 1 = "Wait";
+};
+
+// Japanese variants
+//
+// PCXAJ-AA = pc+BKSL+AC12+AB11+MUHE+KANJ+HIRA+indicator
+// LK411-AJ = lk411+MUHE+KANJ+HIRA
+// LK411-JJ = lk411+BKSL+AZ01+MUHE+KANJ+HIRA
+// LK411-LT = lk411
+
+xkb_keycodes "pcxajaa" {
+    include "digital/pc(pc10x)"
+    <BKSL>  = 93;
+    <AC12>  = 83;
+    <AB11>  = 81;
+    <MUHE>  = 133;
+    <KANJ>  = 134;
+    <HIRA>  = 135;
+    indicator 5 = "Group 2";
+};
+
+xkb_keycodes "lk411jj" {
+    include "digital/pc(lk411_common)"
+    <AB11>  = 81;
+    <BKSL>  = 83;
+    <MUHE>  = 133;
+    <KANJ>  = 134;
+    <HIRA>  = 135;
+};
+
+
diff --git a/keycodes/fujitsu b/keycodes/fujitsu
new file mode 100644
index 00000000..e0e63c6b
--- /dev/null
+++ b/keycodes/fujitsu
@@ -0,0 +1,187 @@
+// $Xorg: fujitsu,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+default xkb_keycodes "138" {
+
+    minimum= 8;
+    maximum= 156;
+
+    <ESC>  = 37;
+    <AE01> = 38;
+    <AE02> = 39;
+    <AE03> = 40;
+    <AE04> = 41;
+    <AE05> = 42;
+    <AE06> = 43;
+    <AE07> = 44;
+    <AE08> = 45;
+    <AE09> = 46;
+    <AE10> = 47;
+    <AE11> = 48;
+    <AE12> = 49;
+    <TLDE> = 50;
+    <BKSP> = 51;
+
+    <TAB>  = 61;
+    <AD01> = 62;
+    <AD02> = 63;
+    <AD03> = 64;
+    <AD04> = 65;
+    <AD05> = 66;
+    <AD06> = 67;
+    <AD07> = 68;
+    <AD08> = 69;
+    <AD09> = 70;
+    <AD10> = 71;
+    <AD11> = 72;
+    <AD12> = 73;
+
+    <LCTL> = 84;
+    <AC01> = 85;
+    <AC02> = 86;
+    <AC03> = 87;
+    <AC04> = 88;
+    <AC05> = 89;
+    <AC06> = 90;
+    <AC07> = 91;
+    <AC08> = 92;
+    <AC09> = 93;
+    <AC10> = 94;
+    <AC11> = 95;
+    <BKSL> = 96;
+    <RTRN> = 97;
+
+    <LFSH> = 107;
+    <AB01> = 108;
+    <AB02> = 109;
+    <AB03> = 110;
+    <AB04> = 111;
+    <AB05> = 112;
+    <AB06> = 113;
+    <AB07> = 114;
+    <AB08> = 115;
+    <AB09> = 116;
+    <AB10> = 117;
+    <AB11> = 52;
+    <RTSH> = 118;
+
+    <CAPS> = 127;
+    <LALT> = 27;
+    <LMTA> = 128;
+    <UNK4> = 125;
+    <SPCE> = 129;
+    <UNK5> = 10;
+    <RMTA> = 130;
+    <RALT> = 23;
+    <COMP> = 75;
+    <LNFD> = 119;
+    <UNK6> = 56;
+
+    <FK01> = 13;
+    <FK02> = 14;
+    <FK03> = 16;
+    <FK04> = 18;
+    <FK05> = 20;
+    <FK06> = 22;
+    <FK07> = 24;
+    <FK08> = 25;
+    <FK09> = 26;
+    <FK10> = 15;
+    <FK11> = 17;
+    <FK12> = 19;
+    <FK13> = 137;
+    <FK14> = 138;
+    <FK15> = 139;
+    <FK16> = 140;
+    <FK17> = 141;
+    <FK18> = 142;
+    <FK19> = 143;
+    <FK20> = 144;
+    <FK21> = 145;
+    <FK22> = 146;
+    <FK23> = 147;
+    <FK24> = 148;
+    <FK25> = 153;
+    <FK26> = 154;
+    <FK27> = 155;
+    <FK28> = 156;
+    <FK29> = 149;
+    <FK30> = 150;
+    <FK31> = 151;
+    <FK32> = 152;
+
+    <UNDO> = 34;
+    <COPY> = 59;
+    <PAST> = 81;
+     <CUT> = 105;
+    <HELP> = 126;
+
+    <BREA> = 9;
+    <PRSC> = 30;
+    <KNJI> = 21;
+    <PAUS> = 29;
+
+    <UNK0> = 82;
+    <UNK1> = 83;
+    <UNK2> = 12;
+    <PGUP> = 35;
+    <HOME> = 32;
+    <PGDN> = 36;
+    <UNK3> = 28;
+     <DEL> = 74;
+     <INS> = 60;
+      <UP> = 33;
+    <DOWN> = 103;
+    <LEFT> = 57;
+    <RGHT> = 80;
+    <EXEC> = 11;
+
+    <KPMU> = 55;
+    <KPDV> = 54;
+    <KPAD> = 133;
+    <KPSU> = 79;
+
+    <KP7>  = 76;
+    <KP8>  = 77;
+    <KP9>  = 78;
+    <KPEQ> = 53;
+
+    <KP4>  = 99;
+    <KP5>  = 100;
+    <KP6>  = 101;
+    <KPDC> = 58;
+
+    <KP1>  = 120;
+    <KP2>  = 121;
+    <KP3>  = 122;
+    <KPEN> = 98;
+
+    <KP0>  = 102;
+    <KP00> = 31;
+
+    <UNK7> = 123;
+    <UNK8> = 124;
+};
diff --git a/keycodes/hp b/keycodes/hp
new file mode 100644
index 00000000..0c98072d
--- /dev/null
+++ b/keycodes/hp
@@ -0,0 +1,271 @@
+// $Xorg: hp,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+default xkb_keycodes "hp-101" {
+
+    <TLDE> = 23;
+    <AE01> = 31;
+    <AE02> = 39;
+    <AE03> = 47;
+    <AE04> = 46;
+    <AE05> = 55;
+    <AE06> = 63;
+    <AE07> = 70;
+    <AE08> = 71;
+    <AE09> = 79;
+    <AE10> = 78;
+    <AE11> = 87;
+    <AE12> = 94;
+    <BKSP> = 111;
+
+    <TAB>  = 22;
+    <AD01> = 30;
+    <AD02> = 38;
+    <AD03> = 45;
+    <AD04> = 54;
+    <AD05> = 53;
+    <AD06> = 62;
+    <AD07> = 69;
+    <AD08> = 76;
+    <AD09> = 77;
+    <AD10> = 86;
+    <AD11> = 93;
+    <AD12> = 100;
+    <BKSL> = 101;
+
+    <CAPS> = 29;
+    <AC01> = 37;
+    <AC02> = 36;
+    <AC03> = 44;
+    <AC04> = 52;
+    <AC05> = 61;
+    <AC06> = 60;
+    <AC07> = 68;
+    <AC08> = 75;
+    <AC09> = 84;
+    <AC10> = 85;
+    <AC11> = 91;
+    <RTRN> = 99;
+
+    <LFSH> = 27;
+    <AB01> = 35;
+    <AB02> = 43;
+    <AB03> = 42;
+    <AB04> = 51;
+    <AB05> = 59;
+    <AB06> = 58;
+    <AB07> = 67;
+    <AB08> = 74;
+    <AB09> = 82;
+    <AB10> = 83;
+    <RTSH> = 98;
+
+    <LCTL> = 26;
+    <LALT> = 34;
+    <SPCE> = 50;
+    <RALT> = 66;
+    <RCTL> = 97;
+
+    <ESC>  = 17;
+    <FK01> = 16;
+    <FK02> = 24;
+    <FK03> = 32;
+    <FK04> = 40;
+    <FK05> = 48;
+    <FK06> = 56;
+    <FK07> = 64;
+    <FK08> = 72;
+    <FK09> = 80;
+    <FK10> = 88;
+    <FK11> = 95;
+    <FK12> = 103;
+
+    <PRSC> = 96;
+    <SCLK> = 104;
+    <PAUS> = 107;
+
+    <INS>  = 112;
+    <HOME> = 119;
+    <PGUP> = 120;
+    <DELE> = 109;
+    <END>  = 110;
+    <PGDN> = 118;
+
+    <UP>   = 108;
+    <LEFT> = 106;
+    <DOWN> = 105;
+    <RGHT> = 115;
+
+    <NMLK> = 127;
+    <KPDV> = 128;
+    <KPMU> = 135;
+    <KPSU> = 141;
+
+     <KP7> = 117;
+     <KP8> = 126;
+     <KP9> = 134;
+    <KPAD> = 133;
+
+     <KP4> = 116;
+     <KP5> = 124;
+     <KP6> = 125;
+
+     <KP1> = 114;
+     <KP2> = 123;
+     <KP3> = 131;
+    <KPEN> = 130;
+
+     <KP0> = 121;
+    <KPDL> = 122;
+
+    indicator 1 = "Caps Lock";
+    indicator 2 = "Num Lock";
+    indicator 3 = "Scroll Lock";
+};
+
+xkb_keycodes "hil" {
+
+    <TLDE> = 71;
+    <AE01> = 70;
+    <AE02> = 69;
+    <AE03> = 68;
+    <AE04> = 67;
+    <AE05> = 66;
+    <AE06> = 65;
+    <AE07> = 64;
+    <AE08> = 96;
+    <AE09> = 97;
+    <AE10> = 98;
+    <AE11> = 99;
+    <AE12> = 100;
+    <BKSP> = 101;
+
+    <TAB>  = 63;
+    <AD01> = 62;
+    <AD02> = 61;
+    <AD03> = 60;
+    <AD04> = 59;
+    <AD05> = 58;
+    <AD06> = 57;
+    <AD07> = 56;
+    <AD08> = 104;
+    <AD09> = 105;
+    <AD10> = 106;
+    <AD11> = 107;
+    <AD12> = 108;
+    <BKSL> = 109;
+
+    <CAPS> = 55;
+    <AC01> = 53;
+    <AC02> = 52;
+    <AC03> = 51;
+    <AC04> = 50;
+    <AC05> = 49;
+    <AC06> = 48;
+    <AC07> = 112;
+    <AC08> = 113;
+    <AC09> = 114;
+    <AC10> = 115;
+    <AC11> = 116;
+    <RTRN> = 117;
+
+    <LFSH> = 13;
+    <AB01> = 36;
+    <AB02> = 35;
+    <AB03> = 34;
+    <AB04> = 33;
+    <AB05> = 32;
+    <AB06> = 128;
+    <AB07> = 120;
+    <AB08> = 121;
+    <AB09> = 122;
+    <AB10> = 123;
+    <RTSH> = 12;
+
+    <LCTL> = 14;
+    <LALT> = 11;
+    <SPCE> = 129;
+    <RALT> = 10;
+    <PRSC> = 87;
+
+    <ESC>  = 39;
+    <BRK>  = 15;
+    <STOP> = 86;
+    <FK01> = 84;
+    <FK02> = 83;
+    <FK03> = 82;
+    <FK04> = 81;
+    <MENU> = 80;
+    <SYST> = 88;
+    <FK05> = 89;
+    <FK06> = 90;
+    <FK07> = 91;
+    <FK08> = 92;
+    <FK09> = 45;
+    <FK10> = 41;
+    <FK11> = 43;
+    <FK12> = 47;
+    <CLRL> = 94;
+    <CLR>  = 95;
+
+    <INSL> = 102;
+    <DELL> = 103;
+    <INSC> = 110;
+    <DELC> = 111;
+
+    <HOME> = 118;
+    <PGUP> = 119;
+    <PGDN> = 127;
+    <SELE> = 125;
+
+    <UP>   = 134;
+    <LEFT> = 132;
+    <DOWN> = 133;
+    <RGHT> = 135;
+
+    <KPDV> = 25;
+    <KPMU> = 29;
+    <KPAD> = 27;
+    <KPSU> = 31;
+
+     <KP7> = 21;
+     <KP8> = 17;
+     <KP9> = 19;
+    <KPEN> = 23;
+
+     <KP4> = 16;
+     <KP5> = 18;
+     <KP6> = 20;
+    <KPSP> = 22;
+
+     <KP1> = 24;
+     <KP2> = 26;
+     <KP3> = 28;
+    <KPTB> = 46;
+
+     <KP0> = 30;
+    <KPDL> = 44;
+};
diff --git a/keycodes/ibm b/keycodes/ibm
new file mode 100644
index 00000000..303d4b36
--- /dev/null
+++ b/keycodes/ibm
@@ -0,0 +1,151 @@
+// $Xorg: ibm,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+xkb_keycodes "rs6k-101" {
+
+    <TLDE> = 9;
+    <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> = 23;
+
+    <TAB>  = 24;
+    <AD01> = 25;
+    <AD02> = 26;
+    <AD03> = 27;
+    <AD04> = 28;
+    <AD05> = 29;
+    <AD06> = 30;
+    <AD07> = 31;
+    <AD08> = 32;
+    <AD09> = 33;
+    <AD10> = 34;
+    <AD11> = 35;
+    <AD12> = 36;
+    <BKSL> = 37;
+
+    <CAPS> = 38;
+    <AC01> = 39;
+    <AC02> = 40;
+    <AC03> = 41;
+    <AC04> = 42;
+    <AC05> = 43;
+    <AC06> = 44;
+    <AC07> = 45;
+    <AC08> = 46;
+    <AC09> = 47;
+    <AC10> = 48;
+    <AC11> = 49;
+    <RTRN> = 51;
+
+    <LFSH> = 52;
+    <AB01> = 54;
+    <AB02> = 55;
+    <AB03> = 56;
+    <AB04> = 57;
+    <AB05> = 58;
+    <AB06> = 59;
+    <AB07> = 60;
+    <AB08> = 61;
+    <AB09> = 62;
+    <AB10> = 63;
+    <RTSH> = 65;
+
+    <LCTL> = 66;
+    <LALT> = 68;
+    <SPCE> = 69;
+    <RALT> = 70;
+    <RCTL> = 72;
+
+    <ESC>  = 118;
+    <FK01> = 120;
+    <FK02> = 121;
+    <FK03> = 122;
+    <FK04> = 123;
+    <FK05> = 124;
+    <FK06> = 125;
+    <FK07> = 126;
+    <FK08> = 127;
+    <FK09> = 128;
+    <FK10> = 129;
+    <FK11> = 130;
+    <FK12> = 131;
+
+    <PRSC> = 132;
+    <SCLK> = 133;
+    <PAUS> = 134;
+
+    <INS>  = 83;
+    <HOME> = 88;
+    <PGUP> = 93;
+    <DELE> = 84;
+    <END>  = 89;
+    <PGDN> = 94;
+
+    <UP>   = 91;
+    <LEFT> = 87;
+    <DOWN> = 92;
+    <RGHT> = 97;
+
+    <NMLK> = 98;
+    <KPDV> = 103;
+    <KPMU> = 108;
+    <KPSU> = 113;
+
+     <KP7> = 99;
+     <KP8> = 104;
+     <KP9> = 109;
+    <KPAD> = 114;
+
+     <KP4> = 100;
+     <KP5> = 105;
+     <KP6> = 110;
+
+     <KP1> = 101;
+     <KP2> = 106;
+     <KP3> = 111;
+    <KPEN> = 116;
+
+     <KP0> = 107;
+    <KPDL> = 112;
+
+    indicator 1 = "Caps Lock";
+    indicator 2 = "Num Lock";
+    indicator 3 = "Scroll Lock";
+};
+xkb_keycodes "rs6k-102" {
+    include "ibm(rs6k-101)"
+    <LSGT> = 53;
+};
diff --git a/keycodes/macintosh b/keycodes/macintosh
new file mode 100644
index 00000000..5ed575c1
--- /dev/null
+++ b/keycodes/macintosh
@@ -0,0 +1,161 @@
+// $XConsortium: macintosh /main/10 1996/01/24 12:17:35 kaleb $
+//
+//Copyright (c) 1996  X Consortium
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and/or sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the X Consortium shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from the X Consortium.
+//
+// $XFree86: xc/programs/xkbcomp/keycodes/macintosh,v 1.4 2001/10/02 19:57:00 alanh Exp $
+//
+default xkb_keycodes "macintosh" {
+
+    minimum= 8;
+    maximum= 134;
+
+    <ESC>  = 61;
+    <TLDE> = 58;
+    <AE01> = 26;
+    <AE02> = 27;
+    <AE03> = 28;
+    <AE04> = 29;
+    <AE05> = 31;
+    <AE06> = 30;
+    <AE07> = 34;
+    <AE08> = 36;
+    <AE09> = 33;
+    <AE10> = 37;
+    <AE11> = 35;
+    <AE12> = 32;
+    <BKSP> = 59;
+
+    <TAB>  = 56;
+    <AD01> = 20;
+    <AD02> = 21;
+    <AD03> = 22;
+    <AD04> = 23;
+    <AD05> = 25;
+    <AD06> = 24;
+    <AD07> = 40;
+    <AD08> = 42;
+    <AD09> = 39;
+    <AD10> = 43;
+    <AD11> = 41;
+    <AD12> = 38;
+    <BKSL> = 50;
+
+    <CAPS> = 65;
+    <AC01> = 8;
+    <AC02> = 9;
+    <AC03> = 10;
+    <AC04> = 11;
+    <AC05> = 13;
+    <AC06> = 12;
+    <AC07> = 46;
+    <AC08> = 48;
+    <AC09> = 45;
+    <AC10> = 49;
+    <AC11> = 47;
+    <RTRN> = 44;
+
+    <LSGT> = 18;
+    <AB01> = 14;
+    <AB02> = 15;
+    <AB03> = 16;
+    <AB04> = 17;
+    <AB05> = 19;
+    <AB06> = 53;
+    <AB07> = 54;
+    <AB08> = 51;
+    <AB09> = 55;
+    <AB10> = 52;
+
+    <SPCE> = 57;
+
+    <LCTL> = 62;  // Left Control
+    <LALT> = 63;  // Left Option
+    <LFSH> = 64;  // Left Shift
+    <RALT> = 66;  // Left Command
+//    <RTSH> = 131; // Right Shift
+//    <RALT> = 132; // Right Command
+//    <RCTL> = 133; // Right Control
+//    <RMTA> = 134; // Right Option
+
+    <FK01> = 130;
+    <FK02> = 128;
+    <FK03> = 107;
+    <FK04> = 126;
+    <FK05> = 104;
+    <FK06> = 105;
+    <FK07> = 106;
+    <FK08> = 108;
+    <FK09> = 109;
+    <FK10> = 117;
+    <FK11> = 111;
+    <FK12> = 119;
+
+    <PRSC> = 113;
+    <SCLK> = 115;
+    <PAUS> = 121;
+
+    <INS>  = 122;
+    <HOME> = 123;
+    <PGUP> = 124;
+    <DELE> = 125;
+    <END>  = 127;
+    <PGDN> = 129;
+
+    <UP>   = 70;
+    <LEFT> = 67;
+    <DOWN> = 69;
+    <RGHT> = 68;
+
+    <NMLK> = 79;
+    <KPEQ> = 89;
+    <KPDV> = 83;
+    <KPMU> = 75;
+
+    <KP7>  = 97;
+    <KP8>  = 99;
+    <KP9>  = 100;
+    <KPSU> = 86;
+
+    <KP4>  = 94;
+    <KP5>  = 95;
+    <KP6>  = 96;
+    <KPAD> = 77;
+
+    <KP1>  = 91;
+    <KP2>  = 92;
+    <KP3>  = 93;
+    <KPEN> = 84;
+
+    <KP0>  = 90;
+    <KPDL> = 73;
+
+    indicator 3 = "Scroll Lock";
+    indicator 2 = "Num Lock";
+    indicator 1 = "Caps Lock";
+
+    alias <ALGR> = <RALT>;
+};
diff --git a/keycodes/powerpcps2 b/keycodes/powerpcps2
new file mode 100644
index 00000000..a607036c
--- /dev/null
+++ b/keycodes/powerpcps2
@@ -0,0 +1,134 @@
+// $XConsortium: xfree86 /main/4 1996/08/31 12:16:59 kaleb $
+// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.3.2.1 1999/06/21 09:45:28 hohndel Exp $
+default xkb_keycodes "powerpcps2" {
+
+    minimum= 8;
+    maximum= 135;
+
+    <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;
+    <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;
+    <BKSL> =  51;
+    <LSGT> =  94;
+
+    <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;
+    <SCLK> =  78;
+    <PAUS> = 127;
+
+    <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;
+
+    indicator 1 = "Caps Lock";
+    indicator 2 = "Num Lock";
+    indicator 3 = "Scroll Lock";
+
+    alias <ALGR> = <RALT>;
+};
+
diff --git a/keycodes/sgi.vndr/indigo b/keycodes/sgi.vndr/indigo
new file mode 100644
index 00000000..df868026
--- /dev/null
+++ b/keycodes/sgi.vndr/indigo
@@ -0,0 +1,140 @@
+// $Xorg: indigo,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
+default xkb_keycodes "pc101" {
+    minimum= 10;
+    maximum= 118;
+
+    <TLDE> = 62;
+    <AE01> = 15;
+    <AE02> = 21;
+    <AE03> = 22;
+    <AE04> = 29;
+    <AE05> = 30;
+    <AE06> = 37;
+    <AE07> = 38;
+    <AE08> = 45;
+    <AE09> = 46;
+    <AE10> = 53;
+    <AE11> = 54;
+    <AE12> = 61;
+    <BKSP> = 68;
+
+    <TAB>  = 16;
+    <AD01> = 17;
+    <AD02> = 23;
+    <AD03> = 24;
+    <AD04> = 31;
+    <AD05> = 32;
+    <AD06> = 39;
+    <AD07> = 40;
+    <AD08> = 47;
+    <AD09> = 48;
+    <AD10> = 55;
+    <AD11> = 56;
+    <AD12> = 63;
+    <RTRN> = 58;
+
+    <CAPS> = 11;
+    <AC01> = 18;
+    <AC02> = 19;
+    <AC03> = 25;
+    <AC04> = 26;
+    <AC05> = 33;
+    <AC06> = 34;
+    <AC07> = 41;
+    <AC08> = 42;
+    <AC09> = 49;
+    <AC10> = 50;
+    <AC11> = 57;
+
+    <LFSH> = 13;
+    <AB01> = 27;
+    <AB02> = 28;
+    <AB03> = 35;
+    <AB04> = 36;
+    <AB05> = 43;
+    <AB06> = 44;
+    <AB07> = 51;
+    <AB08> = 52;
+    <AB09> = 59;
+    <AB10> = 60;
+    <RTSH> = 12;
+    <BKSL> = 64;
+
+    <LALT> = 91;
+    <LCTL> = 10;
+    <SPCE> = 90;
+    <RCTL> = 93;
+    <RALT> = 92;
+
+    <ESC>  = 14;
+    <FK01> = 94;
+    <FK02> = 95;
+    <FK03> = 96;
+    <FK04> = 97;
+    <FK05> = 98;
+    <FK06> = 99;
+    <FK07> = 100;
+    <FK08> = 101;
+    <FK09> = 102;
+    <FK10> = 103;
+    <FK11> = 104;
+    <FK12> = 105;
+
+    <PRSC> = 106;
+    <SCLK> = 107;
+    <PAUS> = 108;
+
+    <INS>  = 109;
+    <HOME> = 110;
+    <PGUP> = 111;
+    <DELE> = 69;
+    <END>  = 112;
+    <PGDN> = 113;
+
+    <UP>   = 88;
+    <LEFT> = 80;
+    <DOWN> = 81;
+    <RGHT> = 87;
+
+    <NMLK> = 114;
+    <KPDV> = 115;
+    <KPMU> = 116;
+    <KPSU> = 83;
+
+    <KP7>  = 74;
+    <KP8>  = 75;
+    <KP9>  = 82;
+    <KPAD> = 117;
+
+    <KP4>  = 70;
+    <KP5>  = 76;
+    <KP6>  = 77;
+
+    <KP1>  = 65;
+    <KP2>  = 71;
+    <KP3>  = 72;
+    <KPEN> = 89;
+
+    <KP0>  = 66;
+    <KPDL> = 73;
+
+    alias <AE00> = <TLDE>;
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+    alias <AA01> = <LALT>;
+    alias <AA09> = <RALT>;
+    alias <ALGR> = <RALT>;
+    alias <AA12> = <RCTL>;
+
+    virtual indicator 1 = "L1";
+    virtual indicator 2 = "L2";
+    virtual indicator 3 = "L3";
+    virtual indicator 4 = "L4";
+    indicator 5 = "Caps Lock";
+    indicator 6 = "Num Lock";
+    indicator 7 = "Scroll Lock";
+};
+xkb_keycodes "pc102" {
+    include "sgi/indigo(pc101)"
+    <LSGT> = 118;
+};
diff --git a/keycodes/sgi.vndr/indy b/keycodes/sgi.vndr/indy
new file mode 100644
index 00000000..f59609d8
--- /dev/null
+++ b/keycodes/sgi.vndr/indy
@@ -0,0 +1,203 @@
+// $Xorg: indy,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
+default xkb_keycodes "universal" {
+    minimum= 15;
+    maximum= 149;
+    include "sgi/indy(pc105)"
+    alternate <BKSL> = 91;
+    alternate <BKSL> = 100;
+    alternate <BKSL> = 101;
+};
+xkb_keycodes "pc101" {
+    minimum= 15;
+    maximum= 149;
+
+    <TLDE> = 22;
+    <AE01> = 30;
+    <AE02> = 38;
+    <AE03> = 46;
+    <AE04> = 45;
+    <AE05> = 54;
+    <AE06> = 62;
+    <AE07> = 69;
+    <AE08> = 70;
+    <AE09> = 78;
+    <AE10> = 77;
+    <AE11> = 86;
+    <AE12> = 93;
+    <BKSP> = 110;
+
+    <TAB>  = 21;
+    <AD01> = 29;
+    <AD02> = 37;
+    <AD03> = 44;
+    <AD04> = 53;
+    <AD05> = 52;
+    <AD06> = 61;
+    <AD07> = 68;
+    <AD08> = 75;
+    <AD09> = 76;
+    <AD10> = 85;
+    <AD11> = 92;
+    <AD12> = 99;
+    <RTRN> = 98;
+
+    <CAPS> = 28;
+    <AC01> = 36;
+    <AC02> = 35;
+    <AC03> = 43;
+    <AC04> = 51;
+    <AC05> = 60;
+    <AC06> = 59;
+    <AC07> = 67;
+    <AC08> = 74;
+    <AC09> = 83;
+    <AC10> = 84;
+    <AC11> = 90;
+
+    <LFSH> = 26;
+    <AB01> = 34;
+    <AB02> = 42;
+    <AB03> = 41;
+    <AB04> = 50;
+    <AB05> = 58;
+    <AB06> = 57;
+    <AB07> = 66;
+    <AB08> = 73;
+    <AB09> = 81;
+    <AB10> = 82;
+    <RTSH> = 97;
+    <BKSL> = 100;
+
+    <LALT> = 33;
+    <LCTL> = 25;
+    <SPCE> = 49;
+    <RCTL> = 96;
+    <RALT> = 65;
+
+    <ESC>  = 16;
+    <FK01> = 15;
+    <FK02> = 23;
+    <FK03> = 31;
+    <FK04> = 39;
+    <FK05> = 47;
+    <FK06> = 55;
+    <FK07> = 63;
+    <FK08> = 71;
+    <FK09> = 79;
+    <FK10> = 87;
+    <FK11> = 94;
+    <FK12> = 102;
+
+    <PRSC> = 95;
+    <SCLK> = 103;
+    <PAUS> = 106;
+
+    <INS>  = 111;
+    <HOME> = 118;
+    <PGUP> = 119;
+    <DELE> = 108;
+    <END>  = 109;
+    <PGDN> = 117;
+
+    <UP>   = 107;
+    <LEFT> = 105;
+    <DOWN> = 104;
+    <RGHT> = 114;
+
+    <NMLK> = 126;
+    <KPDV> = 127;
+    <KPMU> = 134;
+    <KPSU> = 140;
+
+    <KP7>  = 116;
+    <KP8>  = 125;
+    <KP9>  = 133;
+    <KPAD> = 132;
+
+    <KP4>  = 115;
+    <KP5>  = 123;
+    <KP6>  = 124;
+
+    <KP1>  = 113;
+    <KP2>  = 122;
+    <KP3>  = 130;
+    <KPEN> = 129;
+
+    <KP0>  = 120;
+    <KPDL> = 121;
+
+    alias <AE00> = <TLDE>;
+    alias <AC00> = <CAPS>;
+    alias <AA00> = <LCTL>;
+    alias <AA01> = <LALT>;
+    alias <AA09> = <RALT>;
+    alias <ALGR> = <RALT>;
+    alias <AA12> = <RCTL>;
+
+    virtual indicator 1 = "L1";
+    virtual indicator 2 = "L2";
+    virtual indicator 3 = "L3";
+    virtual indicator 4 = "L4";
+    indicator 5 = "Caps Lock";
+    indicator 6 = "Num Lock";
+    indicator 7 = "Scroll Lock";
+
+};
+xkb_keycodes "pc102" {
+    <BKSL> = 91;
+    <LSGT> = 27;
+    augment "sgi/indy(pc101)"
+    maximum= 149;
+    minimum= 15;
+};
+xkb_keycodes "pc104" {
+    include "sgi/indy(pc101)"
+    minimum= 15;
+    maximum= 149;
+
+    // These key names are here to support so-called "Windows95"
+    // keyboards like the Microsoft Natural keyboard.
+    <LWIN> = 147;
+    <RWIN> = 148;
+    <MENU> = 149;
+};
+xkb_keycodes "pc105" {
+    <LSGT> = 27;
+    augment "sgi/indy(pc104)"
+    minimum= 15;
+    maximum= 149;
+};
+xkb_keycodes "jp106" {
+    <HZTG> = 22;
+    <AB11> = 89;
+    <AC12> = 91;
+    <NFER> = 141;
+    <XFER> = 142;
+    <HKTG> = 143;
+    alias <TLDE> = <HZTG>;
+    alias <AE00> = <HZTG>;
+    alias <AE13> = <BKSL>;
+    augment "sgi/indy(pc101)"
+    minimum= 15;
+    maximum= 149;
+};
+// can be combined with any other "indy" keycode
+// description to add virtual keys which can be
+// used to implement an overlay-based numeric
+// keypad.
+partial hidden xkb_keycodes "overlayKeypad" {
+    <KO7> = 17;
+    <KO8> = 18;
+    <KO9> = 19;
+    <KO6> = 146;
+    <KO5> = 145;
+    <KO4> = 144;
+    <KO1> = 136;
+    <KO2> = 137;
+    <KO3> = 138;
+    <KO0> = 135;
+    <KODL> = 139;
+};
+partial hidden xkb_keycodes "shiftLock" {
+    indicator 5 = "Shift Lock";
+};
diff --git a/keycodes/sgi.vndr/iris b/keycodes/sgi.vndr/iris
new file mode 100644
index 00000000..30375e9b
--- /dev/null
+++ b/keycodes/sgi.vndr/iris
@@ -0,0 +1,11 @@
+// $Xorg: iris,v 1.3 2000/08/17 19:54:39 cpqbld Exp $
+default xkb_keycodes "iris" {
+    include "sgi/indigo(pc101)"
+    indicator 1 = "L1";
+    indicator 2 = "L2";
+    indicator 3 = "L3";
+    indicator 4 = "L4";
+    indicator 5 = "Caps Lock";
+    indicator 6 = "Num Lock";
+    indicator 7 = "Scroll Lock";
+};
diff --git a/keycodes/sony b/keycodes/sony
new file mode 100644
index 00000000..0e720b42
--- /dev/null
+++ b/keycodes/sony
@@ -0,0 +1,142 @@
+// $Xorg: sony,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+xkb_keycodes "nwp5461" {
+
+     <ESC> = 18;
+    <AE01> = 19;
+    <AE02> = 20;
+    <AE03> = 21;
+    <AE04> = 22;
+    <AE05> = 23;
+    <AE06> = 24;
+    <AE07> = 25;
+    <AE08> = 26;
+    <AE09> = 27;
+    <AE10> = 28;
+    <AE11> = 29;
+    <AE12> = 30;
+    <BKSL> = 31;
+    <BKSP> = 32;
+
+    <TAB>  = 33;
+    <AD01> = 34;
+    <AD02> = 35;
+    <AD03> = 36;
+    <AD04> = 37;
+    <AD05> = 38;
+    <AD06> = 39;
+    <AD07> = 40;
+    <AD08> = 41;
+    <AD09> = 42;
+    <AD10> = 43;
+    <AD11> = 44;
+    <AD12> = 45;
+    <DELE> = 46;
+
+    <LCTL> = 47;
+    <AC01> = 48;
+    <AC02> = 49;
+    <AC03> = 50;
+    <AC04> = 51;
+    <AC05> = 52;
+    <AC06> = 53;
+    <AC07> = 54;
+    <AC08> = 55;
+    <AC09> = 56;
+    <AC10> = 57;
+    <AC11> = 58;
+    <TLDE> = 59;
+    <RTRN> = 60;
+
+    <LFSH> = 61;
+    <AB01> = 62;
+    <AB02> = 63;
+    <AB03> = 64;
+    <AB04> = 65;
+    <AB05> = 66;
+    <AB06> = 67;
+    <AB07> = 68;
+    <AB08> = 69;
+    <AB09> = 70;
+    <AB10> = 71;
+    <AB11> = 72;
+    <RTSH> = 73;
+
+    <LALT> = 74;
+    <CAPS> = 75;
+    <STOP> = 76;
+    <SPCE> = 77;
+     <CUT> = 78;
+    <EXEC> = 81;
+
+    <FK01> = 8;
+    <FK02> = 9;
+    <FK03> = 10;
+    <FK04> = 11;
+    <FK05> = 12;
+    <FK06> = 13;
+    <FK07> = 14;
+    <FK08> = 15;
+    <FK09> = 16;
+    <FK10> = 17;
+    <FK11> = 111;
+    <FK12> = 112;
+
+    <HELP> = 113;
+     <INS> = 114;
+     <CLR> = 115;
+    <PGUP> = 116;
+    <PGDN> = 117;
+
+    <KPTB> = 109;
+      <UP> = 95;
+    <LEFT> = 98;
+    <DOWN> = 99;
+    <RGHT> = 100;
+
+    <KPMU> = 107;
+    <KPDV> = 108;
+    <KPAD> = 89;
+
+     <KP7> = 82;
+     <KP8> = 83;
+     <KP9> = 84;
+    <KPSU> = 85;
+
+     <KP4> = 86;
+     <KP5> = 87;
+     <KP6> = 88;
+    <KPSP> = 93;
+
+     <KP1> = 90;
+     <KP2> = 91;
+     <KP3> = 92;
+    <KPEN> = 97;
+
+     <KP0> = 94;
+    <KPDC> = 96;
+};
diff --git a/keycodes/sun b/keycodes/sun
new file mode 100644
index 00000000..a74411ad
--- /dev/null
+++ b/keycodes/sun
@@ -0,0 +1,819 @@
+// $Xorg: sun,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keycodes/sun,v 3.5 2001/12/14 20:02:00 dawes Exp $
+//
+default xkb_keycodes "type4" {
+
+    minimum= 8;
+    maximum= 132;
+
+    <ESC>  = 36;
+    <AE01> = 37;
+    <AE02> = 38;
+    <AE03> = 39;
+    <AE04> = 40;
+    <AE05> = 41;
+    <AE06> = 42;
+    <AE07> = 43;
+    <AE08> = 44;
+    <AE09> = 45;
+    <AE10> = 46;
+    <AE11> = 47;
+    <AE12> = 48;
+    <TLDE> = 49;
+    <BKSP> = 50;
+
+    <TAB>  = 60;
+    <AD01> = 61;
+    <AD02> = 62;
+    <AD03> = 63;
+    <AD04> = 64;
+    <AD05> = 65;
+    <AD06> = 66;
+    <AD07> = 67;
+    <AD08> = 68;
+    <AD09> = 69;
+    <AD10> = 70;
+    <AD11> = 71;
+    <AD12> = 72;
+    <DELE> = 73;
+
+    <LCTL> = 83;
+    <AC01> = 84;
+    <AC02> = 85;
+    <AC03> = 86;
+    <AC04> = 87;
+    <AC05> = 88;
+    <AC06> = 89;
+    <AC07> = 90;
+    <AC08> = 91;
+    <AC09> = 92;
+    <AC10> = 93;
+    <AC11> = 94;
+    <BKSL> = 95;
+    <RTRN> = 96;
+
+    <LFSH> = 106;
+    <AB01> = 107;
+    <AB02> = 108;
+    <AB03> = 109;
+    <AB04> = 110;
+    <AB05> = 111;
+    <AB06> = 112;
+    <AB07> = 113;
+    <AB08> = 114;
+    <AB09> = 115;
+    <AB10> = 116;
+    <RTSH> = 117;
+    <LNFD> = 118;
+
+    <HELP> = 125;
+    <CAPS> = 126;
+    <LALT> = 26;
+    <LMTA> = 127;
+    <SPCE> = 128;
+    <RMTA> = 129;
+    <COMP> = 74;
+    <ALGR> = 20;
+    alias <RALT> = <ALGR>;
+
+    <FK01> = 12;
+    <FK02> = 13;
+    <FK03> = 15;
+    <FK04> = 17;
+    <FK05> = 19;
+    <FK06> = 21;
+    <FK07> = 23;
+    <FK08> = 24;
+    <FK09> = 25;
+    <FK10> = 14;
+    <FK11> = 16;
+    <FK12> = 18;
+
+    <STOP> = 8;
+    <AGAI> = 10;
+    <PROP> = 32;
+    <UNDO> = 33;
+    <FRNT> = 56;
+    <COPY> = 58;
+    <OPEN> = 79;
+    <PAST> = 80;
+    <FIND> = 102;
+    <CUT>  = 104;
+
+    <PRSC> = 29;
+    <SCLK> = 30;
+    <PAUS> = 28;
+
+    <NMLK> = 105;
+    <KPEQ> = 52;
+    <KPDV> = 53;
+    <KPMU> = 54;
+    <KPSU> = 78;
+
+    <KP7>  = 75;
+    <KP8>  = 76;
+    <KP9>  = 77;
+    <KPAD> = 132;
+
+    <KP4>  = 98;
+    <KP5>  = 99;
+    <KP6>  = 100;
+
+    <KP1>  = 119;
+    <KP2>  = 120;
+    <KP3>  = 121;
+    <KPEN> = 97;
+
+    <KP0>  = 101;
+    <KPDL> = 57;
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Compose";
+    indicator 2 = "Scroll Lock";
+    indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type5" {
+
+    minimum= 8;
+    maximum= 132;
+
+    <ESC>  = 36;
+    <AE01> = 37;
+    <AE02> = 38;
+    <AE03> = 39;
+    <AE04> = 40;
+    <AE05> = 41;
+    <AE06> = 42;
+    <AE07> = 43;
+    <AE08> = 44;
+    <AE09> = 45;
+    <AE10> = 46;
+    <AE11> = 47;
+    <AE12> = 48;
+    <TLDE> = 49;
+    <BKSP> = 50;
+
+    <TAB>  = 60;
+    <AD01> = 61;
+    <AD02> = 62;
+    <AD03> = 63;
+    <AD04> = 64;
+    <AD05> = 65;
+    <AD06> = 66;
+    <AD07> = 67;
+    <AD08> = 68;
+    <AD09> = 69;
+    <AD10> = 70;
+    <AD11> = 71;
+    <AD12> = 72;
+    <DELE> = 73;
+    <COMP> = 74;
+    <ALGR> = 20;
+    alias <RALT> = <ALGR>;
+
+    <LCTL> = 83;
+    <AC01> = 84;
+    <AC02> = 85;
+    <AC03> = 86;
+    <AC04> = 87;
+    <AC05> = 88;
+    <AC06> = 89;
+    <AC07> = 90;
+    <AC08> = 91;
+    <AC09> = 92;
+    <AC10> = 93;
+    <AC11> = 94;
+    <BKSL> = 95;
+    <RTRN> = 96;
+
+    <LFSH> = 106;
+    <AB01> = 107;
+    <AB02> = 108;
+    <AB03> = 109;
+    <AB04> = 110;
+    <AB05> = 111;
+    <AB06> = 112;
+    <AB07> = 113;
+    <AB08> = 114;
+    <AB09> = 115;
+    <AB10> = 116;
+    <RTSH> = 117;
+
+    <LALT> = 26;
+    <CAPS> = 126;
+    <LMTA> = 127;
+    <SPCE> = 128;
+    <RMTA> = 129;
+
+    <FK01> = 12;
+    <FK02> = 13;
+    <FK03> = 15;
+    <FK04> = 17;
+    <FK05> = 19;
+    <FK06> = 21;
+    <FK07> = 23;
+    <FK08> = 24;
+    <FK09> = 25;
+    <FK10> = 14;
+    <FK11> = 16;
+    <FK12> = 18;
+    <STOP> = 8;
+    <AGAI> = 10;
+    <PROP> = 32;
+    <UNDO> = 33;
+    <FRNT> = 56;
+    <COPY> = 58;
+    <OPEN> = 79;
+    <PAST> = 80;
+    <FIND> = 102;
+    <CUT>  = 104;
+
+    <PRSC> = 29;
+    <SCLK> = 30;
+    <PAUS> = 28;
+
+    <NMLK> = 105;
+    <KPDV> = 53;
+    <KPMU> = 54;
+    <KPSU> = 78;
+
+    <KP7>  = 75;
+    <KP8>  = 76;
+    <KP9>  = 77;
+    <KPAD> = 132;
+
+    <KP4>  = 98;
+    <KP5>  = 99;
+    <KP6>  = 100;
+
+    <KP1>  = 119;
+    <KP2>  = 120;
+    <KP3>  = 121;
+    <KPEN> = 97;
+
+    <KP0>  = 101;
+    <KPDL> = 57;
+
+    <UP>   = 27;
+    <LEFT> = 31;
+    <DOWN> = 34;
+    <RGHT> = 35;
+
+    <INS>  = 51;
+    <HOME> = 59;
+    <END>  = 81;
+    <PGUP> = 103;
+    <PGDN> = 130;
+    <HELP> = 125;
+
+    <MUTE> = 52;
+    <VOL-> = 9;
+    <VOL+> = 11;
+    <POWR> = 55;
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Compose";
+    indicator 2 = "Scroll Lock";
+    indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type6" {
+    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;
+    <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;
+    <BKSL> =  51;
+
+    <LALT> =  64;
+    <LCTL> =  37;
+    <SPCE> =  65;
+    <ALGR> = 113;
+    alias <RALT> = <ALGR>;
+
+    <LMTA> = 115;
+    <RMTA> = 116;
+    <COMP> = 117;
+
+    <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> = 111;
+    <SCLK> =  78;
+    <PAUS> = 110;
+
+    <INS>  = 106;
+    <HOME> =  97;
+    <PGUP> =  99;
+    <DELE> = 107;
+    <END>  = 103;
+    <PGDN> = 105;
+
+    <UP>   =  98;
+    <LEFT> = 100;
+    <DOWN> = 104;
+    <RGHT> = 102;
+
+    <NMLK> =  77;
+    <KPDV> = 112;
+    <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> = 108;
+
+    <KP0>  =  90;
+    <KPDL> =  91;
+
+    <STOP> = 222;
+    <AGAI> = 223;
+    <PROP> = 224;
+    <UNDO> = 225;
+    <FRNT> = 226;
+    <COPY> = 227;
+    <OPEN> = 228;
+    <PAST> = 229;
+    <FIND> = 230;
+    <CUT>  = 231;
+
+    <HELP> = 232;
+
+    <MUTE> = 165;
+    <VOL-> = 159;
+    <VOL+> = 158;
+    <POWR> = 160;
+
+    indicator 1 = "Caps Lock";
+    indicator 2 = "Num Lock";
+    indicator 3 = "Scroll Lock";
+};
+
+xkb_keycodes "type4_euro" {
+    include "sun(type4)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type5_euro" {
+    include "sun(type5)"
+    <LSGT> = 131;
+};
+
+xkb_keycodes "type6_euro" {
+    include "sun(type6)"
+    <LSGT> =  94;
+};
+
+xkb_keycodes "type5_se" {
+
+    minimum= 8;
+    maximum= 132;
+
+    // Row G
+    <HELP> = 125;
+    //
+    <ESC>  = 36;
+    //
+    <FK01> = 12;
+    <FK02> = 13;
+    <FK03> = 15;
+    <FK04> = 17;
+    //
+    <FK05> = 19;
+    <FK06> = 21;
+    <FK07> = 23;
+    <FK08> = 24;
+    //
+    <FK09> = 25;
+    <FK10> = 14;
+    <FK11> = 16;
+    <FK12> = 18;
+    //
+    <PRSC> = 29;
+    <SCLK> = 30;
+    <PAUS> = 28;
+    //
+    <MUTE> = 52;
+    <VOL-> = 9;
+    <VOL+> = 11;
+    <POWR> = 55;
+    // End Row G
+
+    // Row F
+    //
+    // End Row F
+
+    // Row E
+    <STOP> = 8;
+    <AGAI> = 10;
+    //
+    <AE00> = 49;
+    alias <TLDE> = <AE00>;
+    <AE01> = 37;
+    <AE02> = 38;
+    <AE03> = 39;
+    <AE04> = 40;
+    <AE05> = 41;
+    <AE06> = 42;
+    <AE07> = 43;
+    <AE08> = 44;
+    <AE09> = 45;
+    <AE10> = 46;
+    <AE11> = 47;
+    <AE12> = 48;
+    <BKSP> = 50;
+    //
+    <INS>  = 51;
+    <HOME> = 59;
+    <PGUP> = 103;
+    //
+    <NMLK> = 105;
+    <KPDV> = 53;
+    <KPMU> = 54;
+    <KPSU> = 78;
+    //End Row E
+
+    // Row D
+    <PROP> = 32;
+    <UNDO> = 33;
+    //
+    <AD00> = 60;
+    alias <TAB> = <AD00>;
+    <AD01> = 61;
+    <AD02> = 62;
+    <AD03> = 63;
+    <AD04> = 64;
+    <AD05> = 65;
+    <AD06> = 66;
+    <AD07> = 67;
+    <AD08> = 68;
+    <AD09> = 69;
+    <AD10> = 70;
+    <AD11> = 71;
+    <AD12> = 72;
+    //
+    <DELE> = 73;
+    <END>  = 81;
+    <PGDN> = 130;
+    //
+    <KP7>  = 75;
+    <KP8>  = 76;
+    <KP9>  = 77;
+    <KPAD> = 132;
+    // End Row D
+
+    // Row C
+    <FRNT> = 56;
+    <COPY> = 58;
+    //
+    <AC00> = 126;
+    alias <CAPS> = <AC00>;
+    <AC01> = 84;
+    <AC02> = 85;
+    <AC03> = 86;
+    <AC04> = 87;
+    <AC05> = 88;
+    <AC06> = 89;
+    <AC07> = 90;
+    <AC08> = 91;
+    <AC09> = 92;
+    <AC10> = 93;
+    <AC11> = 94;
+    <AC12> = 95;
+    alias <BKSL> = <AC12>;
+    <RTRN> = 96;
+    //
+    <KP4>  = 98;
+    <KP5>  = 99;
+    <KP6>  = 100;
+    // End Row C
+
+    // Row B
+    <OPEN> = 79;
+    <PAST> = 80;
+    //
+    <LFSH> = 106;
+    <AB00> = 131;
+    alias <LSGT> = <AB00>;
+    <AB01> = 107;
+    <AB02> = 108;
+    <AB03> = 109;
+    <AB04> = 110;
+    <AB05> = 111;
+    <AB06> = 112;
+    <AB07> = 113;
+    <AB08> = 114;
+    <AB09> = 115;
+    <AB10> = 116;
+    <RTSH> = 117;
+    //
+    <UP>   = 27;
+    //
+    <KP1>  = 119;
+    <KP2>  = 120;
+    <KP3>  = 121;
+    <KPEN> = 97;
+    // End Row B
+
+    // Row A
+    <FIND> = 102;
+    <CUT>  = 104;
+    //
+    <LCTL> = 83;
+    <LALT> = 26;
+    <LMTA> = 127;
+    <SPCE> = 128;
+    <RMTA> = 129;
+    <COMP> = 74;
+    <ALGR> = 20;
+    alias <RALT> = <ALGR>;
+    //
+    <LEFT> = 31;
+    <DOWN> = 34;
+    <RGHT> = 35;
+    //
+    <KP0>  = 101;
+    <KPDL> = 57;
+    // End Row A
+
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Compose";
+    indicator 2 = "Scroll Lock";
+    indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type5c_se" {
+    include "sun(type5_se)"
+};
+
+xkb_keycodes "type4__se" {
+
+    minimum= 8;
+    maximum= 132;
+
+    // Row F
+    <STOP> = 8;
+    <AGAI> = 10;
+    //
+    <FK01> = 12;
+    <FK02> = 13;
+    <FK03> = 15;
+    <FK04> = 17;
+    <FK05> = 19;
+    <FK06> = 21;
+    <FK07> = 23;
+    <FK08> = 24;
+    <FK09> = 25;
+    <FK10> = 14;
+    <FK11> = 16;
+    <FK12> = 18;
+    <AF13> = 95;
+    alias <TLDE> = <AF13>;
+    <AF14> = 22;
+    <DELE> = 73;
+    //
+    <PAUS> = 28;
+    <PRSC> = 29;
+    <SCLK> = 30;
+    <NMLK> = 105;
+    // End Row F
+
+    // Row E
+    <PROP> = 32;
+    <UNDO> = 33;
+    //
+    <AE00> = 36;
+    alias <ESC> = <AE00>;
+    <AE01> = 37;
+    <AE02> = 38;
+    <AE03> = 39;
+    <AE04> = 40;
+    <AE05> = 41;
+    <AE06> = 42;
+    <AE07> = 43;
+    <AE08> = 44;
+    <AE09> = 45;
+    <AE10> = 46;
+    <AE11> = 47;
+    <AE12> = 48;
+    <BKSP> = 50;
+    //
+    <KPEQ> = 52;
+    <KPDV> = 53;
+    <KPMU> = 54;
+    <KPSU> = 78;
+    // End Row E
+
+    // Row D
+    <FRNT> = 56;
+    <COPY> = 58;
+    //
+    <AD00> = 60;
+    alias <TAB> = <AD00>;
+    <AD01> = 61;
+    <AD02> = 62;
+    <AD03> = 63;
+    <AD04> = 64;
+    <AD05> = 65;
+    <AD06> = 66;
+    <AD07> = 67;
+    <AD08> = 68;
+    <AD09> = 69;
+    <AD10> = 70;
+    <AD11> = 71;
+    <AD12> = 72;
+    //
+    <KP7>  = 75;
+    <KP8>  = 76;
+    <KP9>  = 77;
+    <KPAD> = 132;
+    // End Row D
+
+    // Row C
+    <OPEN> = 79;
+    <PAST> = 80;
+    //
+    <AC00> = 83;
+    //    alias <CAPS> = <AC00>;
+    <AC01> = 84;
+    <AC02> = 85;
+    <AC03> = 86;
+    <AC04> = 87;
+    <AC05> = 88;
+    <AC06> = 89;
+    <AC07> = 90;
+    <AC08> = 91;
+    <AC09> = 92;
+    <AC10> = 93;
+    <AC11> = 94;
+    <AC12> = 49;
+    alias <BKSL> = <AC12>;
+    <RTRN> = 96;
+    //
+    <KP4>  = 98;
+    <KP5>  = 99;
+    <KP6>  = 100;
+    // End Row C
+
+    // Row B
+    <FIND> = 102;
+    <CUT>  = 104;
+    //
+    <LFSH> = 106;
+    <AB00> = 131;
+    alias <LSGT> = <AB00>;
+    <AB01> = 107;
+    <AB02> = 108;
+    <AB03> = 109;
+    <AB04> = 110;
+    <AB05> = 111;
+    <AB06> = 112;
+    <AB07> = 113;
+    <AB08> = 114;
+    <AB09> = 115;
+    <AB10> = 116;
+    <RTSH> = 117;
+    <LNFD> = 118;
+    //
+    <KP1>  = 119;
+    <KP2>  = 120;
+    <KP3>  = 121;
+    <KPEN> = 97;
+    // End Row B
+
+    // Row A
+    <HELP> = 125;
+    //
+    <AA00> = 126;
+    //    alias <LCTL> = <AA00>;
+    <LALT> = 26;
+    <LMTA> = 127;
+    <SPCE> = 128;
+    <RMTA> = 129;
+    <COMP> = 74;
+    <ALGR> = 20;
+    alias <RALT> = <ALGR>;
+    //
+    <KP0>  = 101;
+    <KPDL> = 57;
+    // End Row A
+
+    indicator 4 = "Caps Lock";
+    indicator 3 = "Compose";
+    indicator 2 = "Scroll Lock";
+    indicator 1 = "Num Lock";
+};
+
+xkb_keycodes "type4_se" {
+
+    include "sun(type4__se)"
+
+    alias <LCTL> = <AA00>;
+    alias <CAPS> = <AC00>;
+};
+
+xkb_keycodes "type4_se_swapctl" {
+
+    include "sun(type4__se)"
+
+    alias <LCTL> = <AC00>;
+    alias <CAPS> = <AA00>;
+};
diff --git a/keycodes/xfree86 b/keycodes/xfree86
new file mode 100644
index 00000000..6b1387a1
--- /dev/null
+++ b/keycodes/xfree86
@@ -0,0 +1,415 @@
+// $XdotOrg: xc/programs/xkbcomp/keycodes/xfree86,v 1.1.4.4 2004/03/05 13:41:30 eich Exp $
+// $Xorg: xfree86,v 1.3 2000/08/17 19:54:37 cpqbld Exp $
+
+
+
+
+// $XFree86: xc/programs/xkbcomp/keycodes/xfree86,v 3.28 2003/11/21 04:46:42 dawes Exp $
+
+// "standard" XFree86 codes
+// It seems that the "default" must be the first entry in the file.
+
+default xkb_keycodes "xfree86" {
+    include "xfree86(basic)"
+    <BKSL> =  51;
+    <LSGT> =  94;
+};
+
+xkb_keycodes "basic" {
+
+    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;
+    <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> = 109;
+    <RALT> = 113;
+    // Microsoft keyboard extra keys
+    <LWIN> = 115;
+    <RWIN> = 116;
+    <MENU> = 117;
+
+    <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> = 111;
+    <SYRQ> =  92;
+    <SCLK> =  78;
+    <PAUS> = 110;
+    <BRK>  = 114;
+
+    <INS>  = 106;
+    <HOME> =  97;
+    <PGUP> =  99;
+    <DELE> = 107;
+    <END>  = 103;
+    <PGDN> = 105;
+
+    <UP>   =  98;
+    <LEFT> = 100;
+    <DOWN> = 104;
+    <RGHT> = 102;
+
+    <NMLK> =  77;
+    <KPDV> = 112;
+    <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> = 108;
+
+    <KP0>  =  90;
+    <KPDL> =  91;
+    <KPEQ> = 126;
+
+    <FK13> =  118;
+    <FK14> =  119;
+    <FK15> =  120;
+    <FK16> =  121;
+    <FK17> =  122;
+    <KPDC> =  123;
+
+    // Keys that are generated on Japanese keyboards
+
+    alias <HZTG> = <TLDE>;	// Hankaku_Zenkaku toggle
+    <HKTG> =   208;		// Hiragana_Katakana toggle
+    <AB11> =   211;		// backslash/underscore
+    <XFER> =   129;		// Henkan
+    <NFER> =   131;		// Muhenkan
+    <AE13> =   133;		// Yen
+
+    // Keys that are generated on Korean keyboards
+
+    alias <HNGL> = <FK16>;     // Hangul Latin toggle
+    alias <HJCV> = <FK17>;     // Hangul to Hanja conversion
+
+    // 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.
+
+    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>;
+};
+
+// What keyboard is this?
+
+xkb_keycodes "102" {
+    include "xfree86(xfree86)"
+
+    // There will be warnings from xkbcomp because of multiple definitions.
+
+    <RALT> = 122;
+    <RCTL> = 123;
+
+    <PRSC> = 121;
+    <PAUS> = 118;
+
+    <INS>  = 131;
+    <HOME> = 135;
+    <PGUP> = 119;
+    <DELE> = 129;
+    <END>  = 130;
+    <PGDN> = 134;
+
+    <UP>   = 128;
+    <LEFT> = 132;
+    <DOWN> = 120;
+    <RGHT> = 133;
+
+    <KPDV> = 125;
+
+    <KPEN> = 124;
+};
+
+
+// For japanese 106 keyboard. by tsuka(tsuka@kawalab.dnj.ynu.ac.jp)
+//
+// All of the keycodes here are now in the basic "xfree86" set.
+//
+xkb_keycodes "jp106" {
+    include "xfree86(basic)"
+    <AC12> = 51;
+};
+
+
+// For brazilian ABNT2 keyboard. by Ricardo Y. Igarashi(iga@that.com.br)
+xkb_keycodes "abnt2" {
+    include "xfree86(basic)"
+    <BKSL> = 94;
+    <AC12> = 51;
+    <KPPT> = 134;
+};
+
+
diff --git a/keycodes/xfree98 b/keycodes/xfree98
new file mode 100644
index 00000000..6d34772f
--- /dev/null
+++ b/keycodes/xfree98
@@ -0,0 +1,155 @@
+// $Xorg: xfree98,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keycodes/xfree98,v 3.6 2001/01/17 23:45:51 dawes Exp $
+//
+default xkb_keycodes "pc98" {
+
+    minimum= 8;
+    maximum= 134;
+
+    <ESC>  =   8;
+    <AE01> =   9;
+    <AE02> =  10;
+    <AE03> =  11;
+    <AE04> =  12;
+    <AE05> =  13;
+    <AE06> =  14;
+    <AE07> =  15;
+    <AE08> =  16;
+    <AE09> =  17;
+    <AE10> =  18;
+    <AE11> =  19;
+    <AE12> =  20;
+    <BKSL> =  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;
+    <RTRN> =  36;
+
+    <LCTL> =  124;
+    <CAPS> =  121;
+    <AC01> =  37;
+    <AC02> =  38;
+    <AC03> =  39;
+    <AC04> =  40;
+    <AC05> =  41;
+    <AC06> =  42;
+    <AC07> =  43;
+    <AC08> =  44;
+    <AC09> =  45;
+    <AC10> =  46;
+    <AC11> =  47;
+    <AC12> =  48;
+
+    <LFSH> = 120;
+    <AB01> =  49;
+    <AB02> =  50;
+    <AB03> =  51;
+    <AB04> =  52;
+    <AB05> =  53;
+    <AB06> =  54;
+    <AB07> =  55;
+    <AB08> =  56;
+    <AB09> =  57;
+    <AB10> =  58;
+    <AB11> =  59;
+
+    <ALGR> = 122;
+    <LALT> = 123;
+    <NFER> =  89;
+    <SPCE> =  60;
+    <XFER> =  61;
+
+    <BRK>  = 104;
+    <PRSC> = 105;
+    <FK01> = 106;
+    <FK02> = 107;
+    <FK03> = 108;
+    <FK04> = 109;
+    <FK05> = 110;
+    <FK06> = 111;
+    <FK07> = 112;
+    <FK08> = 113;
+    <FK09> = 114;
+    <FK10> = 115;
+    <FK11> =  90;
+    <FK12> =  91;
+    <FK13> =  92;
+    <FK14> =  93;
+    <FK15> =  94;
+
+
+    <INS>  =  64;
+    <DELE> =  65;
+    <PGUP> =  63;
+    <PGDN> =  62;
+    <UP>   =  66;
+    <LEFT> =  67;
+    <RGHT> =  68;
+    <DOWN> =  69;
+
+    <HOME> =  70;
+    <HELP> =  71;
+
+    <KPSU> =  72;
+    <KPDV> =  73;
+
+    <KP7>  =  74;
+    <KP8>  =  75;
+    <KP9>  =  76;
+    <KPMU> =  77;
+
+    <KP4>  =  78;
+    <KP5>  =  79;
+    <KP6>  =  80;
+    <KPAD> =  81;
+
+    <KP1>  =  82;
+    <KP2>  =  83;
+    <KP3>  =  84;
+    <KPEQ> =  85;
+
+    <KP0>  =  86;
+    <KPSP> =  87;
+    <KPDC> =  88;
+
+    indicator 1 = "Caps Lock";
+    indicator 2 = "Kana";
+};
+
diff --git a/keymap/README b/keymap/README
new file mode 100644
index 00000000..adef966d
--- /dev/null
+++ b/keymap/README
@@ -0,0 +1,8 @@
+The keymap component provides a way how to set up one pre-defined keyboard
+mapping from a given set. It has been obsoleted by 'rules' component which
+is simplier and more flexible. The directory is preserved for compatibility
+reasons. Avoid using it if it is possible.
+
+
+
+/* $XFree86$ */
diff --git a/keymap/amiga b/keymap/amiga
new file mode 100644
index 00000000..d697a986
--- /dev/null
+++ b/keymap/amiga
@@ -0,0 +1,22 @@
+// $Xorg: amiga,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+
+
+
+
+// $XFree86: xc/programs/xkbcomp/keymap/amiga,v 3.2 1997/10/26 13:25:36 dawes Exp $
+
+default xkb_keymap "usa1" {
+    xkb_keycodes	{ include "amiga(usa1)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "amiga(usa1)"		};
+    xkb_geometry	{ include "amiga(usa1)"		};
+};
+
+xkb_keymap "de" {
+    xkb_keycodes	{ include "amiga(de)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "amiga(de)"		};
+    xkb_geometry	{ include "amiga(de)"		};
+};
diff --git a/keymap/ataritt b/keymap/ataritt
new file mode 100644
index 00000000..b801ac29
--- /dev/null
+++ b/keymap/ataritt
@@ -0,0 +1,21 @@
+// $Xorg: ataritt,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+
+
+
+
+// $XFree86: xc/programs/xkbcomp/keymap/ataritt,v 3.1 1997/10/26 13:25:37 dawes Exp $
+
+default xkb_keymap "us" {
+    xkb_keycodes	{ include "ataritt(us)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "ataritt(us)"		};
+    xkb_geometry	{ include "ataritt(us)"		};
+};
+xkb_keymap "de" {
+    xkb_keycodes	{ include "ataritt(de)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "ataritt(de)"		};
+    xkb_geometry	{ include "ataritt(de)"		};
+};
diff --git a/keymap/digital.vndr/us b/keymap/digital.vndr/us
new file mode 100644
index 00000000..00058cd8
--- /dev/null
+++ b/keymap/digital.vndr/us
@@ -0,0 +1,188 @@
+// $Xorg: us,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: us,v 
+// Revision 1.3  1996/06/18  09:14:51  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/10/25  21:00:53  William_Walker
+// 	Add pc104-key support
+// 	[1995/10/23  15:46:24  William_Walker]
+//
+// Revision 1.1.2.6  1995/06/27  12:18:05  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:26:19  William_Walker]
+// 
+// Revision 1.1.2.5  1995/06/05  19:23:12  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:14:04  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: us,v  Revision: 1.3  (DEC) Date: 1996/02/02 14:21:15
+// 
+
+// **************************************************************
+// *								*
+// * Keymaps for en_US.ISO8859-1 - English for U.S.		*
+// *								*
+// **************************************************************
+
+xkb_keymap "lk201" {
+    xkb_keycodes        { include "digital/lk(lk201)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(vt105)"		};
+    xkb_geometry	{ description = "Digital US LK201";
+			  include "digital/lk(lk201)"		};
+};
+
+xkb_keymap "lk401" {
+    xkb_keycodes        { include "digital/lk(lk401)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(vt108)"		};
+    xkb_geometry	{ description = "Digital US LK401";
+			  include "digital/lk(lk401)"		};
+};
+
+xkb_keymap "lk411" {
+    xkb_keycodes        { include "digital/pc(lk411)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(vt108)"		};
+    xkb_geometry	{ description = "Digital US LK411";
+			  include "digital/lk(lk401)"		};
+};
+
+xkb_keymap "lk421" {
+    xkb_keycodes        { include "digital/lk(lk421)"		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"	        	};
+    xkb_symbols         { include "digital/us(unix)"		};
+    xkb_geometry	{ description = "Digital US LK421";
+			  include "digital/unix(unix)"		};
+};
+
+xkb_keymap "lk441" {
+    xkb_keycodes        { include "digital/lk(lk443)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(lk44x)"		};
+    xkb_geometry	{ description = "Digital US LK441";
+			  include "digital/pc(pc101)"
+			  include "digital/pc(leds_alone)"	};
+};
+
+xkb_keymap "lk443" {
+    xkb_keycodes        { include "digital/lk(lk443)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(lk44x)"		};
+    xkb_geometry	{ description = "Digital US LK443";
+			  include "digital/pc(pc101)"
+			  include "digital/pc(leds_alone)"	};
+};
+
+xkb_keymap "lk44x" {
+    xkb_keycodes        { include "digital/lk(lk443)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(lk44x)"		};
+    xkb_geometry	{ description = "Digital US LK443";
+			  include "digital/pc(pc101)"
+			  include "digital/pc(leds_alone)"	};
+};
+
+xkb_keymap "lk450" {
+    xkb_keycodes        { include "digital/pc(lk450)" 		};
+    xkb_types           { include "default"    	        	};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(vt108)"		};
+    xkb_geometry	{ description = "Digital US LK450";
+			  include "digital/lk(lk450)"		};
+};
+
+xkb_keymap "pcxalaa" {
+    xkb_keycodes        { include "digital/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(pcxalaa)"		};
+    xkb_geometry	{ description = "Digital US PCXAL-AA";
+			  include "digital/pc(pc101)"
+			  include "digital/pc(leds_alone)"	};
+};
+
+xkb_keymap "pcxalfa" {
+    xkb_keycodes        { include "digital/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(pcxalfa)"		};
+    xkb_geometry	{ description = "Digital US PCXAL-FA";
+			  include "digital/pc(pc101)"
+			  include "digital/pc(leds_on_keys)"	};
+};
+
+xkb_keymap "pcxalga" {
+    xkb_keycodes        { include "digital/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(pcxalga)"		};
+    xkb_geometry	{ description = "Digital US PCXAL-GA";
+			  include "digital/pc(pc101)"
+			  include "digital/pc(leds_alone)"	};
+};
+
+xkb_keymap "pcxalka" {
+    xkb_keycodes        { include "digital/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(pcxalka)"		};
+    xkb_geometry	{ description = "Digital US PCXAL-KA";
+			  include "digital/pc(pc101)"
+			  include "digital/pc(leds_alone)"	};
+};
+
+xkb_keymap "pcxal" {
+    xkb_keycodes        { include "digital/pc(pc101)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(pcxal)"		};
+    xkb_geometry	{ description = "Digital US PCXAL";
+			  include "digital/pc(pc101)"
+			  include "digital/pc(leds_alone)"	};
+};
+
+xkb_keymap "mnk" {
+    xkb_keycodes        { include "digital/pc(pc104)" 		};
+    xkb_types           { include "default"   	 		};
+    xkb_compatibility   { include "default"			};
+    xkb_symbols         { include "digital/us(pc104)"		};
+    xkb_geometry	{ include "microsoft"			};
+};
diff --git a/keymap/macintosh b/keymap/macintosh
new file mode 100644
index 00000000..d230dca9
--- /dev/null
+++ b/keymap/macintosh
@@ -0,0 +1,17 @@
+// $XConsortium: macintosh /main/11 1996/03/07 13:42:13 kaleb $
+// $XFree86: xc/programs/xkbcomp/keymap/macintosh,v 1.1 1999/05/23 05:27:51 dawes Exp $
+default xkb_keymap "macintosh" {
+    xkb_keycodes	{ include "xfree86"				};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols		{ include "macintosh/us(extended)"		};
+    xkb_geometry	{ include "macintosh"				};
+};
+
+xkb_keymap "macintosh_old" {
+    xkb_keycodes	{ include "macintosh"				};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols		{ include "macintosh/us(extended)"		};
+    xkb_geometry	{ include "macintosh"				};
+};
diff --git a/keymap/sgi.vndr/be b/keymap/sgi.vndr/be
new file mode 100644
index 00000000..ef8c3dca
--- /dev/null
+++ b/keymap/sgi.vndr/be
@@ -0,0 +1,34 @@
+// $Xorg: be,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+be"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+be"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/bg b/keymap/sgi.vndr/bg
new file mode 100644
index 00000000..46cd5450
--- /dev/null
+++ b/keymap/sgi.vndr/bg
@@ -0,0 +1,19 @@
+// $Xorg: bg,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols  { 
+	include "us(pc_universal)+bg+group(shift_toggle)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols { 
+	include "us(pc102)+bg+group(shift_toggle)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
diff --git a/keymap/sgi.vndr/ca b/keymap/sgi.vndr/ca
new file mode 100644
index 00000000..9030e157
--- /dev/null
+++ b/keymap/sgi.vndr/ca
@@ -0,0 +1,33 @@
+// $Xorg: ca,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+ca"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
diff --git a/keymap/sgi.vndr/cz b/keymap/sgi.vndr/cz
new file mode 100644
index 00000000..b1c8598b
--- /dev/null
+++ b/keymap/sgi.vndr/cz
@@ -0,0 +1,21 @@
+// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+//
+//
+//
+// $XFree86$
+
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+cz"		};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc102)+cz"		};
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+
diff --git a/keymap/sgi.vndr/cz_qwerty b/keymap/sgi.vndr/cz_qwerty
new file mode 100644
index 00000000..a87e7d5a
--- /dev/null
+++ b/keymap/sgi.vndr/cz_qwerty
@@ -0,0 +1,21 @@
+// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+//
+//
+//
+// $XFree86$
+
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+cz_qwerty"  };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc102)+cz_qwerty"		};
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+
diff --git a/keymap/sgi.vndr/de b/keymap/sgi.vndr/de
new file mode 100644
index 00000000..1e4cfe73
--- /dev/null
+++ b/keymap/sgi.vndr/de
@@ -0,0 +1,34 @@
+// $Xorg: de,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal)+de"		};
+    xkb_geometry	{ include "sgi/indy(pc102)"			};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc102)+de"		};
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols {
+	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+
diff --git a/keymap/sgi.vndr/de_CH b/keymap/sgi.vndr/de_CH
new file mode 100644
index 00000000..093a5b10
--- /dev/null
+++ b/keymap/sgi.vndr/de_CH
@@ -0,0 +1,34 @@
+// $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+de_CH"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+de_CH(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+de_CH"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+de_CH(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/dk b/keymap/sgi.vndr/dk
new file mode 100644
index 00000000..9eceffd1
--- /dev/null
+++ b/keymap/sgi.vndr/dk
@@ -0,0 +1,34 @@
+// $Xorg: dk,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};
+    xkb_geometry	{ include "sgi/indy(pc102)"			};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc102)+dk"		};
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+
diff --git a/keymap/sgi.vndr/dvorak b/keymap/sgi.vndr/dvorak
new file mode 100644
index 00000000..a282cd18
--- /dev/null
+++ b/keymap/sgi.vndr/dvorak
@@ -0,0 +1,15 @@
+// $Xorg: dvorak,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};
+    xkb_geometry	{ include "sgi/indy(pc101)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc101)+dvorak"	};
+    xkb_geometry	{ include "sgi/indigo(pc101)"	};
+};
diff --git a/keymap/sgi.vndr/en_US b/keymap/sgi.vndr/en_US
new file mode 100644
index 00000000..446f5632
--- /dev/null
+++ b/keymap/sgi.vndr/en_US
@@ -0,0 +1,58 @@
+// $Xorg: en_US,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc_universal)"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"			};
+};
+xkb_keymap "indy101" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc_universal)"	};
+    xkb_geometry	{ include "sgi/indy(pc101)"	};
+};
+xkb_keymap "indy101_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};
+    xkb_geometry	{ include "sgi/indy(pc101)"			};
+};
+xkb_keymap "indy104" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc_universal)"	};
+    xkb_geometry	{ include "microsoft(natural)"	};
+};
+xkb_keymap "indy104_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};
+    xkb_geometry	{ include "microsoft(natural)"			};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc102_nodeadkeys)"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+
diff --git a/keymap/sgi.vndr/es b/keymap/sgi.vndr/es
new file mode 100644
index 00000000..a57750c9
--- /dev/null
+++ b/keymap/sgi.vndr/es
@@ -0,0 +1,34 @@
+// $Xorg: es,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+es"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+es"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/fi b/keymap/sgi.vndr/fi
new file mode 100644
index 00000000..bb0fd208
--- /dev/null
+++ b/keymap/sgi.vndr/fi
@@ -0,0 +1,34 @@
+// $Xorg: fi,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+fi"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/fr b/keymap/sgi.vndr/fr
new file mode 100644
index 00000000..ecf615f6
--- /dev/null
+++ b/keymap/sgi.vndr/fr
@@ -0,0 +1,34 @@
+// $Xorg: fr,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols  { 
+	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+fr"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/fr_CH b/keymap/sgi.vndr/fr_CH
new file mode 100644
index 00000000..3f825e04
--- /dev/null
+++ b/keymap/sgi.vndr/fr_CH
@@ -0,0 +1,34 @@
+// $Xorg: fr_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+fr_CH"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc_universal_nodeadkeys)+fr_CH(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+fr_CH"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+fr_CH(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/gb b/keymap/sgi.vndr/gb
new file mode 100644
index 00000000..5c7566cc
--- /dev/null
+++ b/keymap/sgi.vndr/gb
@@ -0,0 +1,34 @@
+// $Xorg: gb,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+gb"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/hu b/keymap/sgi.vndr/hu
new file mode 100644
index 00000000..92d31a89
--- /dev/null
+++ b/keymap/sgi.vndr/hu
@@ -0,0 +1,105 @@
+// $Xorg: hu,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"			};
+};
+xkb_keymap "indy_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+hu(basic)+group(toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_shift_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+hu(basic)+group(shift_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_ctrl_shift_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_ctrl_alt_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_caps_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+hu(basic)+group(toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_shift_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+hu(basic)+group(shift_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_ctrl_shift_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_ctrl_alt_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_caps_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
diff --git a/keymap/sgi.vndr/it b/keymap/sgi.vndr/it
new file mode 100644
index 00000000..17d6a106
--- /dev/null
+++ b/keymap/sgi.vndr/it
@@ -0,0 +1,34 @@
+// $Xorg: it,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+it"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+it"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/jp b/keymap/sgi.vndr/jp
new file mode 100644
index 00000000..c83900ae
--- /dev/null
+++ b/keymap/sgi.vndr/jp
@@ -0,0 +1,8 @@
+// $Xorg: jp,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(jp106)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "us(pc101)+sgi/jp"			};
+    xkb_geometry	{ include "sgi/indy(jp106)"			};
+};
diff --git a/keymap/sgi.vndr/no b/keymap/sgi.vndr/no
new file mode 100644
index 00000000..ed293d21
--- /dev/null
+++ b/keymap/sgi.vndr/no
@@ -0,0 +1,34 @@
+// $Xorg: no,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+no"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+no"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/pl b/keymap/sgi.vndr/pl
new file mode 100644
index 00000000..b75f1f3c
--- /dev/null
+++ b/keymap/sgi.vndr/pl
@@ -0,0 +1,29 @@
+// $Xorg: pl,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc_universal)+pl"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};
+    xkb_geometry	{ include "sgi/indy(pc102)"			};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc102)+pl"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
diff --git a/keymap/sgi.vndr/pt b/keymap/sgi.vndr/pt
new file mode 100644
index 00000000..eda00357
--- /dev/null
+++ b/keymap/sgi.vndr/pt
@@ -0,0 +1,34 @@
+// $Xorg: pt,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+pt"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/ru b/keymap/sgi.vndr/ru
new file mode 100644
index 00000000..6a2a1897
--- /dev/null
+++ b/keymap/sgi.vndr/ru
@@ -0,0 +1,105 @@
+// $Xorg: ru,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"			};
+    xkb_types		{ include "default"				};
+    xkb_compatibility	{ include "default"				};
+    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"			};
+};
+xkb_keymap "indy_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+ru(basic)+group(toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_shift_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+ru(basic)+group(shift_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_ctrl_shift_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_ctrl_alt_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_caps_toggle" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+ru(basic)+group(toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_shift_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+ru(basic)+group(shift_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_ctrl_shift_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_ctrl_alt_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+xkb_keymap "indigo_caps_toggle" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols { 
+	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
diff --git a/keymap/sgi.vndr/se b/keymap/sgi.vndr/se
new file mode 100644
index 00000000..3fe54e27
--- /dev/null
+++ b/keymap/sgi.vndr/se
@@ -0,0 +1,34 @@
+// $Xorg: se,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "en_US(pc_universal)+se"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indy_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+se"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+xkb_keymap "indigo_nodeadkeys" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
+
diff --git a/keymap/sgi.vndr/sk b/keymap/sgi.vndr/sk
new file mode 100644
index 00000000..89bd9b52
--- /dev/null
+++ b/keymap/sgi.vndr/sk
@@ -0,0 +1,21 @@
+// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+//
+//
+//
+// $XFree86$
+
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+sk"		};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc102)+sk"		};
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+
diff --git a/keymap/sgi.vndr/sk_qwerty b/keymap/sgi.vndr/sk_qwerty
new file mode 100644
index 00000000..9094cbc3
--- /dev/null
+++ b/keymap/sgi.vndr/sk_qwerty
@@ -0,0 +1,21 @@
+// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
+//
+//
+//
+// $XFree86$
+
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)+sk_qwerty"	};
+    xkb_geometry	{ include "sgi/indy(pc102)"		};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc102)+sk_qwerty"		};
+    xkb_geometry	{ include "sgi/indigo(pc102)"		};
+};
+
diff --git a/keymap/sgi.vndr/th b/keymap/sgi.vndr/th
new file mode 100644
index 00000000..b614913e
--- /dev/null
+++ b/keymap/sgi.vndr/th
@@ -0,0 +1,17 @@
+// $Xorg: th,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{
+	include "en_US(pc_universal)+th+group(shift_toggle)"
+    };
+    xkb_geometry	{ include "sgi/indy(pc102)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc102)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc102)+th+group(shift_toggle)"	};
+    xkb_geometry	{ include "sgi/indigo(pc102)"	};
+};
diff --git a/keymap/sgi.vndr/us b/keymap/sgi.vndr/us
new file mode 100644
index 00000000..2d704ca5
--- /dev/null
+++ b/keymap/sgi.vndr/us
@@ -0,0 +1,43 @@
+// $Xorg: us,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+default xkb_keymap "indy" {
+    xkb_keycodes	{ include "sgi/indy(universal)"		};
+    xkb_types		{ include "default"			};
+    xkb_compatibility	{ include "default"			};
+    xkb_symbols 	{ include "us(pc_universal)"		};
+    xkb_geometry	{ include "sgi/indy(pc101)"		};
+};
+xkb_keymap "indy101_euro" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc_universal)"	};
+    xkb_geometry	{ include "sgi/indy(pc101)"	};
+};
+xkb_keymap "indy_compose" {
+    xkb_keycodes	{ include "sgi/indy(universal)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc_universal)"	};
+    xkb_geometry	{ include "sgi/indy(pc101)"	};
+};
+xkb_keymap "indigo" {
+    xkb_keycodes	{ include "sgi/indigo(pc101)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc101)"		};
+    xkb_geometry	{ include "sgi/indigo(pc101)"	};
+};
+xkb_keymap "indigo_compose" {
+    xkb_keycodes	{ include "sgi/indigo(pc101)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc101compose)"	};
+    xkb_geometry	{ include "sgi/indigo(pc101)"	};
+};
+xkb_keymap "indigo101_compose" {
+    xkb_keycodes	{ include "sgi/indigo(pc101)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "us(pc101euro)"	};
+    xkb_geometry	{ include "sgi/indigo(pc101)"	};
+};
diff --git a/keymap/sony b/keymap/sony
new file mode 100644
index 00000000..5380c4e5
--- /dev/null
+++ b/keymap/sony
@@ -0,0 +1,33 @@
+// $Xorg: sony,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+xkb_keymap "news5000-nwp5461" {
+    xkb_keycodes	{ include "sony(nwp5461)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sony/us(nwp5461)"	};
+    xkb_geometry	{ include "sony(nwp5461)"	};
+};
diff --git a/keymap/sun.vndr/de b/keymap/sun.vndr/de
new file mode 100644
index 00000000..0b4bd53f
--- /dev/null
+++ b/keymap/sun.vndr/de
@@ -0,0 +1,78 @@
+// $Xorg: de,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+xkb_keymap "type4_de" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4)+iso9995-3(basic)+de"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_de_nodeadkeys" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_de_openlook" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4ol)+iso9995-3(basic)+de"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+default xkb_keymap "type5_de" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun5)+iso9995-3(basic)+de"
+    };
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
+xkb_keymap "type5_de_nodeadkeys" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" 
+    };
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
+xkb_keymap "type5_de_openlook" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)+iso9995-3+de"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/keymap/sun.vndr/es b/keymap/sun.vndr/es
new file mode 100644
index 00000000..ab29c434
--- /dev/null
+++ b/keymap/sun.vndr/es
@@ -0,0 +1,62 @@
+// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keymap/sun/es,v 1.2 2000/10/28 00:34:05 dawes Exp $
+//
+xkb_keymap "type4_es" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4)+iso9995-3(basic)+es"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_es_openlook" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4ol)+iso9995-3(basic)+es"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+default xkb_keymap "type5_es" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun5)+iso9995-3(basic)+es"
+    };
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
+xkb_keymap "type5_es_openlook" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)+iso9995-3+es"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/keymap/sun.vndr/fi b/keymap/sun.vndr/fi
new file mode 100644
index 00000000..3ca6003d
--- /dev/null
+++ b/keymap/sun.vndr/fi
@@ -0,0 +1,62 @@
+// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keymap/sun/fi,v 1.2 2000/10/28 00:34:05 dawes Exp $
+//
+xkb_keymap "type4_fi" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4)+iso9995-3(basic)+fi"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_fi_openlook" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4ol)+iso9995-3(basic)+fi"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+default xkb_keymap "type5_fi" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun5)+iso9995-3(basic)+fi"
+    };
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
+xkb_keymap "type5_fi_openlook" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)+iso9995-3+fi"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/keymap/sun.vndr/fr b/keymap/sun.vndr/fr
new file mode 100644
index 00000000..60be0d1d
--- /dev/null
+++ b/keymap/sun.vndr/fr
@@ -0,0 +1,62 @@
+// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keymap/sun/fr,v 1.2 2000/10/28 00:34:05 dawes Exp $
+//
+xkb_keymap "type4_fr" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4)+iso9995-3(basic)+fr"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_fr_openlook" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4ol)+iso9995-3(basic)+fr"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+default xkb_keymap "type5_fr" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun5)+iso9995-3(basic)+fr"
+    };
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
+xkb_keymap "type5_fr_openlook" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)+iso9995-3+fr"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/keymap/sun.vndr/no b/keymap/sun.vndr/no
new file mode 100644
index 00000000..d57fc49b
--- /dev/null
+++ b/keymap/sun.vndr/no
@@ -0,0 +1,62 @@
+// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keymap/sun/no,v 1.2 2000/10/28 00:34:05 dawes Exp $
+//
+xkb_keymap "type4_no" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4)+iso9995-3(basic)+no"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_no_openlook" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4ol)+iso9995-3(basic)+no"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+default xkb_keymap "type5_no" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun5)+iso9995-3(basic)+no"
+    };
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
+xkb_keymap "type5_no_openlook" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)+iso9995-3+no"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/keymap/sun.vndr/pl b/keymap/sun.vndr/pl
new file mode 100644
index 00000000..d672db78
--- /dev/null
+++ b/keymap/sun.vndr/pl
@@ -0,0 +1,62 @@
+// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keymap/sun/pl,v 1.2 2000/10/28 00:34:05 dawes Exp $
+//
+xkb_keymap "type4_pl" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4)+iso9995-3(basic)+pl"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_pl_openlook" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4ol)+iso9995-3(basic)+pl"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+default xkb_keymap "type5_pl" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun5)+iso9995-3(basic)+pl"
+    };
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
+xkb_keymap "type5_pl_openlook" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)+iso9995-3+pl"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/keymap/sun.vndr/ru b/keymap/sun.vndr/ru
new file mode 100644
index 00000000..9dead904
--- /dev/null
+++ b/keymap/sun.vndr/ru
@@ -0,0 +1,62 @@
+// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keymap/sun/ru,v 1.2 2000/10/28 00:34:05 dawes Exp $
+//
+xkb_keymap "type4_ru" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4)+iso9995-3(basic)+ru"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_ru_openlook" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4ol)+iso9995-3(basic)+ru"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+default xkb_keymap "type5_ru" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun5)+iso9995-3(basic)+ru"
+    };
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
+xkb_keymap "type5_ru_openlook" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)+iso9995-3+ru"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/keymap/sun.vndr/se b/keymap/sun.vndr/se
new file mode 100644
index 00000000..dd0a1670
--- /dev/null
+++ b/keymap/sun.vndr/se
@@ -0,0 +1,56 @@
+// $XFree86: xc/programs/xkbcomp/keymap/sun/se,v 1.2 1998/12/20 09:34:42 dawes Exp $
+
+default xkb_keymap "type5c_se_fixdollar" {
+    xkb_keycodes	{ include "sun(type5_se)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/se(sun5)+se(fixdollar)"
+    };
+    xkb_geometry	{ include "sun(type5c_se)"	};
+};
+xkb_keymap "type5c_se" {
+    xkb_keycodes	{ include "sun(type5_se)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/se(sun5)"
+    };
+    xkb_geometry	{ include "sun(type5c_se)"	};
+};
+xkb_keymap "type5_se" {
+    xkb_keycodes	{ include "sun(type5_se)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/se(sun5)"
+    };
+    xkb_geometry	{ include "sun(type5_se)"	};
+};
+xkb_keymap "type4_se_fixdollar_swapctl" {
+    xkb_keycodes	{ include "sun(type4_se_swapctl)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/se(sun4)+se(fixdollar)"
+    };
+    xkb_geometry	{ include "sun(type4_se)"	};
+};
+xkb_keymap "type4_se_fixdollar" {
+    xkb_keycodes	{ include "sun(type4_se)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/se(sun4)+se(fixdollar)"
+    };
+    xkb_geometry	{ include "sun(type4_se)"	};
+};
+xkb_keymap "type4_se" {
+    xkb_keycodes	{ include "sun(type4_se)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/se(sun4)"
+    };
+    xkb_geometry	{ include "sun(type4_se)"	};
+};
diff --git a/keymap/sun.vndr/uk b/keymap/sun.vndr/uk
new file mode 100644
index 00000000..d99e2ff4
--- /dev/null
+++ b/keymap/sun.vndr/uk
@@ -0,0 +1,62 @@
+// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keymap/sun/uk,v 1.2 2000/10/28 00:34:05 dawes Exp $
+//
+xkb_keymap "type4_uk" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4)+iso9995-3(basic)+uk"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_uk_openlook" {
+    xkb_keycodes	{ include "sun(type4_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun4ol)+iso9995-3(basic)+uk"
+    };
+    xkb_geometry	{ include "sun(type4)"		};
+};
+default xkb_keymap "type5_uk" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ 
+	include "sun/us(sun5)+iso9995-3(basic)+uk"
+    };
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
+xkb_keymap "type5_uk_openlook" {
+    xkb_keycodes	{ include "sun(type5_euro)"	};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)+iso9995-3+uk"	};
+    xkb_geometry	{ include "sun(type5euro)"	};
+};
diff --git a/keymap/sun.vndr/us b/keymap/sun.vndr/us
new file mode 100644
index 00000000..2133c21d
--- /dev/null
+++ b/keymap/sun.vndr/us
@@ -0,0 +1,68 @@
+// $Xorg: us,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+xkb_keymap "type4_us" {
+    xkb_keycodes	{ include "sun(type4)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun4)"	};
+    xkb_geometry	{ include "sun(type4)"		};
+};
+xkb_keymap "type4_us_openlook" {
+    xkb_keycodes	{ include "sun(type4)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun4ol)"	};
+    xkb_geometry	{ include "sun(type4)"		};
+};
+default xkb_keymap "type5_us" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5)"	};
+    xkb_geometry	{ include "sun(type5)"		};
+};
+xkb_keymap "type5_us_openlook" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)"	};
+    xkb_geometry	{ include "sun(type5)"		};
+};
+xkb_keymap "type5_unix" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5)"	};
+    xkb_geometry	{ include "sun(type5unix)"	};
+};
+xkb_keymap "type5_unix_openlook" {
+    xkb_keycodes	{ include "sun(type5)"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "sun/us(sun5ol)"	};
+    xkb_geometry	{ include "sun(type5unix)"	};
+};
diff --git a/keymap/xfree86 b/keymap/xfree86
new file mode 100644
index 00000000..e1967a1b
--- /dev/null
+++ b/keymap/xfree86
@@ -0,0 +1,362 @@
+// $XFree86: xc/programs/xkbcomp/keymap/xfree86,v 3.30 2003/04/03 16:34:49 dawes Exp $
+
+
+default xkb_keymap "us" {
+    xkb_keycodes	{ include "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86(abnt2)"	};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols 	{ include "en_US(pc105)"	};
+    xkb_geometry 	{ include "pc"			};
+};
+xkb_keymap "es"	{
+    xkb_keycodes	{ include "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"             };
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86(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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"			};
+    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 "xfree86"			};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    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 "xfree86"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "us(pc105)"		};
+    xkb_geometry	{ include "microsoft"		};
+};
+
+xkb_keymap "uz" {
+    xkb_keycodes	{ include "xfree86"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "en_US(pc105)+uz"	};
+    xkb_geometry	{ include "pc(pc102)"		};
+};
+
diff --git a/keymap/xfree98 b/keymap/xfree98
new file mode 100644
index 00000000..e78b15ce
--- /dev/null
+++ b/keymap/xfree98
@@ -0,0 +1,35 @@
+// $Xorg: xfree98,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/keymap/xfree98,v 3.6 2001/01/17 23:45:53 dawes Exp $
+
+default xkb_keymap "jp" {
+    xkb_keycodes	{ include "xfree98"		};
+    xkb_types		{ include "default"		};
+    xkb_compatibility	{ include "default"		};
+    xkb_symbols		{ include "nec/jp(pc98)"	};
+    xkb_geometry	{ include "nec(pc98)"		};
+};
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 385070c4..8b93ba49 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1 +1 @@
-xfree86.xml.in
+rules/base.xml.in
diff --git a/po/af.po b/po/af.po
index e2c453d1..bfb700a9 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-25 23:38+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2004-03-18 00:17+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -108,1357 +108,1463 @@ msgid "Azerbaijani"
 msgstr "Azerbaijaans"
 
 #: xfree86.xml.in.h:24
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: xfree86.xml.in.h:25
 msgid "BTC 5090"
 msgstr "BTC 5090"
 
-#: xfree86.xml.in.h:25
+#: xfree86.xml.in.h:26
 msgid "BTC 5113RF Multimedia"
 msgstr "BTC 5113RF Multimedia"
 
-#: xfree86.xml.in.h:26
+#: xfree86.xml.in.h:27
 msgid "BTC 5126T"
 msgstr "BTC 5126T"
 
-#: xfree86.xml.in.h:27
+#: xfree86.xml.in.h:28
 msgid "BTC 9000"
 msgstr "BTC 9000"
 
-#: xfree86.xml.in.h:28
+#: xfree86.xml.in.h:29
 msgid "BTC 9000A"
 msgstr "BTC 9000A"
 
-#: xfree86.xml.in.h:29
+#: xfree86.xml.in.h:30
 msgid "BTC 9001AH"
 msgstr "BTC 9001AH"
 
-#: xfree86.xml.in.h:30
+#: xfree86.xml.in.h:31
 msgid "Basic"
 msgstr "Basies"
 
-#: xfree86.xml.in.h:31
+#: xfree86.xml.in.h:32
 msgid "Bel"
 msgstr "Bel"
 
-#: xfree86.xml.in.h:32
+#: xfree86.xml.in.h:33
 msgid "Belarusian"
 msgstr "Belarussies"
 
-#: xfree86.xml.in.h:33
+#: xfree86.xml.in.h:34
 msgid "Belgian"
 msgstr "Belgies"
 
-#: xfree86.xml.in.h:34
+#: xfree86.xml.in.h:35
 msgid "Ben"
 msgstr "Ben"
 
-#: xfree86.xml.in.h:35
+#: xfree86.xml.in.h:36
 msgid "Bengali"
 msgstr "Bengaals"
 
-#: xfree86.xml.in.h:36
+#: xfree86.xml.in.h:37
 msgid "Bgr"
 msgstr "Bgr"
 
-#: xfree86.xml.in.h:37
+#: xfree86.xml.in.h:38
 msgid "Bih"
 msgstr "Bih"
 
-#: xfree86.xml.in.h:38
+#: xfree86.xml.in.h:39
 msgid "Blr"
 msgstr "Blr"
 
-#: xfree86.xml.in.h:39
+#: xfree86.xml.in.h:40
 msgid "Bosnian"
 msgstr "Bosnies"
 
-#: xfree86.xml.in.h:40
+#: xfree86.xml.in.h:41
 msgid "Both Alt keys together change group"
 msgstr "Beide Alt-sleutels tesame verander groep"
 
-#: xfree86.xml.in.h:41
+#: xfree86.xml.in.h:42
 msgid "Both Ctrl keys together change group"
 msgstr "Beide Ctrl-sleutels tesame verander groep"
 
-#: xfree86.xml.in.h:42
+#: xfree86.xml.in.h:43
 msgid "Both Shift keys together change group"
 msgstr "Beide Shift-sleutels tesame verander groep"
 
-#: xfree86.xml.in.h:43
+#: xfree86.xml.in.h:44
 msgid "Both Win-keys switch group while pressed"
 msgstr "Beide Win-sleutels wissel groep terwyl gedruk"
 
-#: xfree86.xml.in.h:44
+#: xfree86.xml.in.h:45
 msgid "Bra"
 msgstr "Bra"
 
-#: xfree86.xml.in.h:45
+#: xfree86.xml.in.h:46
 msgid "Brazilian"
 msgstr "Braziliaans"
 
-#: xfree86.xml.in.h:46
+#: xfree86.xml.in.h:47
 msgid "Brazilian ABNT2"
 msgstr "Braziliaans ABNT2"
 
-#: xfree86.xml.in.h:47
+#: xfree86.xml.in.h:48
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internetsleutelbord"
 
-#: xfree86.xml.in.h:48
+#: xfree86.xml.in.h:49
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#: xfree86.xml.in.h:49
+#: xfree86.xml.in.h:50
 msgid "Burmese"
 msgstr "Burmees"
 
-#: xfree86.xml.in.h:50
+#: xfree86.xml.in.h:51
 msgid "Can"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:51
+#: xfree86.xml.in.h:52
 msgid "Canadian"
 msgstr "Kanadees"
 
-#: xfree86.xml.in.h:52
+#: xfree86.xml.in.h:53
 msgid "Caps Lock key changes group"
 msgstr "CapsLock-sleutel verander groep"
 
-#: xfree86.xml.in.h:53
+#: xfree86.xml.in.h:54
 msgid "CapsLock key behavior"
 msgstr "CapsLock-sleutelgedrag"
 
-#: xfree86.xml.in.h:54
+#: xfree86.xml.in.h:55
 msgid "Caps_Lock LED shows alternative group"
 msgstr "Caps_Lock LED vertoon alternatiewe groep"
 
-#: xfree86.xml.in.h:55
+#: xfree86.xml.in.h:56
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: xfree86.xml.in.h:56
+#: xfree86.xml.in.h:57
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternatief)"
 
-#: xfree86.xml.in.h:57
+#: xfree86.xml.in.h:58
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internetsleutelbord"
 
-#: xfree86.xml.in.h:58
+#: xfree86.xml.in.h:59
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: xfree86.xml.in.h:59
+#: xfree86.xml.in.h:60
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: xfree86.xml.in.h:60
+#: xfree86.xml.in.h:61
 msgid "CloGaelach Laptop"
 msgstr "CloGaelach Skootrekenaar"
 
-#: xfree86.xml.in.h:61
+#: xfree86.xml.in.h:62
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: xfree86.xml.in.h:62
+#: xfree86.xml.in.h:63
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 sleutels)"
 
-#: xfree86.xml.in.h:63
+#: xfree86.xml.in.h:64
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 sleutels)"
 
-#: xfree86.xml.in.h:64
+#: xfree86.xml.in.h:65
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 sleutels)"
 
-#: xfree86.xml.in.h:65
+#: xfree86.xml.in.h:66
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: xfree86.xml.in.h:66
+#: xfree86.xml.in.h:67
 msgid "Control Key Position"
 msgstr "Kontrolesleutel posisie"
 
-#: xfree86.xml.in.h:67
+#: xfree86.xml.in.h:68
 msgid "Control key at bottom left"
 msgstr "Kontrolesleutel links onder"
 
-#: xfree86.xml.in.h:68
+#: xfree86.xml.in.h:69
 msgid "Control key at left of 'A'"
 msgstr "Kontrolesleutel links van 'A'"
 
-#: xfree86.xml.in.h:69
+#: xfree86.xml.in.h:70
 msgid "Control+Shift changes group"
 msgstr "Ctrl+Shift verander groep"
 
-#: xfree86.xml.in.h:70
+#: xfree86.xml.in.h:71
 msgid "Croatian"
 msgstr "Kroaties"
 
-#: xfree86.xml.in.h:71
+#: xfree86.xml.in.h:72
 msgid "Cyrillic"
 msgstr "Kirrillies"
 
-#: xfree86.xml.in.h:72
+#: xfree86.xml.in.h:73
 msgid "Cze"
 msgstr "Cze"
 
-#: xfree86.xml.in.h:73
+#: xfree86.xml.in.h:74
 msgid "Czech"
 msgstr "Tsjeggies"
 
-#: xfree86.xml.in.h:74
+#: xfree86.xml.in.h:75
 msgid "Czech (qwerty)"
 msgstr "Tsjeggies (qwerty)"
 
-#: xfree86.xml.in.h:75
+#: xfree86.xml.in.h:76
+msgid "DTK2000"
+msgstr ""
+
+#: xfree86.xml.in.h:77
 msgid "Danish"
 msgstr "Deens"
 
-#: xfree86.xml.in.h:76
+#: xfree86.xml.in.h:78
 msgid "Dead acute"
 msgstr "Dooie akuutaksent"
 
-#: xfree86.xml.in.h:77
+#: xfree86.xml.in.h:79
 msgid "Dead grave acute"
 msgstr "Dooie gravisaksent"
 
-#: xfree86.xml.in.h:78
+#: xfree86.xml.in.h:80
 msgid "Dell"
 msgstr "Dell"
 
-#: xfree86.xml.in.h:79
+#: xfree86.xml.in.h:81
 msgid "Dell 101-key PC"
 msgstr "Dell 101-key PC"
 
-#: xfree86.xml.in.h:80
+#: xfree86.xml.in.h:82
 msgid "Deu"
 msgstr "Deu"
 
-#: xfree86.xml.in.h:81
+#: xfree86.xml.in.h:83
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: xfree86.xml.in.h:82
+#: xfree86.xml.in.h:84
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 series"
 
-#: xfree86.xml.in.h:83
+#: xfree86.xml.in.h:85
 msgid "Dnk"
 msgstr "Dnk"
 
-#: xfree86.xml.in.h:84
+#: xfree86.xml.in.h:86
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: xfree86.xml.in.h:85
+#: xfree86.xml.in.h:87
 msgid "Dvo"
 msgstr "Dvo"
 
-#: xfree86.xml.in.h:86
+#: xfree86.xml.in.h:88
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: xfree86.xml.in.h:87
+#: xfree86.xml.in.h:89
+msgid "Dzongkha / Tibetan"
+msgstr ""
+
+#: xfree86.xml.in.h:90
 msgid "Eliminate dead keys"
 msgstr "Elimineer dooie sleutels"
 
-#: xfree86.xml.in.h:88
+#: xfree86.xml.in.h:91
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: xfree86.xml.in.h:89
+#: xfree86.xml.in.h:92
 msgid "Esp"
 msgstr "Esp"
 
-#: xfree86.xml.in.h:90
+#: xfree86.xml.in.h:93
 msgid "Est"
 msgstr "Est"
 
-#: xfree86.xml.in.h:91
+#: xfree86.xml.in.h:94
 msgid "Estonian"
 msgstr "Estoniaans"
 
-#: xfree86.xml.in.h:92
+#: xfree86.xml.in.h:95
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: xfree86.xml.in.h:93
+#: xfree86.xml.in.h:96
 msgid "Extended"
 msgstr "Uitgebreide"
 
-#: xfree86.xml.in.h:94
+#: xfree86.xml.in.h:97
 msgid "Fao"
 msgstr "Fao"
 
-#: xfree86.xml.in.h:95
+#: xfree86.xml.in.h:98
 msgid "Faroese"
 msgstr "Faroees"
 
-#: xfree86.xml.in.h:96
+#: xfree86.xml.in.h:99
 msgid "Farsi"
 msgstr "Farsi"
 
-#: xfree86.xml.in.h:97
+#: xfree86.xml.in.h:100
 msgid "Fin"
 msgstr "Fin"
 
-#: xfree86.xml.in.h:98
+#: xfree86.xml.in.h:101
 msgid "Finnish"
 msgstr "Fins"
 
-#: xfree86.xml.in.h:99
+#: xfree86.xml.in.h:102
 msgid "Fra"
 msgstr "Fra"
 
-#: xfree86.xml.in.h:100
+#: xfree86.xml.in.h:103
 msgid "French"
 msgstr "Frans"
 
-#: xfree86.xml.in.h:101
+#: xfree86.xml.in.h:104
 msgid "French (alternative)"
 msgstr "Frans (alternatief)"
 
-#: xfree86.xml.in.h:102
+#: xfree86.xml.in.h:105
 msgid "French Canadian"
 msgstr "Franse Kanadees"
 
-#: xfree86.xml.in.h:103
+#: xfree86.xml.in.h:106
 msgid "GBr"
 msgstr "GBr"
 
-#: xfree86.xml.in.h:104
+#: xfree86.xml.in.h:107
 msgid "Generic 101-key PC"
 msgstr "Generies 101-sleutel PC"
 
-#: xfree86.xml.in.h:105
+#: xfree86.xml.in.h:108
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generies 102-sleutel (Intl) PC"
 
-#: xfree86.xml.in.h:106
+#: xfree86.xml.in.h:109
 msgid "Generic 104-key PC"
 msgstr "Generies 104-sleutel PC"
 
-#: xfree86.xml.in.h:107
+#: xfree86.xml.in.h:110
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generies 105-sleutel (Intl) PC"
 
-#: xfree86.xml.in.h:108
+#: xfree86.xml.in.h:111
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 
-#: xfree86.xml.in.h:109
+#: xfree86.xml.in.h:112
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: xfree86.xml.in.h:113
 msgid "Geo"
 msgstr "Geo"
 
-#: xfree86.xml.in.h:110
+#: xfree86.xml.in.h:114
 msgid "Georgian (latin)"
 msgstr "Georgies (latyns)"
 
-#: xfree86.xml.in.h:111
+#: xfree86.xml.in.h:115
 msgid "Georgian (russian)"
 msgstr "Georgies (russies)"
 
-#: xfree86.xml.in.h:112
+#: xfree86.xml.in.h:116
 msgid "German"
 msgstr "Duits"
 
-#: xfree86.xml.in.h:113
+#: xfree86.xml.in.h:117
 msgid "Grc"
 msgstr "Grc"
 
-#: xfree86.xml.in.h:114
+#: xfree86.xml.in.h:118
 msgid "Greek"
 msgstr "Grieks"
 
-#: xfree86.xml.in.h:115
+#: xfree86.xml.in.h:119
 msgid "Group Shift/Lock behavior"
 msgstr "Groep Shift/Lock gedrag"
 
-#: xfree86.xml.in.h:116
+#: xfree86.xml.in.h:120
 msgid "Guj"
 msgstr "Guj"
 
-#: xfree86.xml.in.h:117
+#: xfree86.xml.in.h:121
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: xfree86.xml.in.h:118
+#: xfree86.xml.in.h:122
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: xfree86.xml.in.h:119
+#: xfree86.xml.in.h:123
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: xfree86.xml.in.h:120
+#: xfree86.xml.in.h:124
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: xfree86.xml.in.h:121
+#: xfree86.xml.in.h:125
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: xfree86.xml.in.h:122
+#: xfree86.xml.in.h:126
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: xfree86.xml.in.h:123
+#: xfree86.xml.in.h:127
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: xfree86.xml.in.h:124
+#: xfree86.xml.in.h:128
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: xfree86.xml.in.h:125
+#: xfree86.xml.in.h:129
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: xfree86.xml.in.h:126
+#: xfree86.xml.in.h:130
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: xfree86.xml.in.h:127
+#: xfree86.xml.in.h:131
 msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
 
-#: xfree86.xml.in.h:128
+#: xfree86.xml.in.h:132
 msgid "Hewlett-Packard SK-2505 Internet Keyboard"
 msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
 
-#: xfree86.xml.in.h:129
+#: xfree86.xml.in.h:133
 msgid "Hin"
 msgstr "Hin"
 
-#: xfree86.xml.in.h:130
+#: xfree86.xml.in.h:134
 msgid "Hindi"
 msgstr "Hindi"
 
-#: xfree86.xml.in.h:131
+#: xfree86.xml.in.h:135
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: xfree86.xml.in.h:132
+#: xfree86.xml.in.h:136
 msgid "Hrv"
 msgstr "Hrv"
 
-#: xfree86.xml.in.h:133
+#: xfree86.xml.in.h:137
 msgid "Hun"
 msgstr "Hun"
 
-#: xfree86.xml.in.h:134
+#: xfree86.xml.in.h:138
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: xfree86.xml.in.h:135
+#: xfree86.xml.in.h:139
 msgid "Hungarian (qwerty)"
 msgstr "Hongaars (qwerty)"
 
-#: xfree86.xml.in.h:136
+#: xfree86.xml.in.h:140
 msgid "Hyper is mapped to the Win-keys."
 msgstr "Hiper is verbind aan die Win-sleutels."
 
-#: xfree86.xml.in.h:137
+#: xfree86.xml.in.h:141
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: xfree86.xml.in.h:138
+#: xfree86.xml.in.h:142
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: xfree86.xml.in.h:139
+#: xfree86.xml.in.h:143
 msgid "IBM Rapid Access II (alternate option)"
 msgstr "IBM Rapid Access II (alternate option)"
 
-#: xfree86.xml.in.h:140
+#: xfree86.xml.in.h:144
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: xfree86.xml.in.h:141
+#: xfree86.xml.in.h:145
 msgid "INSCRIPT layout"
 msgstr "INSCRIPT-uitleg"
 
-#: xfree86.xml.in.h:142
+#: xfree86.xml.in.h:146
 msgid "IS434"
 msgstr "IS434"
 
-#: xfree86.xml.in.h:143
+#: xfree86.xml.in.h:147
 msgid "IS434 laptop"
 msgstr "IS434 laptop"
 
-#: xfree86.xml.in.h:144
+#: xfree86.xml.in.h:148
 msgid "ISO Alternate"
 msgstr "ISO Alternatief"
 
-#: xfree86.xml.in.h:145
+#: xfree86.xml.in.h:149
 msgid "Icelandic"
 msgstr "Yslandies"
 
-#: xfree86.xml.in.h:146
+#: xfree86.xml.in.h:150
 msgid "Iku"
 msgstr "Iku"
 
-#: xfree86.xml.in.h:147
+#: xfree86.xml.in.h:151
+msgid "International (with dead keys)"
+msgstr ""
+
+#: xfree86.xml.in.h:152
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: xfree86.xml.in.h:148
+#: xfree86.xml.in.h:153
 msgid "Irish"
 msgstr "Iers"
 
-#: xfree86.xml.in.h:149
+#: xfree86.xml.in.h:154
 msgid "Irl"
 msgstr "Irl"
 
-#: xfree86.xml.in.h:150
+#: xfree86.xml.in.h:155
 msgid "Irn"
 msgstr "Irn"
 
-#: xfree86.xml.in.h:151
+#: xfree86.xml.in.h:156
 msgid "Isl"
 msgstr "Isl"
 
-#: xfree86.xml.in.h:152
+#: xfree86.xml.in.h:157
 msgid "Isr"
 msgstr "Isr"
 
-#: xfree86.xml.in.h:153
+#: xfree86.xml.in.h:158
 msgid "Israeli"
 msgstr "Israelies"
 
-#: xfree86.xml.in.h:154
+#: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Israelies"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Ita"
 
-#: xfree86.xml.in.h:155
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "Italiaans"
 
-#: xfree86.xml.in.h:156
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Japanees"
 
-#: xfree86.xml.in.h:157
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Japanees 106-sleutel"
 
-#: xfree86.xml.in.h:158
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:159
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Kannada"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:168
+#, fuzzy
+msgid "Kor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:169
+#, fuzzy
+msgid "Korean"
+msgstr "Noorweegs"
+
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Skootrekenaar"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Laptop/notebook Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latyns"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Latyns Amerika"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Latvies"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Linkerkant Alt-sleutel verander groep"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:179
+#, fuzzy
+msgid "Left Alt key switches group while pressed"
+msgstr "Linkerkant Win-sleutel wissel groep terwyl gedruk"
+
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Linkerkant Ctrl-sleutel verander groep"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Linkerkant Shift-sleutel verander groep"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Linkerkant Win-sleutel verander groep"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Linkerkant Win-sleutel wissel groep terwyl gedruk"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Lithuaniese azerty standaard"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Lithuanian qwerty \"numeries\""
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:186
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (alternatiewe opsie)"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (alternatiewe opsie2)"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch keyboard Internet Navigator"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Ltu"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lva"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Masedonies"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh (oud)"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "Maak CapsLock 'n adisionele Kontrole"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Maltees"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Maltese (VSA-uitleg)"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Kieslys-sleutel is Komponeer"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Kieslyssleutel verander groep"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta is verbind aan die Win-sleutels."
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta is verbind aan die linkerkantste Win-sleutel."
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internetsleutelbord"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Sweeds"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natuurlik"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office sleutelbord"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:224
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Internetsleutelbord"
+
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Verskeie versoenbaarheid-opsies"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Mongolees"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Noordelike Saami (Finland)"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Noordelike Saami (Noorwe�)"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Noordelike Saami (Swede)"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Noorweegs"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Num_Lock LED vertoon alternatiewe groep"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Ogham"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:241
+#, fuzzy
+msgid "Old standard"
+msgstr "Standaard"
+
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet keyboard"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx Reeks"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Foneties"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Pools"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Pools (qwertz)"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:252
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr ""
+
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytonic"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:256
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "Druk Linkerkantste Win-sleutel om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Druk Linkerkantste Win-sleutel om die 3de vlak te kies"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Druk Kieslys-sleutel om die 3de vlak te kies"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:259
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "Druk Regterkantste Win-sleutel om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Druk Regterkantste Ctrl-sleutel om die 3de vlak te kies"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Druk Regterkantste Win-sleutel om die 3de vlak te kies"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:262
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "Druk enige van die Win-sleutels om die 3de vlak te kies"
+
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Druk enige van die Win-sleutels om die 3de vlak te kies"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "R-Alt wissel die groep terwyl gedruk"
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Regterkant Alt is Komponeer"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Regterkant Alt-sleutel verander groep"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Regterkant Ctrl-sleutel werk soos Regterkant Alt"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Regterkant Ctrl-sleutel verander groep"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Regterkant Shift-sleutel verander groep"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Regterkant Win-sleutel verander groep"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Regterkant Win-sleutel is Komponeer"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Regterkant Win-sleutel skakel groep terwyl gedruk"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Romeens"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rou"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Russies"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Scroll_Lock LED wys alternatiewe groep"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Serbies"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:291
+msgid "Serbian Cyrillic (swap Zhe, Ze)"
+msgstr ""
+
+#: xfree86.xml.in.h:292
+msgid "Serbian Latin (swap Y, Z)"
+msgstr ""
+
+#: xfree86.xml.in.h:293
+msgid "Serbian Latin Unicode"
+msgstr ""
+
+#: xfree86.xml.in.h:294
+msgid "Serbian Latin Unicode (swap ZHE, Z)"
+msgstr ""
+
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "Shift met numeriese sleutels werk soos in MS Windows"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:296
+#, fuzzy
+msgid "Shift+CapsLock changes group"
+msgstr "CapsLock-sleutel verander groep"
+
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Slovaaks"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Slovaaks (qwerty)"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "Spaans"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Spesiale sleutels (Ctrl+Alt+&lt;sleutel&gt;) word hanteer in 'n bediener."
+msgstr ""
+"Spesiale sleutels (Ctrl+Alt+&lt;sleutel&gt;) word hanteer in 'n bediener."
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Standaard"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Sun (dooie sleutels)"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super is verbind aan die Win-sleutels (verstek)."
 
-#: xfree86.xml.in.h:285
-msgid "Sv"
-msgstr "Sv"
-
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Ruil Ctrl en CapsLock om"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Swe"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "Sweeds"
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "Switserse Frans"
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "Switserse Duits"
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Siries"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Foneties"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tajikees"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamilees"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugu"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Thai (TIS-820.2538)"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Derdevlak kiesers"
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tur"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Turks"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Turks (F)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Turks Alt-Q-uitleg"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "VSA Engels"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "VSA Engels met ISO9995-3"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "VSA Engels met dooie sleutels"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "VSA"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "VSA sleutelbord met Romeense letters"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "VSA"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Ukra�nies"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Vereenigde Koninkryk"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Gebruik sleutelbord LED om alternatiewe groep te wys"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Gebruik interne bokas. Shift kanseleer Caps."
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Gebruik interne bokas.  Shift kanseleer nie Caps nie."
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Uzbek"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Vi�tnamees"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Winkeys"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:354
+#, fuzzy
+msgid "With Malayalam digits"
+msgstr "Malayalam"
+
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internetsleutelbord"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Joegoslaafs"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/syfers"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "syfers"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/komma"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/dot"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/komma"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/dot"
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/komma"
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/dot"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/komma"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/dot"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "skootrekenaar"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/syfers"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/komma"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/dot"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/komma"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/dot"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/komma"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/dot"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/comma"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/dot"
+
+#~ msgid "Sv"
+#~ msgstr "Sv"
diff --git a/po/az.po b/po/az.po
index d15d1bf6..9c2d6dd1 100755
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml-4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-25 23:38+0000\n"
+"POT-Creation-Date: 2004-04-04 02:44+0100\n"
 "PO-Revision-Date: 2004-03-21 20:00+0200\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -109,1357 +109,1463 @@ msgid "Azerbaijani"
 msgstr "Azərbaycanca"
 
 #: xfree86.xml.in.h:24
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
+
+#: xfree86.xml.in.h:25
 msgid "BTC 5090"
 msgstr "BTC 5090"
 
-#: xfree86.xml.in.h:25
+#: xfree86.xml.in.h:26
 msgid "BTC 5113RF Multimedia"
 msgstr "BTC 5113RF Multimedia"
 
-#: xfree86.xml.in.h:26
+#: xfree86.xml.in.h:27
 msgid "BTC 5126T"
 msgstr "BTC 5126T"
 
-#: xfree86.xml.in.h:27
+#: xfree86.xml.in.h:28
 msgid "BTC 9000"
 msgstr "BTC 9000"
 
-#: xfree86.xml.in.h:28
+#: xfree86.xml.in.h:29
 msgid "BTC 9000A"
 msgstr "BTC 9000A"
 
-#: xfree86.xml.in.h:29
+#: xfree86.xml.in.h:30
 msgid "BTC 9001AH"
 msgstr "BTC 9001AH"
 
-#: xfree86.xml.in.h:30
+#: xfree86.xml.in.h:31
 msgid "Basic"
 msgstr "Əsas"
 
-#: xfree86.xml.in.h:31
+#: xfree86.xml.in.h:32
 msgid "Bel"
 msgstr "Bel"
 
-#: xfree86.xml.in.h:32
+#: xfree86.xml.in.h:33
 msgid "Belarusian"
 msgstr "Belarusca"
 
-#: xfree86.xml.in.h:33
+#: xfree86.xml.in.h:34
 msgid "Belgian"
 msgstr "Belçikaca"
 
-#: xfree86.xml.in.h:34
+#: xfree86.xml.in.h:35
 msgid "Ben"
 msgstr "Ben"
 
-#: xfree86.xml.in.h:35
+#: xfree86.xml.in.h:36
 msgid "Bengali"
 msgstr "Benqalca"
 
-#: xfree86.xml.in.h:36
+#: xfree86.xml.in.h:37
 msgid "Bgr"
 msgstr "Bgr"
 
-#: xfree86.xml.in.h:37
+#: xfree86.xml.in.h:38
 msgid "Bih"
 msgstr "Bih"
 
-#: xfree86.xml.in.h:38
+#: xfree86.xml.in.h:39
 msgid "Blr"
 msgstr "Blr"
 
-#: xfree86.xml.in.h:39
+#: xfree86.xml.in.h:40
 msgid "Bosnian"
 msgstr "Bosniyaca"
 
-#: xfree86.xml.in.h:40
+#: xfree86.xml.in.h:41
 msgid "Both Alt keys together change group"
 msgstr "İki Alt düyməsi də bərabər qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:41
+#: xfree86.xml.in.h:42
 msgid "Both Ctrl keys together change group"
 msgstr "İki Ctrl düyməsi də bərabər qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:42
+#: xfree86.xml.in.h:43
 msgid "Both Shift keys together change group"
 msgstr "Hər iki Shift düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:43
+#: xfree86.xml.in.h:44
 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"
 
-#: xfree86.xml.in.h:44
+#: xfree86.xml.in.h:45
 msgid "Bra"
 msgstr "Bra"
 
-#: xfree86.xml.in.h:45
+#: xfree86.xml.in.h:46
 msgid "Brazilian"
 msgstr "Brazilya düzülüşü"
 
-#: xfree86.xml.in.h:46
+#: xfree86.xml.in.h:47
 msgid "Brazilian ABNT2"
 msgstr "Brazilya düzülüşü ABNT2"
 
-#: xfree86.xml.in.h:47
+#: xfree86.xml.in.h:48
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internet Keyboard"
 
-#: xfree86.xml.in.h:48
+#: xfree86.xml.in.h:49
 msgid "Bulgarian"
 msgstr "Bolqarca"
 
-#: xfree86.xml.in.h:49
+#: xfree86.xml.in.h:50
 msgid "Burmese"
 msgstr "Burmaca"
 
-#: xfree86.xml.in.h:50
+#: xfree86.xml.in.h:51
 msgid "Can"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:51
+#: xfree86.xml.in.h:52
 msgid "Canadian"
 msgstr "Kanada düzülüşü"
 
-#: xfree86.xml.in.h:52
+#: xfree86.xml.in.h:53
 msgid "Caps Lock key changes group"
 msgstr "Caps Lock düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:53
+#: xfree86.xml.in.h:54
 msgid "CapsLock key behavior"
 msgstr "CapsLock düyməsinin davranışı"
 
-#: xfree86.xml.in.h:54
+#: xfree86.xml.in.h:55
 msgid "Caps_Lock LED shows alternative group"
 msgstr "Caps_Lock LED-ləri alternativ qrupları göstərir"
 
-#: xfree86.xml.in.h:55
+#: xfree86.xml.in.h:56
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: xfree86.xml.in.h:56
+#: xfree86.xml.in.h:57
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternate option)"
 
-#: xfree86.xml.in.h:57
+#: xfree86.xml.in.h:58
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internet Keyboard"
 
-#: xfree86.xml.in.h:58
+#: xfree86.xml.in.h:59
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: xfree86.xml.in.h:59
+#: xfree86.xml.in.h:60
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: xfree86.xml.in.h:60
+#: xfree86.xml.in.h:61
 msgid "CloGaelach Laptop"
 msgstr "CloGaelach Laptop"
 
-#: xfree86.xml.in.h:61
+#: xfree86.xml.in.h:62
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access Keyboard"
 
-#: xfree86.xml.in.h:62
+#: xfree86.xml.in.h:63
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internet Keyboard (13 düymə)"
 
-#: xfree86.xml.in.h:63
+#: xfree86.xml.in.h:64
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internet Keyboard (18 düymə)"
 
-#: xfree86.xml.in.h:64
+#: xfree86.xml.in.h:65
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internet Keyboard (7 düymə)"
 
-#: xfree86.xml.in.h:65
+#: xfree86.xml.in.h:66
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq Keyboard"
 
-#: xfree86.xml.in.h:66
+#: xfree86.xml.in.h:67
 msgid "Control Key Position"
 msgstr "Control Düyməsinin Yeri"
 
-#: xfree86.xml.in.h:67
+#: xfree86.xml.in.h:68
 msgid "Control key at bottom left"
 msgstr "Control düyməsi sol altda"
 
-#: xfree86.xml.in.h:68
+#: xfree86.xml.in.h:69
 msgid "Control key at left of 'A'"
 msgstr "Control düyməsi 'A' hərfinin solunda"
 
-#: xfree86.xml.in.h:69
+#: xfree86.xml.in.h:70
 msgid "Control+Shift changes group"
 msgstr "Control+Shift düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:70
+#: xfree86.xml.in.h:71
 msgid "Croatian"
 msgstr "Xorvatca"
 
-#: xfree86.xml.in.h:71
+#: xfree86.xml.in.h:72
 msgid "Cyrillic"
 msgstr "Kiril"
 
-#: xfree86.xml.in.h:72
+#: xfree86.xml.in.h:73
 msgid "Cze"
 msgstr "Çex"
 
-#: xfree86.xml.in.h:73
+#: xfree86.xml.in.h:74
 msgid "Czech"
 msgstr "Çexcə"
 
-#: xfree86.xml.in.h:74
+#: xfree86.xml.in.h:75
 msgid "Czech (qwerty)"
 msgstr "Çexcə (qwerty)"
 
-#: xfree86.xml.in.h:75
+#: xfree86.xml.in.h:76
+msgid "DTK2000"
+msgstr ""
+
+#: xfree86.xml.in.h:77
 msgid "Danish"
 msgstr "Danimarkaca"
 
-#: xfree86.xml.in.h:76
+#: xfree86.xml.in.h:78
 msgid "Dead acute"
 msgstr "Dead acute"
 
-#: xfree86.xml.in.h:77
+#: xfree86.xml.in.h:79
 msgid "Dead grave acute"
 msgstr "Dead grave acute"
 
-#: xfree86.xml.in.h:78
+#: xfree86.xml.in.h:80
 msgid "Dell"
 msgstr "Dell"
 
-#: xfree86.xml.in.h:79
+#: xfree86.xml.in.h:81
 msgid "Dell 101-key PC"
 msgstr "Dell 101-key PC"
 
-#: xfree86.xml.in.h:80
+#: xfree86.xml.in.h:82
 msgid "Deu"
 msgstr "Deu"
 
-#: xfree86.xml.in.h:81
+#: xfree86.xml.in.h:83
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa Wireless Desktop Keyboard"
 
-#: xfree86.xml.in.h:82
+#: xfree86.xml.in.h:84
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801 / 9802 seryaları"
 
-#: xfree86.xml.in.h:83
+#: xfree86.xml.in.h:85
 msgid "Dnk"
 msgstr "Dnk"
 
-#: xfree86.xml.in.h:84
+#: xfree86.xml.in.h:86
 msgid "Dutch"
 msgstr "Niderlandca"
 
-#: xfree86.xml.in.h:85
+#: xfree86.xml.in.h:87
 msgid "Dvo"
 msgstr "Dvo"
 
-#: xfree86.xml.in.h:86
+#: xfree86.xml.in.h:88
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: xfree86.xml.in.h:87
+#: xfree86.xml.in.h:89
+msgid "Dzongkha / Tibetan"
+msgstr ""
+
+#: xfree86.xml.in.h:90
 msgid "Eliminate dead keys"
 msgstr "Ölü düymələri sayma"
 
-#: xfree86.xml.in.h:88
+#: xfree86.xml.in.h:91
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: xfree86.xml.in.h:89
+#: xfree86.xml.in.h:92
 msgid "Esp"
 msgstr "İsp"
 
-#: xfree86.xml.in.h:90
+#: xfree86.xml.in.h:93
 msgid "Est"
 msgstr "Est"
 
-#: xfree86.xml.in.h:91
+#: xfree86.xml.in.h:94
 msgid "Estonian"
 msgstr "Estonca"
 
-#: xfree86.xml.in.h:92
+#: xfree86.xml.in.h:95
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: xfree86.xml.in.h:93
+#: xfree86.xml.in.h:96
 msgid "Extended"
 msgstr "Uzadılmış"
 
-#: xfree86.xml.in.h:94
+#: xfree86.xml.in.h:97
 msgid "Fao"
 msgstr "Fao"
 
-#: xfree86.xml.in.h:95
+#: xfree86.xml.in.h:98
 msgid "Faroese"
 msgstr "Faroescə"
 
-#: xfree86.xml.in.h:96
+#: xfree86.xml.in.h:99
 msgid "Farsi"
 msgstr "Farsca"
 
-#: xfree86.xml.in.h:97
+#: xfree86.xml.in.h:100
 msgid "Fin"
 msgstr "Fin"
 
-#: xfree86.xml.in.h:98
+#: xfree86.xml.in.h:101
 msgid "Finnish"
 msgstr "Fincə"
 
-#: xfree86.xml.in.h:99
+#: xfree86.xml.in.h:102
 msgid "Fra"
 msgstr "Fra"
 
-#: xfree86.xml.in.h:100
+#: xfree86.xml.in.h:103
 msgid "French"
 msgstr "Fransızca"
 
-#: xfree86.xml.in.h:101
+#: xfree86.xml.in.h:104
 msgid "French (alternative)"
 msgstr "Fransızca (alternativ)"
 
-#: xfree86.xml.in.h:102
+#: xfree86.xml.in.h:105
 msgid "French Canadian"
 msgstr "Kanada Fransızcası"
 
-#: xfree86.xml.in.h:103
+#: xfree86.xml.in.h:106
 msgid "GBr"
 msgstr "GBr"
 
-#: xfree86.xml.in.h:104
+#: xfree86.xml.in.h:107
 msgid "Generic 101-key PC"
 msgstr "Generic 101-key PC"
 
-#: xfree86.xml.in.h:105
+#: xfree86.xml.in.h:108
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generic 102-key (Intl) PC"
 
-#: xfree86.xml.in.h:106
+#: xfree86.xml.in.h:109
 msgid "Generic 104-key PC"
 msgstr "Generic 104-key PC"
 
-#: xfree86.xml.in.h:107
+#: xfree86.xml.in.h:110
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generic 105-key (Intl) PC"
 
-#: xfree86.xml.in.h:108
+#: xfree86.xml.in.h:111
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 
-#: xfree86.xml.in.h:109
+#: xfree86.xml.in.h:112
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: xfree86.xml.in.h:113
 msgid "Geo"
 msgstr "Gür"
 
-#: xfree86.xml.in.h:110
+#: xfree86.xml.in.h:114
 msgid "Georgian (latin)"
 msgstr "Gürcücə (latın)"
 
-#: xfree86.xml.in.h:111
+#: xfree86.xml.in.h:115
 msgid "Georgian (russian)"
 msgstr "Gürcücə (kiril)"
 
-#: xfree86.xml.in.h:112
+#: xfree86.xml.in.h:116
 msgid "German"
 msgstr "Almaca"
 
-#: xfree86.xml.in.h:113
+#: xfree86.xml.in.h:117
 msgid "Grc"
 msgstr "Yun"
 
-#: xfree86.xml.in.h:114
+#: xfree86.xml.in.h:118
 msgid "Greek"
 msgstr "Yunanca"
 
-#: xfree86.xml.in.h:115
+#: xfree86.xml.in.h:119
 msgid "Group Shift/Lock behavior"
 msgstr "Shift/Lock Qrupu Davranışı"
 
-#: xfree86.xml.in.h:116
+#: xfree86.xml.in.h:120
 msgid "Guj"
 msgstr "Guj"
 
-#: xfree86.xml.in.h:117
+#: xfree86.xml.in.h:121
 msgid "Gujarati"
 msgstr "Gujaraticə"
 
-#: xfree86.xml.in.h:118
+#: xfree86.xml.in.h:122
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: xfree86.xml.in.h:119
+#: xfree86.xml.in.h:123
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internet Keyboard"
 
-#: xfree86.xml.in.h:120
+#: xfree86.xml.in.h:124
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: xfree86.xml.in.h:121
+#: xfree86.xml.in.h:125
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: xfree86.xml.in.h:122
+#: xfree86.xml.in.h:126
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: xfree86.xml.in.h:123
+#: xfree86.xml.in.h:127
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: xfree86.xml.in.h:124
+#: xfree86.xml.in.h:128
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: xfree86.xml.in.h:125
+#: xfree86.xml.in.h:129
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: xfree86.xml.in.h:126
+#: xfree86.xml.in.h:130
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: xfree86.xml.in.h:127
+#: xfree86.xml.in.h:131
 msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-2501 Multimedia Keyboard"
 
-#: xfree86.xml.in.h:128
+#: xfree86.xml.in.h:132
 msgid "Hewlett-Packard SK-2505 Internet Keyboard"
 msgstr "Hewlett-Packard SK-2505 Internet Keyboard"
 
-#: xfree86.xml.in.h:129
+#: xfree86.xml.in.h:133
 msgid "Hin"
 msgstr "Hin"
 
-#: xfree86.xml.in.h:130
+#: xfree86.xml.in.h:134
 msgid "Hindi"
 msgstr "Hindi"
 
-#: xfree86.xml.in.h:131
+#: xfree86.xml.in.h:135
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: xfree86.xml.in.h:132
+#: xfree86.xml.in.h:136
 msgid "Hrv"
 msgstr "Xrv"
 
-#: xfree86.xml.in.h:133
+#: xfree86.xml.in.h:137
 msgid "Hun"
 msgstr "Mac"
 
-#: xfree86.xml.in.h:134
+#: xfree86.xml.in.h:138
 msgid "Hungarian"
 msgstr "Macarca"
 
-#: xfree86.xml.in.h:135
+#: xfree86.xml.in.h:139
 msgid "Hungarian (qwerty)"
 msgstr "Macarca (qwerty)"
 
-#: xfree86.xml.in.h:136
+#: xfree86.xml.in.h:140
 msgid "Hyper is mapped to the Win-keys."
 msgstr "Hyper Win düymələrinə xəritələnib."
 
-#: xfree86.xml.in.h:137
+#: xfree86.xml.in.h:141
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: xfree86.xml.in.h:138
+#: xfree86.xml.in.h:142
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: xfree86.xml.in.h:139
+#: xfree86.xml.in.h:143
 msgid "IBM Rapid Access II (alternate option)"
 msgstr "IBM Rapid Access II (alternate option)"
 
-#: xfree86.xml.in.h:140
+#: xfree86.xml.in.h:144
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: xfree86.xml.in.h:141
+#: xfree86.xml.in.h:145
 msgid "INSCRIPT layout"
 msgstr "INSCRIPT düzülüşü"
 
-#: xfree86.xml.in.h:142
+#: xfree86.xml.in.h:146
 msgid "IS434"
 msgstr "IS434"
 
-#: xfree86.xml.in.h:143
+#: xfree86.xml.in.h:147
 msgid "IS434 laptop"
 msgstr "IS434 laptop"
 
-#: xfree86.xml.in.h:144
+#: xfree86.xml.in.h:148
 msgid "ISO Alternate"
 msgstr "ISO Alternate"
 
-#: xfree86.xml.in.h:145
+#: xfree86.xml.in.h:149
 msgid "Icelandic"
 msgstr "Icelandic"
 
-#: xfree86.xml.in.h:146
+#: xfree86.xml.in.h:150
 msgid "Iku"
 msgstr "İku"
 
-#: xfree86.xml.in.h:147
+#: xfree86.xml.in.h:151
+msgid "International (with dead keys)"
+msgstr ""
+
+#: xfree86.xml.in.h:152
 msgid "Inuktitut"
 msgstr "İnuktitut"
 
-#: xfree86.xml.in.h:148
+#: xfree86.xml.in.h:153
 msgid "Irish"
 msgstr "İrlandca"
 
-#: xfree86.xml.in.h:149
+#: xfree86.xml.in.h:154
 msgid "Irl"
 msgstr "İrl"
 
-#: xfree86.xml.in.h:150
+#: xfree86.xml.in.h:155
 msgid "Irn"
 msgstr "İrn"
 
-#: xfree86.xml.in.h:151
+#: xfree86.xml.in.h:156
 msgid "Isl"
 msgstr "İsl"
 
-#: xfree86.xml.in.h:152
+#: xfree86.xml.in.h:157
 msgid "Isr"
 msgstr "İsr"
 
-#: xfree86.xml.in.h:153
+#: xfree86.xml.in.h:158
 msgid "Israeli"
 msgstr "Yəhudicə"
 
-#: xfree86.xml.in.h:154
+#: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Yəhudicə"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "İta"
 
-#: xfree86.xml.in.h:155
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: xfree86.xml.in.h:156
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Yaponca"
 
-#: xfree86.xml.in.h:157
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Yaponca 106-düymə"
 
-#: xfree86.xml.in.h:158
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Ypn"
 
-#: xfree86.xml.in.h:159
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Kannada"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:168
+#, fuzzy
+msgid "Kor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:169
+#, fuzzy
+msgid "Korean"
+msgstr "Norveçcə"
+
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Laptop"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (məs. Armada) Laptop Klaviaturası"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (məs. Presario) İnternet Klaviaturası"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Laptop/notebook Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latın"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Latın Amerika"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Latışca"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Sol Alt düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:179
+#, 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"
+
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Sol Ctrl düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Sol Shift düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Sol Win düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:183
 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"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Litovca azerty standart"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Litovca qwerty \"numeric\""
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:186
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Deluxe Access Keyboard"
+
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (alternate option)"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (alternate option2)"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch keyboard Internet Navigator"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Ltu"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lva"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Makedonca"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh Old"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "CapsLock düyməsini əlavə idarə olaraq tə'yin et"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malayalamca"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Maltaca"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Maltaca (ABŞ düzülüşü)"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Menyu yazma düyməsidir"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Menü düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta Win düymələrinə xəritələnib."
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta sol Win düyməsinə xəritələnib."
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Swedish"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:224
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Internet Keyboard"
+
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Müxtəlif yetişmə qabiliyyəti seçimləri"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Monqolca"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Şimali Saami (Finlandiya)"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Şimali Saami (Norveç)"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Şimali Saami (İsveç)"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Norveçcə"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Num_Lock LED-ləri alternativ qrupları göstərir"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Ogham"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:241
+#, fuzzy
+msgid "Old standard"
+msgstr "Standart"
+
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet keyboard"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx Seriyaları"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Fonetik"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Polyakca"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Polyakca (qwertz)"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:252
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr ""
+
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Politonik"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portuqalca"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:256
+#, 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"
+
+#: xfree86.xml.in.h:257
 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"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "3-cü səviyyəni seçmək üçün sağ menyuya basılsın"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:259
+#, 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"
+
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "3-cü səviyyəni seçmək üçün sağ Control düyməsinə basılsın"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:261
 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"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:262
+#, 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"
+
+#: xfree86.xml.in.h:263
 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"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "R-Alt basılı olduğu müddətcə qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Sağ Alt düyməsi yazma düyməsidir"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Sağ Alt düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Sağ Control düyməsi sağ Alt kimi işləyir"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Sağ Ctrl düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Sağ Shift düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Sağ Win düyməsi qrupu dəyişdirir"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Sağ Win düyməsi yazma düyməsidir"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:275
 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"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Rumınca"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rou"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Rusca"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Scroll_Lock LED-ləri alternativ qrupları göstərir"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Servcə"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:291
+msgid "Serbian Cyrillic (swap Zhe, Ze)"
+msgstr ""
+
+#: xfree86.xml.in.h:292
+msgid "Serbian Latin (swap Y, Z)"
+msgstr ""
+
+#: xfree86.xml.in.h:293
+msgid "Serbian Latin Unicode"
+msgstr ""
+
+#: xfree86.xml.in.h:294
+msgid "Serbian Latin Unicode (swap ZHE, Z)"
+msgstr ""
+
+#: xfree86.xml.in.h:295
 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"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:296
+#, fuzzy
+msgid "Shift+CapsLock changes group"
+msgstr "Caps Lock düyməsi qrupu dəyişdirir"
+
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Slovakca"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Slovakca (qwerty)"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Slovencə"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "İspanca"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
-msgstr "Xüsusi düymələr (Ctrl+Alt+&lt;düyməsi&gt;) verici tərəfindən idarə edilsin."
+msgstr ""
+"Xüsusi düymələr (Ctrl+Alt+&lt;düyməsi&gt;) verici tərəfindən idarə edilsin."
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Standart"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Sun ölü düymələr"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super Win düymələrinə xəritələnib (ön qurğulu)."
 
-#: xfree86.xml.in.h:285
-msgid "Sv"
-msgstr "Sv"
-
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Control və Caps Lock arasında dəyiş"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Swe"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "İsveçcə"
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "İsveçrə Fransızcası"
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "İsveçrə Almancası"
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Syriac"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Fonetik"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tacikcə"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamilcə"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugu"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tay"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Tayca (Kedmanee)"
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Tayca (Pattachote)"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Tayca (TIS-820.2538)"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Üçüncü səviyyə seçicilər"
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tac"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tür"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Türkcə"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Türkcə (F)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Türkcə Alt-Q Düzülüşü"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "A.B.Ş. İngiliscəsi"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "A.B.Ş. İngiliscəsi və/ ISO9995-3"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "A.B.Ş. İngiliscəsi və/ ölü düymələr"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "ABŞ"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "Roman hərfli ABŞ klaviaturası"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "ABŞ"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Ukraynaca"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Birləşik Krallıq"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Alternativ qrupu göstərmək üçün klaviatura LED-ini işlət"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Daxili kapitalizasiya işlədir. Shift Caps-i ləğv edir."
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Daxili kapitalizasiya işlədir. Shift Caps-i ləğv etmir."
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Özb"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Özbəkcə"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Vyetnamca"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vye"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Winkeys"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:354
+#, fuzzy
+msgid "With Malayalam digits"
+msgstr "Malayalamca"
+
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Yugoslavca"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/ədədlər"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "ədədlər"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/vergül"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/nöqtə"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/vergül"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "2/101/qwertz/nöqtə"
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/vergül"
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/nöqtə"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/vergül"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/nöqtə"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "laptop"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/ədədlər"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/vergül"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/nöqtə"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/vergül"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/nöqtə"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/vergül"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/nöqtə"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/vergül"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/nöqtə"
+
+#~ msgid "Sv"
+#~ msgstr "Sv"
diff --git a/po/bg.po b/po/bg.po
index 6da8da1b..9168e703 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2002-12-10 19:52+0200\n"
 "Last-Translator: Alexander Shopov <al_shopov@web.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -672,941 +672,951 @@ msgid "Israeli"
 msgstr "израелска"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "израелска"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr ""
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "италианска"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "японска"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "японска 106 клавишна"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr ""
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr ""
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 #, fuzzy
 msgid "Kannada"
 msgstr "канадска"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 msgid "Kor"
 msgstr ""
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "норвежка"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr ""
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr ""
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr ""
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr ""
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr ""
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 #, fuzzy
 msgid "Latin"
 msgstr "латвийска"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "латиноамериканска"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "латвийска"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 #, fuzzy
 msgid "Left Alt key changes group"
 msgstr "Десният Alt сменя групата"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "Левият Win клавиш сменя групата докато е натиснат"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 #, fuzzy
 msgid "Left Ctrl key changes group"
 msgstr "Левият Win клавиш сменя групата"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 #, fuzzy
 msgid "Left Shift key changes group"
 msgstr "Левият Win клавиш сменя групата"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Левият Win клавиш сменя групата"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Левият Win клавиш сменя групата докато е натиснат"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "литовска стандартна azerty"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "литовска \"цифрова\" qwerty"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Интернет клавиатура"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 #, fuzzy
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 #, fuzzy
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 #, fuzzy
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 #, fuzzy
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 #, fuzzy
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 #, fuzzy
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 #, fuzzy
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 #, fuzzy
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Интернет клавиатура"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Интернет клавиатура"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech клавиатура за Интернет навигация"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr ""
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 #, fuzzy
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech клавиатура за Интернет навигация"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr ""
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr ""
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "македонска"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr ""
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr ""
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "Caps Lock да функционира като Control"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr ""
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr ""
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "малтийска"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "малтийска (американска подредба)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr ""
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr ""
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr ""
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Клавиша Menu фунцкионира като Compose"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Menu клавишът сменя групата"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Win клавишите фунцкионират като Meta"
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Левият Win клавиш функционира като Meta"
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 #, fuzzy
 msgid "Microsoft Internet Keyboard"
 msgstr "Интернет клавиатура на Chicony"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 #, fuzzy
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Интернет клавиатура на Chicony"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr ""
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 #, fuzzy
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Pro"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr ""
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Интернет клавиатура на Chicony"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr ""
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr ""
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr ""
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr ""
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr ""
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 #, fuzzy
 msgid "Mongolian"
 msgstr "македонска"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr ""
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr ""
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "северносамска (Финландия)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "северносамска (Норвегия)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "северносамска (Швеция)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "норвежка"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Индикаторът на Num_Lock указва алтернативната група"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr ""
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr ""
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 msgid "Old standard"
 msgstr ""
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 #, fuzzy
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Logitech Интернет клавиатура"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr ""
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr ""
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx серии"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr ""
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr ""
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr ""
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 #, fuzzy
 msgid "Pol"
 msgstr "полска"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "полска"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "полска (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr ""
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "португалска"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr ""
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "Левият Win клавиш избира третата група"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Левият Win клавиш избира третата група"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Menu избира третата група"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "Десният Win избира третата група"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Десният Control избира третата група"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Десният Win избира третата група"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "Двата Win клавиша избират третата група"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Двата Win клавиша избират третата група"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr ""
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr ""
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr ""
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "Десният Alt сменя групата докато е натиснат"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Десният Alt фунцкионира като Compose"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Десният Alt сменя групата"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr ""
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 #, fuzzy
 msgid "Right Ctrl key changes group"
 msgstr "Десният Alt сменя групата"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 #, fuzzy
 msgid "Right Shift key changes group"
 msgstr "Десният Alt сменя групата"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Десният Win сменя групата"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Десният Win фунцкионира като Compose"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Десният Win сменя групата докато е натиснат"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "румънска"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr ""
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr ""
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "руска"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr ""
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr ""
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr ""
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr ""
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr ""
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr ""
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr ""
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 #, fuzzy
 msgid "Sapmi"
 msgstr "тамилска"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr ""
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Индикаторът на Scroll_Lock указва смяната на групата"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "сръбска"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr ""
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "Caps Lock сменя групата"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "словашка"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "словашка (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "словенска"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr ""
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "испанска"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr ""
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr ""
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 #, fuzzy
 msgid "Sun dead keys"
 msgstr "Изключи специалните клавиши (dead keys)"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Win клавишите функционират като Super"
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 #, fuzzy
 msgid "Svk"
 msgstr "словашка"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr ""
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Размени Control и Caps Lock"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr ""
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "шведска"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "швейцарска френска"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "швейцарска немска"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr ""
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 #, fuzzy
 msgid "Syr"
 msgstr "сръбска"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 #, fuzzy
 msgid "Syriac"
 msgstr "сръбска"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "руска (фонетична кирилица)"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "таджикска"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "тамилска"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr ""
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr ""
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 #, fuzzy
 msgid "Tha"
 msgstr "тайландска"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr ""
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr ""
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr ""
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Избор на третата група"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 #, fuzzy
 msgid "Tjk"
 msgstr "таджикска"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 #, fuzzy
 msgid "Tml"
 msgstr "тамилска"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr ""
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr ""
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr ""
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr ""
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "турска"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "турска (F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr ""
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "американска английска"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "американска английска с ISO9995-3"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 #, fuzzy
 msgid "U.S. English w/ dead keys"
 msgstr "американска английска със специални клавиши "
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr ""
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr ""
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr ""
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr ""
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "украинска"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr ""
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "британска"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Използвай клавиатурен индикатор за указване на алтернативна група"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Използва вътрешна промяна на регистъра. Shift отменя Caps."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 #, fuzzy
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Използва вътрешна промяна на регистъра. Shift не отменя Caps."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr ""
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr ""
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "виетнамска"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr ""
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr ""
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 msgid "With Malayalam digits"
 msgstr ""
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 #, fuzzy
 msgid "Yahoo! Internet Keyboard"
 msgstr "Интернет клавиатура на Chicony"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr ""
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "югославска"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr ""
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr ""
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr ""
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr ""
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr ""
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 #, fuzzy
 msgid "l2/102/qwerty/comma"
 msgstr "hu(l2_102_qwerty_comma) - без описание"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr ""
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr ""
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 #, fuzzy
 msgid "qwerty"
 msgstr "чешка (qwerty)"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr ""
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr ""
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr ""
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr ""
 
@@ -1932,9 +1942,6 @@ msgstr ""
 #~ msgid "ua(winkeys) - No decription"
 #~ msgstr "ua(winkeys) - без описание"
 
-#~ msgid "Russian (cyrillic phonetic)"
-#~ msgstr "руска (фонетична кирилица)"
-
 #~ msgid "Thai"
 #~ msgstr "тайландска"
 
diff --git a/po/cs.po b/po/cs.po
index a4bbcb05..aa904dcf 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2003-11-27 21:34GMT\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -650,909 +650,919 @@ msgid "Israeli"
 msgstr "Izraelské"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Izraelské"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Ita"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "Italské"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Japonské"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Japonské 106 kláves"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jap"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Knn"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Kannadské"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "Norské"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Laptop"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (např. Armada) Laptop Keyboard"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (např. Presario) Internet Keyboard"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Laptop/notebook Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latinské"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Latinská Amerika"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Lotyšské"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Levá klávesa Alt mění skupinu"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "Levá klávesa Win přepne při stisku skupinu"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Levá klávesa Ctrl mění skupinu"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Levá klávesa Shift mění skupinu"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Levá klávesa Win mění skupinu"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Levá klávesa Win přepne při stisku skupinu"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Litevské azerty standardní"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Litevské qwerty \"numerické\""
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (alternativní volba)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (alternativní volba 2)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch keyboard Internet Navigator"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Lit"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lot"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Makedonské"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh staré"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "Vyrobit z CapsLock další Control"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malajské"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Maltézské"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Maltézské (rozložení US)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Menu je Compose"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Klávesa Menu mění skupinu"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta je mapována na klávesy Win."
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta je mapována na levou klávesu Win."
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Švédská"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Dodatečné volby pro kompatibilitu"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mak"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Mongolské"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Severní Saami (Finsko)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Severní Saami (Norsko)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Severní Saami (Švédsko)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Norské"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "LED Num_Lock zobrazuje alternativní skupinu"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Oghamské"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "Standardní"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet keyboard"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx řada"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Fonetické"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Polské"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Polské (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytónické"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portugalské"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "Stiskněte levou klávesu Win pro výběr 3. úrovně"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Stiskněte levou klávesu Win pro výběr 3. úrovně"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Stiskněte levou klávesu Menu pro výběr 3. úrovně"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "Stiskněte pravou klávesu Win pro výběr 3. úrovně"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Stiskněte pravou klávesu Control pro výběr 3. úrovně"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Stiskněte pravou klávesu Win pro výběr 3. úrovně"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "Stiskněte kteroukoli klávesu Win pro výběr 3. úrovně"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Stiskněte kteroukoli klávesu Win pro výběr 3. úrovně"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "Pravý Alt přepne při stisku skupinu"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Pravý Alt je Compose"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Klávesa Pravý Alt mění skupinu"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Klávesa Pravý Control pracuje jako Pravý Alt"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Klávesa Pravý Control mění skupinu"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Klávesa Pravý Shift mění skupinu"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Klávesa Pravý Win mění skupinu"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Klávesa Pravý Win je Compose"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Klávesa Pravý Win přepne při stisku skupinu"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Rumunské"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rum"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Ruské"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "LED Scroll_Lock zobrazuje alternativní skupinu"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Srbské"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "Shift s numerickými klávesami pracuje jako v MS Windows"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "Klávesa CapsLock mění skupinu"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Slovenské"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Slovenské (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Slovinské"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "Španělské"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Speciální klávesy (Ctrl+Alt+&lt;key&gt;) zpracovány v serveru."
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Standardní"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Mrtvé klávesy Sun"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super je mapováno na klávesy Win (výchozí)."
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Zaměnit Control a CapsLock"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Švé"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "Švédské"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "Švýcarské francouzské"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "Švýcarské německé"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Syrské"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Fonetické"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tádžikistánské"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamilské"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugu"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Thajské (Kedmanee)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Thajské (Pattachote)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Thajské (TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Výběr třetí úrovně"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tur"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Turecké"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Turecké (F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Turecké rozložení Alt-Q"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "Anglické (US)"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "Anglické (US) s ISO9995-3"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "Anglické (US) s mrtvými klávesami"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "US"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "Americká klávesnice s rumunskými písmeny"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "USA"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Ukrajinské"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Spojené království"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Použít LED klávesnice pro zobrazení alternativní skupiny"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Používá interní převod na kapitálky. Shift ruší Caps."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Používá interní převod na kapitálky. Shift neruší Caps."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Uzbecké"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Vietnamské"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Winkeys"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "Malajské"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Jug"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Jugoslávské"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/číslice"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "číslice"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/čárka"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/tečka"
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/čárka"
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/tečka"
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/čárka"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/tečka"
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/čárka"
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/tečka"
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "laptop"
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/číslice"
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/čárka"
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/tečka"
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/čárka"
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/tečka"
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/čárka"
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/tečka"
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/čárka"
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/tečka"
 
diff --git a/po/da.po b/po/da.po
index fa6b3c74..c51d8a0c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml-4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2003-12-17 23:03+0100\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -649,910 +649,920 @@ msgid "Israeli"
 msgstr "Israelsk"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Israelsk"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Ita"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "Italiensk"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Japansk"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Japansk 106-taster"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Kannada"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "Norsk"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "B�rbar"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "B�rbar Compaq (fx Armada) Laptop Keyboard"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "B�rbar Compaq (fx Presario) Internet Keyboard"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "B�rbar Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latin"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Latinamerika"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Lettisk"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Venstre Alt-tast skifter gruppe"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "Venstre Win-tast skifter gruppe mens nedtrykket"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Venstre Ctrl-tast skifter gruppe"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Venstre skiftetast skifter gruppe"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Venstre Win-tast skifter gruppe"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Venstre Win-tast skifter gruppe mens nedtrykket"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Litauisk azerty-standard"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Litauisk qwerty-numerisk"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (alternativ)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (alternativ 2)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch keyboard Internet Navigator"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Lit"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Let"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh gammel"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "G�r Caps Lock til en ekstra Ctrl"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Maltesisk"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Maltesisk (US-layout)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Menu is Compose"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Menutast skifter gruppe"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta ligger p� Win-tasterne."
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta ligger p� venstre Win-tast."
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, svensk"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Diverse kompatibilitetsvalg"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Mongolsk"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Hollandsk"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Nordligt Saami (Finland)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Nordligt Saami (Norge)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Nordligt Saami (Sverige)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Num Lock LED viser alternativ gruppe"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Ogham"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "Standard"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet keyboard"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx-serien"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Fonetisk"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Polsk"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Polsk (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytonisk"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "Tryk venstre Win-tast for at v�lge tredje niveau"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Tryk venstre Win-tast for at v�lge tredje niveau"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Tryk menutast for at v�lge tredje niveau"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "Tryk h�jre Win-tast for at v�lge tredje niveau"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Tryk h�jre Ctrl-tast for at v�lge tredje niveau"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Tryk h�jre Win-tast for at v�lge tredje niveau"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "Tryk en af Win-tasterne for at v�lge tredje niveau"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Tryk en af Win-tasterne for at v�lge tredje niveau"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "H�jre Alt skifter gruppe mens nedtrykket"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "H�jre Alt er Compose"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "H�jre Alt-tast skifter gruppe"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "H�jre Ctrl-tast virker som h�jre Alt"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "H�jre Ctrl-tast skifter gruppe"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "H�jre skiftetast skifter gruppe"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "H�jre Win-tast skifter gruppe"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "H�jre Win-tast er Compose"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "H�jre Win-tast skifter gruppe mens nedtrykket"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Rum�nsk"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rum"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Russisk"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Scroll Lock LED viser alternativ gruppe"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "Skift med numeriske taster virker som i MS Windows"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "Caps Lock-tast skifter gruppe"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Slovakisk (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "Spansk"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Specialtaster (Ctrl+Alt+&lt;key&gt;) h�ndteret i en server."
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Standard"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Sun d�de taster"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super ligger p� Win-tasterne (standard)."
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Ombyt Ctrl og Caps Lock"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Sve"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "Svensk"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "Schweizisk-fransk"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "Schweizisk-tysk"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet-pc)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Syrisk"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Fonetisk"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tajik"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamil"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugu"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Thai (TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Tredje niveaus v�lgere"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tyr"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Tyrkisk (F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Tyrkisk Alt-Q-layout"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "U.S. Engelsk"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "U.S. Engelsk w/ ISO9995-3"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "U.S. Engelsk m. d�de taster"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "US"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "US-tastatur med rum�nske bogstaver"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "USA"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Ukraine"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Bruger tastatur-LED til at vise alternativ gruppe"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Bruger intern forst�rrelse af bogstaver. Skift annullerer Caps Lock."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr ""
 "Bruger intern forst�rrelse af bogstaver. Skift annullerer ikke Caps Lock."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Uzbekisk"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Win-taster"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "Malayalam"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Yugoslavisk"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/cifre"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "omsk"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "cifre"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/komma"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/punktum"
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/komma"
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/punktum"
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/komma"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/punktum"
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/komma"
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/punktum"
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "b�bar"
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/cifre"
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/komma"
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/punktum"
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/komma"
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/punktum"
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/komma"
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/punktum"
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/komma"
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/punktum"
 
diff --git a/po/fr.po b/po/fr.po
index 75682bad..c3b4781c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2004-01-04 20:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -649,909 +649,919 @@ msgid "Israeli"
 msgstr "Isra�lien"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Isra�lien"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Ita"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "Italien"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Japanais"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Japanese 106-cl�s"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Kannada"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "Norv�gien"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Laptop"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "clavier Laptop/notebook Compaq (ie. Armada) Laptop"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "clavier Laptop/notebook Compaq (ie. Presario) Internet"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "clavier Laptop/notebook Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latin"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Am�rique latine"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Latvian"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "cl� gauche Alt change de groupe"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "cl� gauche Win-key bascule de groupe lorsqu'enfonc�"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "cl� Ctrl gauche change de groupe"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "cl� gauche Shift change de groupe"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "cl� gauche Win-key change de groupe"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "cl� gauche Win-key bascule de groupe lorsqu'enfonc�"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Lithuanien azerty standard"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Lithuanian qwerty \"num�rique\""
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "clavier Logitech Deluxe Access"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (option alternative)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (option2 alternative)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "clavier Logitech Deluxe Access"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "clavier Logitech Internet"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "clavier Logitech Internet Navigator"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "clavier Logitech iTouch Cordless (model Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "clavier Logitech iTouch Internet Navigator"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Ltu"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lva"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Mac�donien"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh ancien"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "rendre la touche CapsLock un contr�le additionnel"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Maltais"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Maltais (disposition US)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "clavier Memorex MX2500 EZ-Access"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Menu est Compose"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "cl� Menu change de groupe"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "M�ta est mapp� sur les Win-Keys"
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "M�ta est mapp� � la cl� gauche Win-key"
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "clavier Microsoft Internet"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "clavier Microsoft Internet Pro, Su�dois"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "clavier Microsoft Natural Pro / Microsoft Internet Pro"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "clavier Microsoft Natural Pro OEM"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "clavier Microsoft Office"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "clavier Microsoft Internet"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "diverses options de compatibilit�"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Mongole"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Saami du Nord (Finlande)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Saami du Nord (Norv�ge)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Saami du Nord (Su�de)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Norv�gien"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "le LED Num_Lock indique un groupe alternatif"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Ogham"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "Standard"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet keyboard"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx Series"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Phon�tique"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Polonais"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Polonais (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytonique"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "enfoncer la cl� gauche Win-Key pour choisir le 3e niveau"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "enfoncer la cl� gauche Win-Key pour choisir le 3e niveau"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "enfoncer la cl� Menu pour choisir le 3e niveau"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "enfoncer la cl� droite Win-key pour choisir le 3e niveau"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "enfoncer la cl� Contr�le pour choisir le 3e niveau"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "enfoncer la cl� droite Win-key pour choisir le 3e niveau"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "enfoncer n'importe cl� Win-key pour choisir le 3e niveau"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "enfoncer n'importe cl� Win-key pour choisir le 3e niveau"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "la cl� droite Alt bascule de groupe lorsque'enfonc�e"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "la cl� droite Alt est Compose"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "la cl� droite Alt change de groupe"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "la cl� droite Contr�le se comporte comme la cl� droite Alt"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "la cl� droite Ctrl change de groupe"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "la cl� droite Shift change de groupe"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "la cl� droite Win-key change de groupe"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "la cl� droite Win-key est Compose"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "la cl� droite Win-key bascule de groupe lorsqu'enfonc�e"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Roumain"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rou"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Russe"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "le LED Scroll_Lock indique un groupe alternatif"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Serbe"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "la cl� Shift avec le pav� nu�rique se comporte comme dans MS Windows"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "la cl� Caps Lock change de groupe"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Slovaque (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Slov�ne"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "les sp�ciales (Ctrl+Alt+&lt;cl�&gt;) sont trait�es par le serveur."
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Standard"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "cl�s mortes Sun"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super est mapp� au cl�s Win-keys (par d�faut)."
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "interchanger Contr�le et Caps_lock"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Su�"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "Su�dois"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "Fran�ais Suisse"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "Allemand Suisse"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Syriac"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Phon�tique"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tajik"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamoul"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugu"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Thai (TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "s�lecteur du 3e niveau"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "clavier Trust Direct Access"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "clavier classique Trust Wireless"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tur"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Turque"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Turque (F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "disposition Turque Alt-Q"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "Anglais U.S."
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "Anglais U.S. w/ ISO9995-3"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "Anglais U.S. w/ cl�s mortes"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "US"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "clavier US avec lettres roumaines"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "USA"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Ukr�nien"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Royaume Uni"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Utiliser le LED du clavier pour afficher un groupe alternatif"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "utiliser la mise en majuscule interne. Shift l'annule."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "utiliser la mise en majuscule interne. Shift ne permet de l'annuler."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Uzb�que"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Winkeys"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "Malayalam"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "clavier Yahoo! Internet"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Yugoslave"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/chiffres"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "chiffres"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/virgule"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/dot"
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/virgule"
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/dot"
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/comma"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/dot"
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/comma"
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/dot"
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "laptop"
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/chiffres"
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/virgule"
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/dot"
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/virgule"
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/dot"
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/virgule"
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/dot"
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/virgule"
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/dot"
 
diff --git a/po/hu.po b/po/hu.po
index 3bbbee9a..c37cf14c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2004-01-24 10:46+0100\n"
 "Last-Translator: Andras Timar <timar@fsf.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -652,915 +652,925 @@ msgid "Israeli"
 msgstr "izraeli"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "izraeli"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Ita"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "olasz"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "japán"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "japán 106 gombos"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "kannada"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "norvég"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Laptop"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (pl. Armada) Laptop Keyboard"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (pl. Presario) Internet Keyboard"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Laptop/notebook Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "latin"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "latin-amerikai"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "lett"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "A bal Alt lenyomásával lehet csoportot váltani"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr ""
 "A bal Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "A bal Ctrl lenyomásával lehet csoportot váltani"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "A bal Shift lenyomásával lehet a csoportot váltani"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "A bal Win billentyű lenyomásával lehet a csoportok közt váltani"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr ""
 "A bal Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "litván (azerty)"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "litván (qwerty, \"numerikus\")"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (másik lehetőség)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (harmadik lehetőség)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch Keyboard Internet Navigator"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Ltu"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lva"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "macedón"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh Old"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "A Caps Lock is Ctrl billentyűnek számítson"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "malajalam"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "máltai"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "máltai (amerikai kiosztás)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access billentyűzet"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "A Menü a kombináló (Compose)"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "A Menü billentyűvel lehet csoportot váltani"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "A Meta a Win billentyűkhöz van rendelve."
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "A Meta a bal Win billentyűhöz van rendelve."
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, svéd"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office billentyűzet"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Egyéb kompatibilitási beállítások"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "mongol"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "északi lapp (Finnország)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "északi lapp (Norvégia)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "északi lapp (Svédország)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "norvég"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "A Num Lock LED-je mutassa a másik csoportot"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "ogham"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "Szabványos"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet billentyűzet"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "orija"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx Series"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "fonetikus"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "lengyel"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "lengyel (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytonic"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "portugál"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "A bal Win billentyűvel lehet a harmadik szintet választani"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "A bal Win billentyűvel lehet a harmadik szintet választani"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "A Menü billentyűvel lehet a harmadik szintet választani"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "A jobb Win billentyűvel lehet a harmadik szintet választani"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "A jobb Ctrl-lal lehet a haramdik szintet választani"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "A jobb Win billentyűvel lehet a harmadik szintet választani"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "Bármelyik Win billentyűvel lehet a harmadik szintet választani"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Bármelyik Win billentyűvel lehet a harmadik szintet választani"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "A jobb Alt lenyomva tartása mellett lehet a csoportok közt váltani"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "A jobb Alt a kombináló (Compose)"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "A jobb Alt-tal lehet csoportot váltani"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "A jobb Ctrl úgy működjön, mint a jobb Alt"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "A jobb Ctrl lenyomásával lehet csoportot váltani"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "A jobb Shift lenyomásával lehet csoportot váltani"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "A jobb Win billentyű lenyomásával lehet a csoportok közt váltani"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "A jobb Win billentyű a kombináló (Compose)"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr ""
 "A jobb Win billentyű lenyomva tartása mellett lehet a csoportok közt váltani"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "román"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rou"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "orosz"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "A Scroll Lock LED-je mutassa a másik csoportot"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "szerb"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr ""
 "A Shift+numerikus billentyűk úgy működjenek, mint Microsoft Windowsban."
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "A Caps Lock-kal lehet csoportot váltani"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "szlovák"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "szlovák (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "szlovén"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "spanyol"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr ""
 "Speciális billentyűk (Ctrl+Alt+&lt;key&gt;), amelyeket a kiszolgáló kezel."
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Szabványos"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Sun halott billentyűk"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr ""
 "A Super billentyű a Win billentyűkhöz van rendelve (ez az alapértelmezés)."
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "A Ctrl és a Caps Lock felcserélése"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Swe"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "svéd"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "svájci francia"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "svájci német"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "szír"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "fonetikus"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "tadzsik"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "tamil"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "telugu"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "thai (kedmanee)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "thai (pattachote)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "thai (TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Harmadik szintű választók"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access billentyűzet"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tur"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "török"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "török (F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Turkish Alt-Q kiosztás"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "amerikai angol"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "amerikai angol (ISO9995-3 szerint)"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "amerikai angol halott billentyűkkel"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "US"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "US billentyűzet román betűkkel"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "USA"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "ukrán"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "brit angol"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "A másik csoport mutatása a billentyűzet LED-jeivel"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Nagybetűkre váltás - a Shift megszakítja."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Nagybetűkre váltás - a Shift nem szakítja meg."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "üzbég"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "vietnami"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Winkeys"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "malajalam"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet billentyűzet"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "jugoszláv"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/számjegyek"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "számjegyek"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/vessző"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/pont"
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/vessző"
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/pont"
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/vessző"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/pont"
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/vessző"
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/pont"
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "laptop"
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/számjegyek"
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/vessző"
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/pont"
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/vessző"
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/pont"
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/vessző"
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/pont"
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/vessző"
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/pont"
 
diff --git a/po/nl.po b/po/nl.po
index e2d1565f..c59a6ac0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2004-01-03 15:04+0100\n"
 "Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -650,909 +650,919 @@ msgid "Israeli"
 msgstr "Israëlisch"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Israëlisch"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Ita"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "Italiaans"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Japans"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Japans 106-toetsen"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Kannada"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "Noors"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Laptop"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (bijv. Armada) laptop toetsenbord"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (bijv. Presario) internet toetsenbord"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Laptop/notebook Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latijn"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Latijns-Amerikaans"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Lets"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Linker Alt-toets verandert groep"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "Linker Win-toets schakelt groep bij indrukken"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Linker Ctrl-toets verandert groep"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Linker Shift-toets verandert groep"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Linker Win-toets verandert groep"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Linker Win-toets schakelt groep bij indrukken"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Litouwse azerty standaard"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Litouws qwerty \"numeriek\""
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Deluxe Access toetsenbord"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optisch"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (alternatieve optie)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (alternatieve optie2)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access toetsenbord"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech internet toetsenbord"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator toetsenbord"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch draadloos toetsenbord (model Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch toetsenbord Internet Navigator"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Ltu"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lva"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Macedonisch"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh oud"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "Van CapsLock een extra Control maken"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malayalamees"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Maltees"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Maltees (Amerikaanse indeling)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access toetsenbord"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Menu is samenstellingstoets"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Menu-toets verandert groep"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta wordt afgebeeld op de Win-toetsen."
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta wordt afgebeeld op de linker Win-toets."
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft internet toetsenbord"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Zweeds"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office toetsenbord"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft internet toetsenbord"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Overige compatibiliteitsopties"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Mongools"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Noord-Lapland (Finland)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Noord-Lapland (Noorwegen)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Noord-Lapland (Zweden)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Noors"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "NumLock LED toont alternatieve groep"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Oghamees"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "Standaard"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet toetsenbord"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx serie"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Fonetisch"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Pools"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Pools (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytonisch"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "Druk op de linker Win-toets om het 3e niveau te kiezen"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Druk op de linker Win-toets om het 3e niveau te kiezen"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Druk op de Menu-toets om het 3e niveau te kiezen"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "Druk op de rechter Win-toets om het 3e niveau te kiezen"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Druk op de rechter Control op het 3e niveau te kiezen"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Druk op de rechter Win-toets om het 3e niveau te kiezen"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "Druk op een Win-toets om het 3e niveau te kiezen"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Druk op een Win-toets om het 3e niveau te kiezen"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "R-Alt schakelt groep bij indrukken"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Rechter Alt is samenstellingstoets"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Rechter Alt-toets verandert groep"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Rechter Control-toets werkt als rechter Alt"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Rechter Ctrl-toets verandert groep"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Rechter Shift-toets verandert groep"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Rechter Win-toets verandert groep"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Rechter Win-toets is samenstellingstoets"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Rechter Win-toets schakelt groep bij indrukken"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Roemeens"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rou"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Russisch"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "ScrollLock LED toont alternatieve groep"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Servisch"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "Shift met cijferblok-toetsen werkt zoals in MS Windows"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "CapsLock-toets verandert groep"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Slowaaks"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Slowaaks (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "Spaans"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Speciale toetsen (Ctrl+Alt+&lt;toets&gt;) afgehandeld in een server."
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Standaard"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Sun dode toetsen"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super wordt afgebeeld op de Win-toetsen (standaard)."
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Control en CapsLock verwisselen"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Swe"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "Zweeds"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "Zwitsers-Frans"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "Zwitsers-Duits"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Syrisch"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Fonetisch"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tadzjikisch"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamil"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugu"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Thaïsch (Kedmanee)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Thaïsch (Pattachote)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Thaïsch (TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Derde niveau kiezers"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access toetsenbord"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tur"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Turks"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Turks (F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Turkse Alt-Q indeling"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "Amerikaans-Engels"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "Amerikaans-Engels met ISO9995-3"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "Amerikaans-Engels met dode toetsen"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "Amerikaans"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "Amerikaans toetsenbord met Roemeense letters"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "USA"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Oekraïens"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Verenigd Koninkrijk"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Gebruik toetsenbord LED om alternatieve groep te tonen"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Gebruikt interne conversie naar hoofdletters. Shift heft Caps op."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Gebruikt interne conversie naar hoofdletters. Shift heft Caps niet op."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Oezbeeks"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Viëtnamees"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Win-toetsen"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "Malayalamees"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! internet toetsenbord"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Joegoslavisch"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/cijfers"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "cijfers"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/komma"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/punt"
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/komma"
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/punt"
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/komma"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/punt"
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/komma"
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/punt"
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "laptop"
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/cijfers"
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/komma"
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/punt"
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/komma"
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/punt"
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/komma"
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/punt"
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/komma"
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/punt"
 
diff --git a/po/ru.po b/po/ru.po
index acfec4c3..bc56e464 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-04 01:03+0100\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2004-01-09 16:17+0000\n"
 "Last-Translator: Sergey V. Oudaltsov <svu@gnome.org>\n"
 "Language-Team: Russian <ru@li.org>\n"
diff --git a/po/sk.po b/po/sk.po
index 9b6a77c3..459224f7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2003-12-10 21:36+0100\n"
 "Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -649,909 +649,919 @@ msgid "Israeli"
 msgstr "Izraelské"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Izraelské"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Tal"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "Talianske"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Japonské"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Japonskáé106 kláves"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Knn"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Kannadské"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "Nórske"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Laptop"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (napr. Armada) Laptop Keyboard"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (napr. Presario) Internet Keyboard"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Laptop/notebook Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latinské"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Latinská Amerika"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Lotyšské"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Ľavý kláves Alt mení skupinu"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "Ľavý Win-kláves prepína skupinu pri stlačení"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Ľavý kláves Ctrl mení skupinu"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Ľavý kláves Shift mení skupinu"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Ľavý Win-kláves mení skupinu"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Ľavý Win-kláves prepína skupinu pri stlačení"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Litovské azerty štandardné"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Litovské qwerty \"číselné\""
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (alternatívna voľba)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (alternatívna voľba2)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch keyboard Internet Navigator"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Lit"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lot"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Macedónske"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh staré"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "Urobiť z CapsLock dodatočný Control"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malajalamské"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Maltézske"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Maltézske (US)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Ponuka je Compose"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Kláves Ponuka mení skupinu"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta je mapovaný na Win-klávesy."
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta je mapovaný na ľavý Win-kláves."
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Švédska"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Dodatočné voľby pre kompatibilitu"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mak"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Mongloské"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Severný Saami (Fínsko)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Severný Saami (Nórsko)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Severný Saami (Švédsko)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Nórske"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Num_Lock LED zobrazuje alternatívnu skupinu"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Oghamské"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "Štandardné"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet keyboard"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "Séria PC-98xx"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Fonetické"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Poľské"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Poľské (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytónické"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portugalské"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "Stlačenie ľavého Win-klávesu vyberá 3. úroveň"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Stlačenie ľavého Win-klávesu vyberá 3. úroveň"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Stlačenie klávesu Ponuka vyberá 3. úroveň"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "Stlačenie pravého klávesu Win vyberá 3. úroveň"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Stlačenie pravého Control vyberá 3. úroveň"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Stlačenie pravého klávesu Win vyberá 3. úroveň"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "Stlačenie niektorého klávesu Win vyberá 3. úroveň"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Stlačenie niektorého klávesu Win vyberá 3. úroveň"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "R-Alt prepína skupinu pri stlačení"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Pravý Alt je Compose"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Pravý Alt mení skupinu"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Kláves pravý Control funguje ako pravý Alt"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Kláves pravý Ctrl mení skupinu"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Kláves pravý Shift mení skupinu"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Pravý kláves Win mení skupinu"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Pravý kláves Win je Compose"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Pravý kláves Win prepína skupinu pri stlačení"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Rumunské"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rum"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Ruské"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Scroll_Lock LED zobrazuje alternatívnu skupinu"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Srbské"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "Shift s numerickými klávesmi pracuje ako v MS Windows"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "Kláves Caps Lock mení skupinu"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Slovenské"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Slovenské (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Slovinské"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "Španielske"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Špeciálne klávesy (Ctrl+Alt+&lt;key&gt;) spracované na serveru."
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Štandardné"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Mŕtve klávesy Sun"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super je mapovaný na Win-klávesy (štandardné)."
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Prehodiť Control a Caps Lock"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Swe"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "Švédske"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "Švajčiarske francúzske"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "Nemecké (Švajčiarsko)"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Syrské"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Fonetické"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tadžitské"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamilské"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugské"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Thajské (Kedmanee)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Thajské (Pattachote)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Thajské (TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Výber tretej úrovne"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tur"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Turecké"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Turecké (F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Turecké rozloženie Alt-Q"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "U.S.A. anglické"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "U.S.A. anglické s ISO9995-3"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "Anglické (US) s mŕtvymi klávesmi"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "US"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "Americká klávesnica s rumunskými písmami"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "USA"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Ukrajinské"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Spojené kráľovstvo"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Použiť LED klávesnice pre zobrazenie alternatívnej skupiny"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Používa interný prevod na kapitálky. Shift ruší Caps."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Používa interný prevod na kapitálky. Shift neruší Caps."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Uzbecké"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Vietnamské"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Win klávesy"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "Malajalamské"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Juh"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Juhoslovanské"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/číslice"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "číslice"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/čiarka"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/bodka"
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/čiarka"
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/bodka"
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/čiarka"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/bodka"
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/čiarka"
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/bodka"
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "laptop"
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/číslice"
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/čiarka"
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/bodka"
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/čiarka"
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/bodka"
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/čiarka"
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/bodka"
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/čiarka"
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/bodka"
 
diff --git a/po/sq.po b/po/sq.po
index 4efec73d..d28cc4ec 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-25 23:38+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2004-03-03 08:55-0500\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -108,1358 +108,1462 @@ msgid "Azerbaijani"
 msgstr "Azerbaijani"
 
 #: xfree86.xml.in.h:24
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Tastierë për Internet Logitech"
+
+#: xfree86.xml.in.h:25
 msgid "BTC 5090"
 msgstr "BTC 5090"
 
-#: xfree86.xml.in.h:25
+#: xfree86.xml.in.h:26
 msgid "BTC 5113RF Multimedia"
 msgstr "BTC 5113RF Multimedia"
 
-#: xfree86.xml.in.h:26
+#: xfree86.xml.in.h:27
 msgid "BTC 5126T"
 msgstr "BTC 5126T"
 
-#: xfree86.xml.in.h:27
+#: xfree86.xml.in.h:28
 msgid "BTC 9000"
 msgstr "BTC 9000"
 
-#: xfree86.xml.in.h:28
+#: xfree86.xml.in.h:29
 msgid "BTC 9000A"
 msgstr "BTC 9000A"
 
-#: xfree86.xml.in.h:29
+#: xfree86.xml.in.h:30
 msgid "BTC 9001AH"
 msgstr "BTC 9001AH"
 
-#: xfree86.xml.in.h:30
+#: xfree86.xml.in.h:31
 msgid "Basic"
 msgstr "Bazë"
 
-#: xfree86.xml.in.h:31
+#: xfree86.xml.in.h:32
 msgid "Bel"
 msgstr "Bel"
 
-#: xfree86.xml.in.h:32
+#: xfree86.xml.in.h:33
 msgid "Belarusian"
 msgstr "Bjelloruse"
 
-#: xfree86.xml.in.h:33
+#: xfree86.xml.in.h:34
 msgid "Belgian"
 msgstr "Belg"
 
-#: xfree86.xml.in.h:34
+#: xfree86.xml.in.h:35
 msgid "Ben"
 msgstr "Ben"
 
-#: xfree86.xml.in.h:35
+#: xfree86.xml.in.h:36
 msgid "Bengali"
 msgstr "Bengali"
 
-#: xfree86.xml.in.h:36
+#: xfree86.xml.in.h:37
 msgid "Bgr"
 msgstr "Bgr"
 
-#: xfree86.xml.in.h:37
+#: xfree86.xml.in.h:38
 msgid "Bih"
 msgstr "Bih"
 
-#: xfree86.xml.in.h:38
+#: xfree86.xml.in.h:39
 msgid "Blr"
 msgstr "Blr"
 
-#: xfree86.xml.in.h:39
+#: xfree86.xml.in.h:40
 msgid "Bosnian"
 msgstr "Bosnjake"
 
-#: xfree86.xml.in.h:40
+#: xfree86.xml.in.h:41
 msgid "Both Alt keys together change group"
 msgstr "Dy pulsantët Alt së bashku ndryshjnë grupin"
 
-#: xfree86.xml.in.h:41
+#: xfree86.xml.in.h:42
 msgid "Both Ctrl keys together change group"
 msgstr "Dy pulsantët Ctrl së bashku ndryshojnë grupin"
 
-#: xfree86.xml.in.h:42
+#: xfree86.xml.in.h:43
 msgid "Both Shift keys together change group"
 msgstr "Dy pulsantët Shift së bashku ndryshojnë grupin"
 
-#: xfree86.xml.in.h:43
+#: xfree86.xml.in.h:44
 msgid "Both Win-keys switch group while pressed"
 msgstr "Të dy pulsantët Win ndryshojnë gropin kur shtypen"
 
-#: xfree86.xml.in.h:44
+#: xfree86.xml.in.h:45
 msgid "Bra"
 msgstr "Bra"
 
-#: xfree86.xml.in.h:45
+#: xfree86.xml.in.h:46
 msgid "Brazilian"
 msgstr "Braziliane"
 
-#: xfree86.xml.in.h:46
+#: xfree86.xml.in.h:47
 msgid "Brazilian ABNT2"
 msgstr "Braziliane ABNT2"
 
-#: xfree86.xml.in.h:47
+#: xfree86.xml.in.h:48
 msgid "Brother Internet Keyboard"
 msgstr "Tastiera Internet Brother"
 
-#: xfree86.xml.in.h:48
+#: xfree86.xml.in.h:49
 msgid "Bulgarian"
 msgstr "Bullgarisht"
 
-#: xfree86.xml.in.h:49
+#: xfree86.xml.in.h:50
 msgid "Burmese"
 msgstr "Burmese"
 
-#: xfree86.xml.in.h:50
+#: xfree86.xml.in.h:51
 msgid "Can"
 msgstr "Can"
 
-#: xfree86.xml.in.h:51
+#: xfree86.xml.in.h:52
 msgid "Canadian"
 msgstr "Kanadeze"
 
-#: xfree86.xml.in.h:52
+#: xfree86.xml.in.h:53
 msgid "Caps Lock key changes group"
 msgstr "Pulsanti Caps Lock ndryshon grupin"
 
-#: xfree86.xml.in.h:53
+#: xfree86.xml.in.h:54
 msgid "CapsLock key behavior"
 msgstr "Sjellja e pulsantit CapsLock"
 
-#: xfree86.xml.in.h:54
+#: xfree86.xml.in.h:55
 msgid "Caps_Lock LED shows alternative group"
 msgstr "Llampa e Caps_Lock tregon grupin alternativ"
 
-#: xfree86.xml.in.h:55
+#: xfree86.xml.in.h:56
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: xfree86.xml.in.h:56
+#: xfree86.xml.in.h:57
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (opcioni alterno)"
 
-#: xfree86.xml.in.h:57
+#: xfree86.xml.in.h:58
 msgid "Chicony Internet Keyboard"
 msgstr "Tastiera Internet Chicony"
 
-#: xfree86.xml.in.h:58
+#: xfree86.xml.in.h:59
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: xfree86.xml.in.h:59
+#: xfree86.xml.in.h:60
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: xfree86.xml.in.h:60
+#: xfree86.xml.in.h:61
 msgid "CloGaelach Laptop"
 msgstr "Laptop CloGaelach"
 
-#: xfree86.xml.in.h:61
+#: xfree86.xml.in.h:62
 msgid "Compaq Easy Access Keyboard"
 msgstr "Tastiera Compaq Easy Access"
 
-#: xfree86.xml.in.h:62
+#: xfree86.xml.in.h:63
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Tatiera Internet Compaq (13 pulsante)"
 
-#: xfree86.xml.in.h:63
+#: xfree86.xml.in.h:64
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Tastiera Internet Compaq (18 pulsante)"
 
-#: xfree86.xml.in.h:64
+#: xfree86.xml.in.h:65
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Tastiera Internet Compaq (7 pulsante)"
 
-#: xfree86.xml.in.h:65
+#: xfree86.xml.in.h:66
 msgid "Compaq iPaq Keyboard"
 msgstr "Tastiera Compaq iPaq"
 
-#: xfree86.xml.in.h:66
+#: xfree86.xml.in.h:67
 msgid "Control Key Position"
 msgstr "Pozicioni i pulsantit Control"
 
-#: xfree86.xml.in.h:67
+#: xfree86.xml.in.h:68
 msgid "Control key at bottom left"
 msgstr "Pulsanti Control sipër majtas"
 
-#: xfree86.xml.in.h:68
+#: xfree86.xml.in.h:69
 msgid "Control key at left of 'A'"
 msgstr "Pulsanti Control në të majtë të 'A'"
 
-#: xfree86.xml.in.h:69
+#: xfree86.xml.in.h:70
 msgid "Control+Shift changes group"
 msgstr "Control+Shift ndryshon grupin"
 
-#: xfree86.xml.in.h:70
+#: xfree86.xml.in.h:71
 msgid "Croatian"
 msgstr "Kroate"
 
-#: xfree86.xml.in.h:71
+#: xfree86.xml.in.h:72
 msgid "Cyrillic"
 msgstr "Cyrillic"
 
-#: xfree86.xml.in.h:72
+#: xfree86.xml.in.h:73
 msgid "Cze"
 msgstr "Cze"
 
-#: xfree86.xml.in.h:73
+#: xfree86.xml.in.h:74
 msgid "Czech"
 msgstr "Çekisht"
 
-#: xfree86.xml.in.h:74
+#: xfree86.xml.in.h:75
 msgid "Czech (qwerty)"
 msgstr "Czech (qwerty)"
 
-#: xfree86.xml.in.h:75
+#: xfree86.xml.in.h:76
+msgid "DTK2000"
+msgstr ""
+
+#: xfree86.xml.in.h:77
 msgid "Danish"
 msgstr "Danisht"
 
-#: xfree86.xml.in.h:76
+#: xfree86.xml.in.h:78
 msgid "Dead acute"
 msgstr "Fund kritik"
 
-#: xfree86.xml.in.h:77
+#: xfree86.xml.in.h:79
 msgid "Dead grave acute"
 msgstr "Fund kritik serioz"
 
-#: xfree86.xml.in.h:78
+#: xfree86.xml.in.h:80
 msgid "Dell"
 msgstr "Dell"
 
-#: xfree86.xml.in.h:79
+#: xfree86.xml.in.h:81
 msgid "Dell 101-key PC"
 msgstr "Dell 101-key PC"
 
-#: xfree86.xml.in.h:80
+#: xfree86.xml.in.h:82
 msgid "Deu"
 msgstr "Deu"
 
-#: xfree86.xml.in.h:81
+#: xfree86.xml.in.h:83
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Tastierë Dexxa Wireless Desktop"
 
-#: xfree86.xml.in.h:82
+#: xfree86.xml.in.h:84
 msgid "Diamond 9801 / 9802 series"
 msgstr "Seritë Diamond 9801 / 9802"
 
-#: xfree86.xml.in.h:83
+#: xfree86.xml.in.h:85
 msgid "Dnk"
 msgstr "Dnk"
 
-#: xfree86.xml.in.h:84
+#: xfree86.xml.in.h:86
 msgid "Dutch"
 msgstr "Hollandeze"
 
-#: xfree86.xml.in.h:85
+#: xfree86.xml.in.h:87
 msgid "Dvo"
 msgstr "Dvo"
 
-#: xfree86.xml.in.h:86
+#: xfree86.xml.in.h:88
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: xfree86.xml.in.h:87
+#: xfree86.xml.in.h:89
+msgid "Dzongkha / Tibetan"
+msgstr ""
+
+#: xfree86.xml.in.h:90
 msgid "Eliminate dead keys"
 msgstr "Elemino pulsantët e vdekur"
 
-#: xfree86.xml.in.h:88
+#: xfree86.xml.in.h:91
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: xfree86.xml.in.h:89
+#: xfree86.xml.in.h:92
 msgid "Esp"
 msgstr "Esp"
 
-#: xfree86.xml.in.h:90
+#: xfree86.xml.in.h:93
 msgid "Est"
 msgstr "Est"
 
-#: xfree86.xml.in.h:91
+#: xfree86.xml.in.h:94
 msgid "Estonian"
 msgstr "Estonisht"
 
-#: xfree86.xml.in.h:92
+#: xfree86.xml.in.h:95
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: xfree86.xml.in.h:93
+#: xfree86.xml.in.h:96
 msgid "Extended"
 msgstr "E zgjeruar"
 
-#: xfree86.xml.in.h:94
+#: xfree86.xml.in.h:97
 msgid "Fao"
 msgstr "Fao"
 
-#: xfree86.xml.in.h:95
+#: xfree86.xml.in.h:98
 msgid "Faroese"
 msgstr "Faroese"
 
-#: xfree86.xml.in.h:96
+#: xfree86.xml.in.h:99
 msgid "Farsi"
 msgstr "Farsi"
 
-#: xfree86.xml.in.h:97
+#: xfree86.xml.in.h:100
 msgid "Fin"
 msgstr "Fin"
 
-#: xfree86.xml.in.h:98
+#: xfree86.xml.in.h:101
 msgid "Finnish"
 msgstr "Finlandeze"
 
-#: xfree86.xml.in.h:99
+#: xfree86.xml.in.h:102
 msgid "Fra"
 msgstr "Fra"
 
-#: xfree86.xml.in.h:100
+#: xfree86.xml.in.h:103
 msgid "French"
 msgstr "Frengjisht"
 
-#: xfree86.xml.in.h:101
+#: xfree86.xml.in.h:104
 msgid "French (alternative)"
 msgstr "Franceze (alternativa)"
 
-#: xfree86.xml.in.h:102
+#: xfree86.xml.in.h:105
 msgid "French Canadian"
 msgstr "Frengjisht e Kanadasë"
 
-#: xfree86.xml.in.h:103
+#: xfree86.xml.in.h:106
 msgid "GBr"
 msgstr "GBr"
 
-#: xfree86.xml.in.h:104
+#: xfree86.xml.in.h:107
 msgid "Generic 101-key PC"
 msgstr "Generic 101-key PC"
 
-#: xfree86.xml.in.h:105
+#: xfree86.xml.in.h:108
 msgid "Generic 102-key (Intl) PC"
 msgstr "Generic 102-key (Intl) PC"
 
-#: xfree86.xml.in.h:106
+#: xfree86.xml.in.h:109
 msgid "Generic 104-key PC"
 msgstr "Generic 104-key PC"
 
-#: xfree86.xml.in.h:107
+#: xfree86.xml.in.h:110
 msgid "Generic 105-key (Intl) PC"
 msgstr "Generic 105-key (Intl) PC"
 
-#: xfree86.xml.in.h:108
+#: xfree86.xml.in.h:111
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 
-#: xfree86.xml.in.h:109
+#: xfree86.xml.in.h:112
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: xfree86.xml.in.h:113
 msgid "Geo"
 msgstr "Geo"
 
-#: xfree86.xml.in.h:110
+#: xfree86.xml.in.h:114
 msgid "Georgian (latin)"
 msgstr "Georgian (latine)"
 
-#: xfree86.xml.in.h:111
+#: xfree86.xml.in.h:115
 msgid "Georgian (russian)"
 msgstr "Georgian (rusisht)"
 
-#: xfree86.xml.in.h:112
+#: xfree86.xml.in.h:116
 msgid "German"
 msgstr "Gjermanisht"
 
-#: xfree86.xml.in.h:113
+#: xfree86.xml.in.h:117
 msgid "Grc"
 msgstr "Grc"
 
-#: xfree86.xml.in.h:114
+#: xfree86.xml.in.h:118
 msgid "Greek"
 msgstr "Greqisht"
 
-#: xfree86.xml.in.h:115
+#: xfree86.xml.in.h:119
 msgid "Group Shift/Lock behavior"
 msgstr "Sjellja e grupit Shift/Lock"
 
-#: xfree86.xml.in.h:116
+#: xfree86.xml.in.h:120
 msgid "Guj"
 msgstr "Guj"
 
-#: xfree86.xml.in.h:117
+#: xfree86.xml.in.h:121
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: xfree86.xml.in.h:118
+#: xfree86.xml.in.h:122
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: xfree86.xml.in.h:119
+#: xfree86.xml.in.h:123
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Tastierë për Internet Hewlett-Packard"
 
-#: xfree86.xml.in.h:120
+#: xfree86.xml.in.h:124
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: xfree86.xml.in.h:121
+#: xfree86.xml.in.h:125
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: xfree86.xml.in.h:122
+#: xfree86.xml.in.h:126
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: xfree86.xml.in.h:123
+#: xfree86.xml.in.h:127
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: xfree86.xml.in.h:124
+#: xfree86.xml.in.h:128
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: xfree86.xml.in.h:125
+#: xfree86.xml.in.h:129
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: xfree86.xml.in.h:126
+#: xfree86.xml.in.h:130
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: xfree86.xml.in.h:127
+#: xfree86.xml.in.h:131
 msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
 msgstr "Tastierë multimediale Hewlett-Packard SK-2501"
 
-#: xfree86.xml.in.h:128
+#: xfree86.xml.in.h:132
 msgid "Hewlett-Packard SK-2505 Internet Keyboard"
 msgstr "Tastierë për Internet Hewlett-Packard SK-2505"
 
-#: xfree86.xml.in.h:129
+#: xfree86.xml.in.h:133
 msgid "Hin"
 msgstr "Hin"
 
-#: xfree86.xml.in.h:130
+#: xfree86.xml.in.h:134
 msgid "Hindi"
 msgstr "Hindi"
 
-#: xfree86.xml.in.h:131
+#: xfree86.xml.in.h:135
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: xfree86.xml.in.h:132
+#: xfree86.xml.in.h:136
 msgid "Hrv"
 msgstr "Hrv"
 
-#: xfree86.xml.in.h:133
+#: xfree86.xml.in.h:137
 msgid "Hun"
 msgstr "Hun"
 
-#: xfree86.xml.in.h:134
+#: xfree86.xml.in.h:138
 msgid "Hungarian"
 msgstr "Hungarisht"
 
-#: xfree86.xml.in.h:135
+#: xfree86.xml.in.h:139
 msgid "Hungarian (qwerty)"
 msgstr "Hungareze (qwerty)"
 
-#: xfree86.xml.in.h:136
+#: xfree86.xml.in.h:140
 msgid "Hyper is mapped to the Win-keys."
 msgstr "Hyper është vendosur tek pulsantët Win."
 
-#: xfree86.xml.in.h:137
+#: xfree86.xml.in.h:141
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: xfree86.xml.in.h:138
+#: xfree86.xml.in.h:142
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: xfree86.xml.in.h:139
+#: xfree86.xml.in.h:143
 msgid "IBM Rapid Access II (alternate option)"
 msgstr "IBM Rapid Access II (opcioni alternativ)"
 
-#: xfree86.xml.in.h:140
+#: xfree86.xml.in.h:144
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: xfree86.xml.in.h:141
+#: xfree86.xml.in.h:145
 msgid "INSCRIPT layout"
 msgstr "Planimetri INSCRIPT"
 
-#: xfree86.xml.in.h:142
+#: xfree86.xml.in.h:146
 msgid "IS434"
 msgstr "IS434"
 
-#: xfree86.xml.in.h:143
+#: xfree86.xml.in.h:147
 msgid "IS434 laptop"
 msgstr "Laptop IS434"
 
-#: xfree86.xml.in.h:144
+#: xfree86.xml.in.h:148
 msgid "ISO Alternate"
 msgstr "ISO Alternative"
 
-#: xfree86.xml.in.h:145
+#: xfree86.xml.in.h:149
 msgid "Icelandic"
 msgstr "Islandeze"
 
-#: xfree86.xml.in.h:146
+#: xfree86.xml.in.h:150
 msgid "Iku"
 msgstr "Iku"
 
-#: xfree86.xml.in.h:147
+#: xfree86.xml.in.h:151
+msgid "International (with dead keys)"
+msgstr ""
+
+#: xfree86.xml.in.h:152
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: xfree86.xml.in.h:148
+#: xfree86.xml.in.h:153
 msgid "Irish"
 msgstr "Irlandeze"
 
-#: xfree86.xml.in.h:149
+#: xfree86.xml.in.h:154
 msgid "Irl"
 msgstr "Irl"
 
-#: xfree86.xml.in.h:150
+#: xfree86.xml.in.h:155
 msgid "Irn"
 msgstr "Irn"
 
-#: xfree86.xml.in.h:151
+#: xfree86.xml.in.h:156
 msgid "Isl"
 msgstr "Isl"
 
-#: xfree86.xml.in.h:152
+#: xfree86.xml.in.h:157
 msgid "Isr"
 msgstr "Isr"
 
-#: xfree86.xml.in.h:153
+#: xfree86.xml.in.h:158
 msgid "Israeli"
 msgstr "Izraeliane"
 
-#: xfree86.xml.in.h:154
+#: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Izraeliane"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Ita"
 
-#: xfree86.xml.in.h:155
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "Italisht"
 
-#: xfree86.xml.in.h:156
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Japonisht"
 
-#: xfree86.xml.in.h:157
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Japoneze 106-pulsantë"
 
-#: xfree86.xml.in.h:158
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:159
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Kanadeze"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:168
+#, fuzzy
+msgid "Kor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:169
+#, fuzzy
+msgid "Korean"
+msgstr "Norvegjeze"
+
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Laptop"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Tastierë laptop për Laptop/notebook Compaq (p.sh. Armada)"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Tastierë për Internet për Laptop/notebook Compaq (p.sh. Presario)"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Laptop/notebook Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latinishte"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Latino amerikane"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Letonisht"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Pulsanti i majtë Alt ndryshon grupin"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:179
+#, fuzzy
+msgid "Left Alt key switches group while pressed"
+msgstr "Pulsanti i majtë Win ndryshon grupin kur është i shtypur"
+
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Pulsanti i majtë Ctrl ndryshon grupin"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Pulsanti i majtë Shift ndryshon grupin"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Pulsanti i majtë Win ndryshon grupin"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Pulsanti i majtë Win ndryshon grupin kur është i shtypur"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Lithuanian azerty standart"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Lithuanian qwerty \"numerike\""
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:186
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Tastierë Logitech Deluxe Access"
+
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (opcioni alternativ)"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (opcioni i dytë alternativ)"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Tastierë Logitech Deluxe Access"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Tastierë për Internet Logitech"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Tastierë Logitech Internet Navigator"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch keyboard Internet Navigator"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Ltu"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lva"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Maqedonisht"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh i vjetër"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "Kthe CapsLock në një Control shtesë"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Malteze"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Maltese (harta US)"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Tastierë Memorex MX2500 EZ-Access"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Menu është krijuar"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Pulsanti i menu ndryshon grupin"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta është vendosur tek pulsantët Win. "
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta është vendosur tek pulsanti i majtë Win."
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Tastierë Microsoft Internet"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, Suedeze"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Tastierë Microsoft Office"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:224
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Tastierë Microsoft Internet"
+
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Opcione të ndryshme kompatibiliteti"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Mongoliane"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Northern Saami (Finlandeze)"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Northern Saami (Norvegjeze)"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Northern Saami (Suedeze)"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Norvegjeze"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Llampa e Num_Lock tregon grupin alternativ"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Ogham"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:241
+#, fuzzy
+msgid "Old standard"
+msgstr "Standart"
+
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Tastierë Oretec MCK-800 MM/Internet"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "Seritë PC-98xx"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Phonetic"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Polonisht"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Polake (qwertz)"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:252
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr ""
+
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytonic"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portugeze"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:256
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "Shtyp pulsantin e majtë Win për të zgjedhur nivelin e tretë"
+
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Shtyp pulsantin e majtë Win për të zgjedhur nivelin e tretë"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Shtyp pulsantin Menu për të zgjedhur nivelin e tretë"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:259
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "Shtyp pulsantin e djathtë Win për të zgjedhur nivelin e tretë"
+
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Shtyp pulsantin e djathtë Control për të zgjedhur nivelin e tretë"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Shtyp pulsantin e djathtë Win për të zgjedhur nivelin e tretë"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:262
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "Shtyp çfarëdo pulsanti Win për të zgjedhur nivelin e tretë"
+
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Shtyp çfarëdo pulsanti Win për të zgjedhur nivelin e tretë"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "D-Alt ndryshon grupin kur është i shtypur"
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Alt i djathtë u krijua"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Pulsanti i djathtë Alt ndryshon grupin"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Pulsanti i djathtë Control punon si Alt i djathtë"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Pulsanti i djathtë Ctrl ndryshon grupin"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Pulsanti i djathtë Shift ndryshon grupin"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Pulsanti i djathtë Win ndryshon grupin"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Pulsanti Win i djathtë u krijua"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Pulsanti i djathtë Win ndryshon grupin kur është i shtypur"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Rumanisht"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rou"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Rusisht"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Llampa e Scroll_Lock tregon grupin alternativ"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Sërbisht"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:291
+msgid "Serbian Cyrillic (swap Zhe, Ze)"
+msgstr ""
+
+#: xfree86.xml.in.h:292
+msgid "Serbian Latin (swap Y, Z)"
+msgstr ""
+
+#: xfree86.xml.in.h:293
+msgid "Serbian Latin Unicode"
+msgstr ""
+
+#: xfree86.xml.in.h:294
+msgid "Serbian Latin Unicode (swap ZHE, Z)"
+msgstr ""
+
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "Shift së bashku me pulsantin numpad funksionon si tek MS Windows"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:296
+#, fuzzy
+msgid "Shift+CapsLock changes group"
+msgstr "Pulsanti Caps Lock ndryshon grupin"
+
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Sllovake"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Sllovake (qwerty)"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Sllovene"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "Spanjisht"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Çelsa specialë (Ctrl+Alt+&lt;çelsi&gt;) të manazhuar në një server."
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Standart"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Pulsantë të vdekur Sun"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super është vendosur tek pulsantët Win (e prezgjedhur)."
 
-#: xfree86.xml.in.h:285
-msgid "Sv"
-msgstr "Sv"
-
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Shkëmbyesi Control dhe Caps Lock"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Swe"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "Suedisht"
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "Frengjisht e Zvicrës"
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "Gjermenishte e Zvicrës"
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Siriane"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Phonetic"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tajik"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamil"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugu"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Thai (TIS-820.2538)"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Zgjedhësit e nivelit të tretë"
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Tastierë Trust Direct Access"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Tastierë klasike Trust Wireless"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tur"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Turqisht"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Turke (F)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Planimetria Alt-Q Turke"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "U.S. Anglisht"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "U.S. Anglisht w/ ISO9995-3"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "U.S. Anglisht w/ dead keys"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "US"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "Tastierë US me gërma Romane"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "USA"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Ukrahinase"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "EkspertUnicode"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Mbretëria e Bashkuar"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Përdor LED e tastierës për të treguar grupin alternativ"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Përdor gërma të mëdha në brendësi. Shift fshin Caps."
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Përdor gërma të mëdha në brendësi. Shift nuk fshin Caps."
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Uzbek"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Vietnamisht"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Winkeys"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:354
+#, fuzzy
+msgid "With Malayalam digits"
+msgstr "Malayalam"
+
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Tastierë Yahoo! Internet"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Yugoslavian"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/digits"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "numra"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/presje"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/pikë"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/presje"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/pikë"
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/presje"
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/pikë"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/presje"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/pikë"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "laptop"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/numra"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/presje"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/pikë"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/presje"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/pikë"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/presje"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/pikë"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/presje"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/pikë"
 
+#~ msgid "Sv"
+#~ msgstr "Sv"
diff --git a/po/sr.po b/po/sr.po
index 26610069..6880dd4c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2003-11-28 20:27+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <sr@li.org>\n"
@@ -650,910 +650,920 @@ msgid "Israeli"
 msgstr "израелски"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "израелски"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "ита"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "италијански"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "јапански"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "јапански са 106 тастера"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "јпн"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "кнд"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "канада (јужна индија)"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "нор"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "норвешки"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "ЈАм"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Преносни рачунар"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Тастатуре преносних рачунара из Compaq-а (нпр. Armada)"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Тастатуре преносних рачунара из Compaq-а (нпр. Presario)"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Тастатуре преносних рачунара Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "латинични"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "јужноамерички"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "летонски"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Леви Alt тастер мења групу"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "Леви Windows тастер мења групу"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Леви Ctrl тастер мења групу"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Леви Shift тастер мења групу"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Леви Windows тастер мења групу"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Леви Windows тастер мења групу"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "литвански azerty распоред"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "литвански qwerty „бројевни“"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Deluxe Access тастатура"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (додатна могућност)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (додатна могућност 2)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access тастатура"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Интернет тастатура"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Интернет навигатор тастатура"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless тастатура (модел Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch тастатура Интернет навигатор"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "лтв"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "лет"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "македонски"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Мекинтош"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Стари Мекинтош"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "Учини Caps Lock додатним Control тастером"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "мал"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "малајамски"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "малтски"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "малтски (амерички распоред)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access тастатура"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Menu је комбинујући тастер"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Menu тастер мења групу"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta је мапиран на Windows тастере."
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta је мапиран на леви Windows тастер."
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Микрософтова Интернет тастатура"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Микрософтова Интернет Про тастатура, шведски"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Микрософт Натурал"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Микрософт Натурал тастатура Про / Микрософт Интернет тастатура Про "
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Микрософт Натурал тастатура Про ОЕМ"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Микрософтова канцеларијска тастатура"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Микрософтова Интернет тастатура"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Разне могућности за сагласност"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "мак"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "мал"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "ммр"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "мон"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Монголски"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "хол"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "нор"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "северносаамски (Финска)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "северносаамски (Норвешка)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "северносаамски (Шведска)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "норвешки"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Num Lock лампица приказује измене група"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "огм"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "огам"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "стандардна"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 ММ/Интернет тастатура"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "ори"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "орија"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx серија"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "пан"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "фонетски"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "пољ"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "пољски"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "пољски (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
 # не ваља, можда вишезвучни?
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "вишезвучни"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "португалски"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "Притисак левог Windows тастера за избор 3. нивоа"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Притисак левог Windows тастера за избор 3. нивоа"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Притисак Menu тастера за избор 3. нивоа"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "Притисак десног Windows тастера за избор 3. нивоа"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Притисак десног Control тастера за избор 3. нивоа"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Притисак десног Windows тастера за избор 3. нивоа"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "Притисак било ког Windows тастера за избор 3. нивоа"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Притисак било ког Windows тастера за избор 3. нивоа"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "прт"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "Десни Alt мења групу када је притиснут"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Десни Alt је комбинујући"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Десни Alt је мења групу"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Десни Control тастер се понаша као десни Alt"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Десни Control мења групу"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Десни Shift мења групу"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Десни Windows тастер мења групу"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Десни Windows тастер је комбинујући"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Десни Windows тастер мења групу када је притиснут"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "румунски"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "рум"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "рус"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "руски"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN ергономска 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "срп"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Scroll Lock лампица приказује измене група"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "српски"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "Shift уз нумеричку тасатуру ради као у MS Windows-у"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "Caps Lock тастер мења групу"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "словачки"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "словачки (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "словеначки"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "сме"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "шпански"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Нарочити тастери (Ctrl+Alt+&lt;тастер&gt;) које обрађује сервер."
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "стандардна"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Sun-ови акценти"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super је мапиран на Windows тастере (подразумевано)."
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "слк"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "сло"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Размени Control и Caps Lock"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "шве"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "шведски"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "швајцарски француски"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "швајцарски немачки"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "сир"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "сиријски"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "фонетски"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "таџик"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "тамил"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "тел"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "телугу"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "тај"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "тајландски (Кедмани)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "тајландски (Паташоте)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "тајландски (TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Избор трећег нивоа"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "тџк"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "тмл"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access тастатура"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust класична бежична тастатура"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "тур"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "турски"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "турски (F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "турски Alt-Q распоред"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "амерички енглески"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "амерички енглески са ИСО9995-3"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "амерички енглески са акцентима"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "САД"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "Америчка тастатура са румунским словима"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "САД"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "укр"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "украјински"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "Стручна за Уникод"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Велика Британија"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Употреба лампица тастатуре за приказ измене група"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Користи унутрашњу капитализацију. Shift укида Caps Lock."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Користи унутрашњу капитализацију. Shift не укида Caps Lock."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "узб"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "узбекистански"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "вијетнамски"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "вјт"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Windows тастери"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "малајамски"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Интернет тастатура"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "сцг"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "латинични српски"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "абнт2"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/цифре"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "бксл"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "цифре"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "н2/101/qwerty/запета"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "н2/101/qwerty/тачка"
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "н2/101/qwertz/запета"
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "н2/101/qwertz/тачка"
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "н2/102/qwerty/запета"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "н2/102/qwerty/тачка"
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "н2/102/qwertz/запета"
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "н2/102/qwertz/тачка"
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "преносни"
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/цифре"
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "уни/101/qwerty/запета"
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "уни/101/qwerty/тачка"
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "уни/101/qwertz/запета"
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "уни/101/qwertz/тачка"
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "уни/102/qwerty/запета"
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "уни/102/qwerty/тачка"
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "уни/102/qwertz/запета"
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "уни/102/qwertz/тачка"
 
diff --git a/po/sv.po b/po/sv.po
index a6993a40..a531c9a8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-11-25 23:38+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2004-03-18 23:25+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -112,1362 +112,1468 @@ msgid "Azerbaijani"
 msgstr "Azerbajdzjansk"
 
 #: xfree86.xml.in.h:24
+#, fuzzy
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Logitech Internettangentbord"
+
+#: xfree86.xml.in.h:25
 msgid "BTC 5090"
 msgstr "BTC 5090"
 
-#: xfree86.xml.in.h:25
+#: xfree86.xml.in.h:26
 msgid "BTC 5113RF Multimedia"
 msgstr "BTC 5113RF Multimedia"
 
-#: xfree86.xml.in.h:26
+#: xfree86.xml.in.h:27
 msgid "BTC 5126T"
 msgstr "BTC 5126T"
 
-#: xfree86.xml.in.h:27
+#: xfree86.xml.in.h:28
 msgid "BTC 9000"
 msgstr "BTC 9000"
 
-#: xfree86.xml.in.h:28
+#: xfree86.xml.in.h:29
 msgid "BTC 9000A"
 msgstr "BTC 9000A"
 
-#: xfree86.xml.in.h:29
+#: xfree86.xml.in.h:30
 msgid "BTC 9001AH"
 msgstr "BTC 9001AH"
 
-#: xfree86.xml.in.h:30
+#: xfree86.xml.in.h:31
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: xfree86.xml.in.h:31
+#: xfree86.xml.in.h:32
 msgid "Bel"
 msgstr "Bel"
 
-#: xfree86.xml.in.h:32
+#: xfree86.xml.in.h:33
 msgid "Belarusian"
 msgstr "Vitrysk"
 
-#: xfree86.xml.in.h:33
+#: xfree86.xml.in.h:34
 msgid "Belgian"
 msgstr "Belgisk"
 
-#: xfree86.xml.in.h:34
+#: xfree86.xml.in.h:35
 msgid "Ben"
 msgstr "Ben"
 
-#: xfree86.xml.in.h:35
+#: xfree86.xml.in.h:36
 msgid "Bengali"
 msgstr "Bengali"
 
-#: xfree86.xml.in.h:36
+#: xfree86.xml.in.h:37
 msgid "Bgr"
 msgstr "Bgr"
 
-#: xfree86.xml.in.h:37
+#: xfree86.xml.in.h:38
 msgid "Bih"
 msgstr "Bih"
 
-#: xfree86.xml.in.h:38
+#: xfree86.xml.in.h:39
 msgid "Blr"
 msgstr "Blr"
 
-#: xfree86.xml.in.h:39
+#: xfree86.xml.in.h:40
 msgid "Bosnian"
 msgstr "Bosnisk"
 
-#: xfree86.xml.in.h:40
+#: xfree86.xml.in.h:41
 msgid "Both Alt keys together change group"
 msgstr "Båda Alt-tangenterna tillsammans byter grupp"
 
-#: xfree86.xml.in.h:41
+#: xfree86.xml.in.h:42
 msgid "Both Ctrl keys together change group"
 msgstr "Båda Ctrl-tangenterna tillsammans byter grupp"
 
-#: xfree86.xml.in.h:42
+#: xfree86.xml.in.h:43
 msgid "Both Shift keys together change group"
 msgstr "Båda Skift-tangenterna tillsammans byter grupp"
 
-#: xfree86.xml.in.h:43
+#: xfree86.xml.in.h:44
 msgid "Both Win-keys switch group while pressed"
 msgstr "Båda Win-tangenterna byter grupp då de trycks ned"
 
-#: xfree86.xml.in.h:44
+#: xfree86.xml.in.h:45
 msgid "Bra"
 msgstr "Bra"
 
-#: xfree86.xml.in.h:45
+#: xfree86.xml.in.h:46
 msgid "Brazilian"
 msgstr "Brasiliansk"
 
-#: xfree86.xml.in.h:46
+#: xfree86.xml.in.h:47
 msgid "Brazilian ABNT2"
 msgstr "Brasiliansk ABNT2"
 
-#: xfree86.xml.in.h:47
+#: xfree86.xml.in.h:48
 msgid "Brother Internet Keyboard"
 msgstr "Brother Internettangentbord"
 
-#: xfree86.xml.in.h:48
+#: xfree86.xml.in.h:49
 msgid "Bulgarian"
 msgstr "Bulgarisk"
 
-#: xfree86.xml.in.h:49
+#: xfree86.xml.in.h:50
 msgid "Burmese"
 msgstr "Burmesisk"
 
-#: xfree86.xml.in.h:50
+#: xfree86.xml.in.h:51
 msgid "Can"
 msgstr "Can"
 
-#: xfree86.xml.in.h:51
+#: xfree86.xml.in.h:52
 msgid "Canadian"
 msgstr "Kanadensisk"
 
-#: xfree86.xml.in.h:52
+#: xfree86.xml.in.h:53
 msgid "Caps Lock key changes group"
 msgstr "Caps Lock-tangenten byter grupp"
 
-#: xfree86.xml.in.h:53
+#: xfree86.xml.in.h:54
 msgid "CapsLock key behavior"
 msgstr "Beteende för Caps Lock-tangenten"
 
-#: xfree86.xml.in.h:54
+#: xfree86.xml.in.h:55
 msgid "Caps_Lock LED shows alternative group"
 msgstr "Caps_Lock-lampan visar alternativ grupp"
 
-#: xfree86.xml.in.h:55
+#: xfree86.xml.in.h:56
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: xfree86.xml.in.h:56
+#: xfree86.xml.in.h:57
 msgid "Cherry Blue Line CyBo@rd (alternate option)"
 msgstr "Cherry Blue Line CyBo@rd (alternativ)"
 
-#: xfree86.xml.in.h:57
+#: xfree86.xml.in.h:58
 msgid "Chicony Internet Keyboard"
 msgstr "Chicony Internettangentbord"
 
-#: xfree86.xml.in.h:58
+#: xfree86.xml.in.h:59
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: xfree86.xml.in.h:59
+#: xfree86.xml.in.h:60
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: xfree86.xml.in.h:60
+#: xfree86.xml.in.h:61
 msgid "CloGaelach Laptop"
 msgstr "CloGaelach-laptop"
 
-#: xfree86.xml.in.h:61
+#: xfree86.xml.in.h:62
 msgid "Compaq Easy Access Keyboard"
 msgstr "Compaq Easy Access-tangentbord"
 
-#: xfree86.xml.in.h:62
+#: xfree86.xml.in.h:63
 msgid "Compaq Internet Keyboard (13 keys)"
 msgstr "Compaq Internettangentbord (13 tangenter)"
 
-#: xfree86.xml.in.h:63
+#: xfree86.xml.in.h:64
 msgid "Compaq Internet Keyboard (18 keys)"
 msgstr "Compaq Internettangentbord (18 tangenter)"
 
-#: xfree86.xml.in.h:64
+#: xfree86.xml.in.h:65
 msgid "Compaq Internet Keyboard (7 keys)"
 msgstr "Compaq Internettangentbord (7 tangenter)"
 
-#: xfree86.xml.in.h:65
+#: xfree86.xml.in.h:66
 msgid "Compaq iPaq Keyboard"
 msgstr "Compaq iPaq-tangentbord"
 
-#: xfree86.xml.in.h:66
+#: xfree86.xml.in.h:67
 msgid "Control Key Position"
 msgstr "Position för Control-tangenten"
 
-#: xfree86.xml.in.h:67
+#: xfree86.xml.in.h:68
 msgid "Control key at bottom left"
 msgstr "Control-tangenten nere till vänster"
 
-#: xfree86.xml.in.h:68
+#: xfree86.xml.in.h:69
 msgid "Control key at left of 'A'"
 msgstr "Control-tangenten till vänster om \"A\""
 
-#: xfree86.xml.in.h:69
+#: xfree86.xml.in.h:70
 msgid "Control+Shift changes group"
 msgstr "Control+Skift byter grupp"
 
-#: xfree86.xml.in.h:70
+#: xfree86.xml.in.h:71
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: xfree86.xml.in.h:71
+#: xfree86.xml.in.h:72
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: xfree86.xml.in.h:72
+#: xfree86.xml.in.h:73
 msgid "Cze"
 msgstr "Cze"
 
-#: xfree86.xml.in.h:73
+#: xfree86.xml.in.h:74
 msgid "Czech"
 msgstr "Tjeckisk"
 
-#: xfree86.xml.in.h:74
+#: xfree86.xml.in.h:75
 msgid "Czech (qwerty)"
 msgstr "Tjeckisk (qwerty)"
 
-#: xfree86.xml.in.h:75
+#: xfree86.xml.in.h:76
+msgid "DTK2000"
+msgstr ""
+
+#: xfree86.xml.in.h:77
 msgid "Danish"
 msgstr "Dansk"
 
-#: xfree86.xml.in.h:76
+#: xfree86.xml.in.h:78
 msgid "Dead acute"
 msgstr "Stum akut accent"
 
-#: xfree86.xml.in.h:77
+#: xfree86.xml.in.h:79
 msgid "Dead grave acute"
 msgstr "Stum grav accent"
 
-#: xfree86.xml.in.h:78
+#: xfree86.xml.in.h:80
 msgid "Dell"
 msgstr "Dell"
 
-#: xfree86.xml.in.h:79
+#: xfree86.xml.in.h:81
 msgid "Dell 101-key PC"
 msgstr "Dell 101-tangenters PC"
 
-#: xfree86.xml.in.h:80
+#: xfree86.xml.in.h:82
 msgid "Deu"
 msgstr "Deu"
 
-#: xfree86.xml.in.h:81
+#: xfree86.xml.in.h:83
 msgid "Dexxa Wireless Desktop Keyboard"
 msgstr "Dexxa trådlöst skrivbordstangentbord"
 
-#: xfree86.xml.in.h:82
+#: xfree86.xml.in.h:84
 msgid "Diamond 9801 / 9802 series"
 msgstr "Diamond 9801/9802-serien"
 
-#: xfree86.xml.in.h:83
+#: xfree86.xml.in.h:85
 msgid "Dnk"
 msgstr "Dnk"
 
-#: xfree86.xml.in.h:84
+#: xfree86.xml.in.h:86
 msgid "Dutch"
 msgstr "Nederländsk"
 
-#: xfree86.xml.in.h:85
+#: xfree86.xml.in.h:87
 msgid "Dvo"
 msgstr "Dvo"
 
-#: xfree86.xml.in.h:86
+#: xfree86.xml.in.h:88
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: xfree86.xml.in.h:87
+#: xfree86.xml.in.h:89
+msgid "Dzongkha / Tibetan"
+msgstr ""
+
+#: xfree86.xml.in.h:90
 msgid "Eliminate dead keys"
 msgstr "Eliminera stumma tangenter"
 
-#: xfree86.xml.in.h:88
+#: xfree86.xml.in.h:91
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: xfree86.xml.in.h:89
+#: xfree86.xml.in.h:92
 msgid "Esp"
 msgstr "Esp"
 
-#: xfree86.xml.in.h:90
+#: xfree86.xml.in.h:93
 msgid "Est"
 msgstr "Est"
 
-#: xfree86.xml.in.h:91
+#: xfree86.xml.in.h:94
 msgid "Estonian"
 msgstr "Estnisk"
 
-#: xfree86.xml.in.h:92
+#: xfree86.xml.in.h:95
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: xfree86.xml.in.h:93
+#: xfree86.xml.in.h:96
 msgid "Extended"
 msgstr "Utökad"
 
-#: xfree86.xml.in.h:94
+#: xfree86.xml.in.h:97
 msgid "Fao"
 msgstr "Fao"
 
-#: xfree86.xml.in.h:95
+#: xfree86.xml.in.h:98
 msgid "Faroese"
 msgstr "Färöisk"
 
-#: xfree86.xml.in.h:96
+#: xfree86.xml.in.h:99
 msgid "Farsi"
 msgstr "Farsi"
 
-#: xfree86.xml.in.h:97
+#: xfree86.xml.in.h:100
 msgid "Fin"
 msgstr "Fin"
 
-#: xfree86.xml.in.h:98
+#: xfree86.xml.in.h:101
 msgid "Finnish"
 msgstr "Finsk"
 
-#: xfree86.xml.in.h:99
+#: xfree86.xml.in.h:102
 msgid "Fra"
 msgstr "Fra"
 
-#: xfree86.xml.in.h:100
+#: xfree86.xml.in.h:103
 msgid "French"
 msgstr "Fransk"
 
-#: xfree86.xml.in.h:101
+#: xfree86.xml.in.h:104
 msgid "French (alternative)"
 msgstr "Fransk (alternativ)"
 
-#: xfree86.xml.in.h:102
+#: xfree86.xml.in.h:105
 msgid "French Canadian"
 msgstr "Franskkanadensisk"
 
-#: xfree86.xml.in.h:103
+#: xfree86.xml.in.h:106
 msgid "GBr"
 msgstr "GBr"
 
-#: xfree86.xml.in.h:104
+#: xfree86.xml.in.h:107
 msgid "Generic 101-key PC"
 msgstr "Allmän 101-tangenters PC"
 
-#: xfree86.xml.in.h:105
+#: xfree86.xml.in.h:108
 msgid "Generic 102-key (Intl) PC"
 msgstr "Allmän 102-tangenters (internationell) PC"
 
-#: xfree86.xml.in.h:106
+#: xfree86.xml.in.h:109
 msgid "Generic 104-key PC"
 msgstr "Allmän 104-tangenters PC"
 
-#: xfree86.xml.in.h:107
+#: xfree86.xml.in.h:110
 msgid "Generic 105-key (Intl) PC"
 msgstr "Allmän 105-tangenters (internationell) PC"
 
-#: xfree86.xml.in.h:108
+#: xfree86.xml.in.h:111
 msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 msgstr "Genius Comfy KB-16M / Genius MM-tangentbord KWD-910"
 
-#: xfree86.xml.in.h:109
+#: xfree86.xml.in.h:112
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr ""
+
+#: xfree86.xml.in.h:113
 msgid "Geo"
 msgstr "Geo"
 
-#: xfree86.xml.in.h:110
+#: xfree86.xml.in.h:114
 msgid "Georgian (latin)"
 msgstr "Georgisk (latin1)"
 
-#: xfree86.xml.in.h:111
+#: xfree86.xml.in.h:115
 msgid "Georgian (russian)"
 msgstr "Georgisk (rysk)"
 
-#: xfree86.xml.in.h:112
+#: xfree86.xml.in.h:116
 msgid "German"
 msgstr "Tysk"
 
-#: xfree86.xml.in.h:113
+#: xfree86.xml.in.h:117
 msgid "Grc"
 msgstr "Grc"
 
-#: xfree86.xml.in.h:114
+#: xfree86.xml.in.h:118
 msgid "Greek"
 msgstr "Grekisk"
 
-#: xfree86.xml.in.h:115
+#: xfree86.xml.in.h:119
 msgid "Group Shift/Lock behavior"
 msgstr "Gruppbeteende för Skift/Lock"
 
-#: xfree86.xml.in.h:116
+#: xfree86.xml.in.h:120
 msgid "Guj"
 msgstr "Guj"
 
-#: xfree86.xml.in.h:117
+#: xfree86.xml.in.h:121
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: xfree86.xml.in.h:118
+#: xfree86.xml.in.h:122
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: xfree86.xml.in.h:119
+#: xfree86.xml.in.h:123
 msgid "Hewlett-Packard Internet Keyboard"
 msgstr "Hewlett-Packard Internettangentbord"
 
-#: xfree86.xml.in.h:120
+#: xfree86.xml.in.h:124
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "Hewlett-Packard Omnibook 500 FA"
 
-#: xfree86.xml.in.h:121
+#: xfree86.xml.in.h:125
 msgid "Hewlett-Packard Omnibook 5xx"
 msgstr "Hewlett-Packard Omnibook 5xx"
 
-#: xfree86.xml.in.h:122
+#: xfree86.xml.in.h:126
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "Hewlett-Packard Omnibook 6000/6100"
 
-#: xfree86.xml.in.h:123
+#: xfree86.xml.in.h:127
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "Hewlett-Packard Omnibook XE3 GC"
 
-#: xfree86.xml.in.h:124
+#: xfree86.xml.in.h:128
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "Hewlett-Packard Omnibook XE3 GF"
 
-#: xfree86.xml.in.h:125
+#: xfree86.xml.in.h:129
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "Hewlett-Packard Omnibook XT1000"
 
-#: xfree86.xml.in.h:126
+#: xfree86.xml.in.h:130
 msgid "Hewlett-Packard Pavilion ZT11xx"
 msgstr "Hewlett-Packard Pavilion ZT11xx"
 
-#: xfree86.xml.in.h:127
+#: xfree86.xml.in.h:131
 msgid "Hewlett-Packard SK-2501 Multimedia Keyboard"
 msgstr "Hewlett-Packard SK-2501 multimediatangentbord"
 
-#: xfree86.xml.in.h:128
+#: xfree86.xml.in.h:132
 msgid "Hewlett-Packard SK-2505 Internet Keyboard"
 msgstr "Hewlett-Packard SK-2505 Internettangentbord"
 
-#: xfree86.xml.in.h:129
+#: xfree86.xml.in.h:133
 msgid "Hin"
 msgstr "Hin"
 
-#: xfree86.xml.in.h:130
+#: xfree86.xml.in.h:134
 msgid "Hindi"
 msgstr "Hindi"
 
-#: xfree86.xml.in.h:131
+#: xfree86.xml.in.h:135
 msgid "Honeywell Euroboard"
 msgstr "Honeywell Euroboard"
 
-#: xfree86.xml.in.h:132
+#: xfree86.xml.in.h:136
 msgid "Hrv"
 msgstr "Hrv"
 
-#: xfree86.xml.in.h:133
+#: xfree86.xml.in.h:137
 msgid "Hun"
 msgstr "Hun"
 
-#: xfree86.xml.in.h:134
+#: xfree86.xml.in.h:138
 msgid "Hungarian"
 msgstr "Ungersk"
 
-#: xfree86.xml.in.h:135
+#: xfree86.xml.in.h:139
 msgid "Hungarian (qwerty)"
 msgstr "Ungersk (qwerty)"
 
-#: xfree86.xml.in.h:136
+#: xfree86.xml.in.h:140
 msgid "Hyper is mapped to the Win-keys."
 msgstr "Hyper är mappat till Win-tangenterna."
 
-#: xfree86.xml.in.h:137
+#: xfree86.xml.in.h:141
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: xfree86.xml.in.h:138
+#: xfree86.xml.in.h:142
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: xfree86.xml.in.h:139
+#: xfree86.xml.in.h:143
 msgid "IBM Rapid Access II (alternate option)"
 msgstr "IBM Rapid Access II (alternativ)"
 
-#: xfree86.xml.in.h:140
+#: xfree86.xml.in.h:144
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: xfree86.xml.in.h:141
+#: xfree86.xml.in.h:145
 msgid "INSCRIPT layout"
 msgstr "INSCRIPT-layout"
 
-#: xfree86.xml.in.h:142
+#: xfree86.xml.in.h:146
 msgid "IS434"
 msgstr "IS434"
 
-#: xfree86.xml.in.h:143
+#: xfree86.xml.in.h:147
 msgid "IS434 laptop"
 msgstr "IS434-laptop"
 
-#: xfree86.xml.in.h:144
+#: xfree86.xml.in.h:148
 msgid "ISO Alternate"
 msgstr "ISO-alternativ"
 
-#: xfree86.xml.in.h:145
+#: xfree86.xml.in.h:149
 msgid "Icelandic"
 msgstr "Isländsk"
 
-#: xfree86.xml.in.h:146
+#: xfree86.xml.in.h:150
 msgid "Iku"
 msgstr "Iku"
 
-#: xfree86.xml.in.h:147
+#: xfree86.xml.in.h:151
+msgid "International (with dead keys)"
+msgstr ""
+
+#: xfree86.xml.in.h:152
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: xfree86.xml.in.h:148
+#: xfree86.xml.in.h:153
 msgid "Irish"
 msgstr "Irländsk"
 
-#: xfree86.xml.in.h:149
+#: xfree86.xml.in.h:154
 msgid "Irl"
 msgstr "Irl"
 
-#: xfree86.xml.in.h:150
+#: xfree86.xml.in.h:155
 msgid "Irn"
 msgstr "Irn"
 
-#: xfree86.xml.in.h:151
+#: xfree86.xml.in.h:156
 msgid "Isl"
 msgstr "Isl"
 
-#: xfree86.xml.in.h:152
+#: xfree86.xml.in.h:157
 msgid "Isr"
 msgstr "Isr"
 
-#: xfree86.xml.in.h:153
+#: xfree86.xml.in.h:158
 msgid "Israeli"
 msgstr "Israelisk"
 
-#: xfree86.xml.in.h:154
+#: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Israelisk"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Ita"
 
-#: xfree86.xml.in.h:155
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "Italiensk"
 
-#: xfree86.xml.in.h:156
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Japansk"
 
-#: xfree86.xml.in.h:157
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Japansk 106-tangenters"
 
-#: xfree86.xml.in.h:158
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:159
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
 # Även kanaresisk (äldre form)
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Kannada"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:168
+#, fuzzy
+msgid "Kor"
+msgstr "Nor"
+
+#: xfree86.xml.in.h:169
+#, fuzzy
+msgid "Korean"
+msgstr "Norsk"
+
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Bärbar dator"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop-tangentbord för bärbar Compaq-dator (t.ex. Armada)"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Internettangentbord för bärbar Compaq-dator (t.ex. Presario)"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Bärbar Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latin"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Latinamerikansk"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Lettisk"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Vänster Alt-tangent byter grupp"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:179
+#, fuzzy
+msgid "Left Alt key switches group while pressed"
+msgstr "Vänster Win-tangent byter grupp då den trycks ned"
+
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Vänster Ctrl-tangent byter grupp"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Vänster Skift-tangent byter grupp"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Vänster Win-tangent byter grupp"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Vänster Win-tangent byter grupp då den trycks ned"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Litauisk azerty-standard"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Litauisk qwerty \"numerisk\""
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:186
+#, fuzzy
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Deluxe Access-tangentbord"
+
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (alternativ)"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (alternativ2)"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access-tangentbord"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internettangentbord"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator-tangentbord"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (modell Y-RB6)"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch-tangentbord Internet Navigator"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Ltu"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lva"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh gammal"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "Gör Caps Lock till ytterligare en Control-tangent"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malayalam"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Maltesisk"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Maltesisk (USA-layout)"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access-tangentbord"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Meny är Compose"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Meny-tangenten byter grupp"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta är mappat till Win-tangenterna."
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta är mappat till vänster Win-tangent."
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, svensk"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office-tangentbord"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:224
+#, fuzzy
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Internet Keyboard"
+
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Diverse kompatibilitetsalternativ"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Mongolsk"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Nordsamisk (Finland)"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Nordsamisk (Norge)"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Nordsamisk (Sverige)"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Num_Lock-lampan visar alternativ grupp"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Ogham"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:241
+#, fuzzy
+msgid "Old standard"
+msgstr "Standard"
+
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet-tangentbord"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx-serien"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Fonetisk"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Polsk"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Polsk (qwertz)"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:252
+msgid "Polish with Polish quotes on key \"1/!\""
+msgstr ""
+
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytonic"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:256
+#, fuzzy
+msgid "Press Left Alt key to choose 3rd level"
+msgstr "Tryck vänster Win-tangent för att välja tredjenivå"
+
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Tryck vänster Win-tangent för att välja tredjenivå"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Tryck Meny-tangenten för att välja tredjenivå"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:259
+#, fuzzy
+msgid "Press Right Alt key to choose 3rd level"
+msgstr "Tryck höger Win-tangent för att välja tredjenivå"
+
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Tryck höger Control-tangent för att välja tredjenivå"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Tryck höger Win-tangent för att välja tredjenivå"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:262
+#, fuzzy
+msgid "Press any of Alt keys to choose 3rd level"
+msgstr "Tryck någon Win-tangent för att välja tredjenivå"
+
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Tryck någon Win-tangent för att välja tredjenivå"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "Höger Alt byter grupp då den trycks ned"
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Höger Alt är Compose"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Höger Alt-tangent byter grupp"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Höger Control-tangent fungerar som höger Alt"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Höger Control-tangent byter grupp"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Höger Skift-tangent byter grupp"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Häger Win-tangent byter grupp"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Höger Win-tangent är Compose"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Höger Win-tangent byter grupp då den trycks ned"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Rumänsk"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rou"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Rysk"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Scroll_Lock-lampan visar alternativ grupp"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:291
+msgid "Serbian Cyrillic (swap Zhe, Ze)"
+msgstr ""
+
+#: xfree86.xml.in.h:292
+msgid "Serbian Latin (swap Y, Z)"
+msgstr ""
+
+#: xfree86.xml.in.h:293
+msgid "Serbian Latin Unicode"
+msgstr ""
+
+#: xfree86.xml.in.h:294
+msgid "Serbian Latin Unicode (swap ZHE, Z)"
+msgstr ""
+
+#: xfree86.xml.in.h:295
 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"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:296
+#, fuzzy
+msgid "Shift+CapsLock changes group"
+msgstr "Caps Lock-tangenten byter grupp"
+
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Slovakisk (qwerty)"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Slovensk"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "Spansk"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Specialtangenter (Ctrl+Alt+&lt;tangent&gt;) hanteras i en server."
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Standard"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Sun stumma tangenter"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super är mappat till Win-tangenterna (standard)."
 
-#: xfree86.xml.in.h:285
-msgid "Sv"
-msgstr "Sv"
-
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Byt Control och Caps Lock"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Swe"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "Svensk"
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "Franskschweizisk"
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "Tyskschweizisk"
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Syrisk"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Fonetisk"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tadzjikisk"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamilsk"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugo"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Thailändsk (Kedmanee)"
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Thailändsk (Pattachote)"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Thailändsk (TIS-820.2538)"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Tredjenivåsväljare"
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access-tangentbord"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tur"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Turkisk"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Turkisk (F)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Turkisk Alt-Q-layout"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "Engelskamerikansk"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "Engelskamerikansk med ISO9995-3"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "Engelskamerikansk med stumma tangenter"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "USA"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "USA-tangentbord med rumänska bokstäver"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "USA"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Storbritannien"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Använd tangentbordslampa för att visa alternativ grupp"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Använder intern skiftlägesstyrning. Skift låser upp Caps."
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Använder intern skiftlägesstyrning. Skift låser inte upp Caps."
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Uzbekisk"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Wintangenter"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:354
+#, fuzzy
+msgid "With Malayalam digits"
+msgstr "Malayalam"
+
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internettangentbord"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Jugoslavisk"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/siffror"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "siffror"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/komma"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/punkt"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/komma"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/punkt"
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/komma"
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/punkt"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/komma"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/punkt"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "bärbar dator"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/siffror"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/komma"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/punkt"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/komma"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/punkt"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/komma"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/punkt"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/komma"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/punkt"
 
+#~ msgid "Sv"
+#~ msgstr "Sv"
+
 #~ msgid "Brazilian (ABNT2)"
 #~ msgstr "Brasiliansk (ABNT2)"
 
@@ -1589,7 +1695,8 @@ msgstr "uni/102/qwertz/punkt"
 #~ 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"
@@ -1631,7 +1738,8 @@ msgstr "uni/102/qwertz/punkt"
 #~ 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.)."
@@ -1664,13 +1772,21 @@ msgstr "uni/102/qwertz/punkt"
 #~ 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."
@@ -1735,8 +1851,12 @@ msgstr "uni/102/qwertz/punkt"
 #~ 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"
diff --git a/po/tr.po b/po/tr.po
index 2215517b..3b4015b8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2003-12-03 11:09+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -652,913 +652,923 @@ msgid "Israeli"
 msgstr "İbranice"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "İbranice"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "İta"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "İtalyanca"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Japonca"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Japonca 106 tuşlu"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Güney Hint dili"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "Norveçce"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "Dizüstü"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Laptop/notebook Compaq (örn. Armada) Dizüstü Klavyesi"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Laptop/notebook Compaq (örn. Presario) Örütbağ Klavyesi"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Laptop/notebook Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "Latin"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Latin Amerika"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Letonca"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Grubu soldaki Alt tuşu değiştirir"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "Soldaki Win tuşu basılıyken diğer grup etkin olur"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Grubu soldaki Ctrl tuşu değiştirir"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Grubu soldaki Shift tuşu değiştirir"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Grubu soldaki Win tuşu değiştirir"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Soldaki Win tuşu basılıyken diğer grup etkin olur"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Litvanya azerty standardı"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Litvanya qwerty \"sayısal\""
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Deluxe Erişim Klavyesi"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Kablosuz Masaüstü"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Kablosuz Masaüstü Tarayıcı"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Kablosuz Masaüstü Optik"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Kablosuz Masaüstü Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Kablosuz Masaüstü Pro (diğer seçenek)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Kablosuz Masaüstü Pro (diğer 2. seçenek)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Kablosuz Masaüstü iTouch"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Kablosuz Özgür/Masaüstü Tarayıcı"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Erişim Klavyesi"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Örütbağ Klavyesi"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Örütbağ Tarayıcı Klavyesi"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Kablosuz Klavyesi (model Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch klavyesi Örütbağ Tarayıcı"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Ltu"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lva"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Makedonya dili"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Eski Macintosh"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "CapsLock tuşuna ek bir kontrol sağlar"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Malayalam dili"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Malta dili"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Malta dili (Q klavye)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ Erişim Klavyesi"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Menü tuşu karakter birleşimi yapar"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Grubu Menü tuşu değiştirir"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta, Win tuşları ile eşleştirilir."
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta, soldaki Win tuşu ile eşleştirilir."
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Örütbağ Klavyesi"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Örütbağ Klavyesi Pro, İsveçce"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Basit"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Basit Klavye Pro / Microsoft Örütbağ Klavyesi Pro"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Basit Klavye Pro OEM"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Ofis Klavyesi"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Örütbağ Klavyesi"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "Çeşitli uyumluluk seçenekleri"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Moğ"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Moğolca"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Hol"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Kuzey Saami (Finlandiya)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Kuzey Saami (Norveç)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Kuzey Saami (İsveç)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Norveçce"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Num_Lock LED'i diğer grubu gösterir"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Ogham"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "Standart"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Örütbağ Klavyesi"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Orissa dili"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx Serisi"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Fonetik"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Polonez"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Polonez (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Politonik"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Portekizce"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "3. seviyeyi seçmek için soldaki Win tuşuna basın"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "3. seviyeyi seçmek için soldaki Win tuşuna basın"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "3. seviyeyi seçmek için Menü tuşuna basın"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "3. seviyeyi seçmek için sağdaki Win tuşuna basın"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "3. seviyeyi seçmek için sağdaki Ctrl tuşuna basın"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "3. seviyeyi seçmek için sağdaki Win tuşuna basın"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "3. seviyeyi seçmek için Win tuşlarından birine basın"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "3. seviyeyi seçmek için Win tuşlarından birine basın"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "Sağdaki Alt tuşu basılıyken diğer grup etkin olur"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Sağdaki Alt tuşu karakter birleşimi yapar"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Grubu sağdaki Alt tuşu değiştirir"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Sağdaki Ctrl tuşu sağdaki Alt tuşu olarak çalışır"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Grubu sağdaki Ctrl tuşu değiştirir"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Grubu sağdaki Shift tuşu değiştirir"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Grubu sağdaki Win tuşu değiştirir"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Sağdaki Win tuşu karakter birleşimi yapar"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Sağdaki Win tuşu basılıyken diğer grup etkin olur"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Romence"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rou"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Rusça"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomik 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Scroll_Lock LED'i diğer grubu gösterir"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Sırpça"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "Sağdaki Nümerik tuşlar MS Windows'daki gibi çalışır"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "Grubu Caps Lock tuşu değiştirir"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Slovakça"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Slovakça (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Slovence"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "İspanyolca"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Bir sunucuda elde edilen özel tuşlar (Ctrl+Alt+&lt;tuş&gt;)"
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "Standart"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Sun ölü tuşlar"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super, Win tuşlarına eşlenir (öntanımlı)."
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Takas Denetimi ve Caps Lock"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "İsve"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "İsveçce"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "İsviçre Fransızcası"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "İsviçre Almancası"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (tablet PC)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Sur"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Suriye dili"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Fonetik"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Tacikçe"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Tamil dili"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Telugu dili"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Tayca (Kedmanee)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Tayca (Pattachote)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Tayca (TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "3. seviye seçiciler"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tck"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Doğrudan Erişimli Klavye"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Kablosuz Klasik Klavye"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Trk"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Türkçe Q Klavye"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Türkçe F klavye"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Türkçe Alt-Q (yazılımcılar ve dizüstü) klavye"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "Amerikan ingilizcesi"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "Amerikan ingilizcesi (ISO9995-3 ile)"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "Amerikan ingilizcesi (ölü tuşlarla)"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "Amerikan"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "Romen harfleriyle amerikan klavyesi"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "ABD"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Ukraynaca"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "Unicode Uzman"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "İngiltere"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "Diğer grubu göstermek içim klavye LED'i kullanılır"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr ""
 "Büyük/küçük harf geçişlerinde standart dönüşüm kullanılır, Shift tuşu Caps "
 "tuşunun işlevini ters çevirir."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr ""
 "Büyük/küçük harf geçişlerinde standart dönüşüm kullanılır, Shift tuşu Caps "
 "tuşunun işlevi etkilemez.."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Özb"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Özbekçe"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "Vietnam dili"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Win tuşları"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "Malayalam dili"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Örütbağ Klavyesi"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Yugoslavya dili"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/rakamlar"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "rakamlar"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/virgül"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/nokta"
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/virgül"
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/nokta"
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/virgül"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/nokta"
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/virgül"
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/nokta"
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "dizüstü"
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/rakamlar"
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/virgül"
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/nokta"
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/virgül"
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/nokta"
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/virgül"
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/nokta"
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/virgül"
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/nokta"
 
diff --git a/po/uk.po b/po/uk.po
index 1bd7e428..542cab89 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2002-05-29 21:11+100\n"
 "Last-Translator: Sergey V. Oudaltsov <svu@users.sourceforge.net>\n"
 "Language-Team: Russian\n"
@@ -653,920 +653,930 @@ msgid "Israeli"
 msgstr "Івріт"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "Івріт"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Іта"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "Италійська"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "Японська"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "Японська 106-клавішна"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Япо"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Кан"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "Канадська"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "Нор"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "Норвежська"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "ЛАм"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr ""
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "Клавіатура для комп'ютерів Compaq (напр., Armada)"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "Інтернет-клавіатура для ноутбуків Compaq (напр., Presario)"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "Для ноутбуків Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 #, fuzzy
 msgid "Latin"
 msgstr "Латишська"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "Латиноамериканська"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "Латишська"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "Ліва клавіша Alt міняє групу"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "Ліва клавіша Win переключає групу на час натиснення"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "Ліва клавіша Ctrl міняє групу"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "Ліва клавіша Shift міняє групу"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "Ліва клавіша Win міняє групу"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "Ліва клавіша Win переключає групу на час натиснення"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "Литовська стандартна (azerty)"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "Литовська цифрова (qwerty)"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "Logitech Cordless Desktop"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "Logitech Cordless Desktop Navigator"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "Logitech Cordless Desktop Optical"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "Logitech Cordless Desktop Pro"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "Logitech Cordless Desktop Pro (альтернативний варіант)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "Logitech Cordless Desktop Pro (альтернативний варіант 2)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "Logitech Cordless Desktop iTouch"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "Logitech Deluxe Access Keyboard"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "Logitech Internet Keyboard"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "Logitech Internet Navigator Keyboard"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "Logitech iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "Logitech iTouch Cordless Keyboard (модель Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "Logitech iTouch keyboard Internet Navigator"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr ""
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr ""
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "Македонська"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr ""
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr ""
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "Caps Lock как додаткова клавіша Control"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Мал"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "Малайська"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "Мальтійська"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "Мальтійська (Американська розкладка)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access Keyboard"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "Клавіша Menu відповідає клавіші Compose"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "Клавіша Menu міняє групу"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Клавіша Meta відповідає клавішам Win"
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Клавіша Meta відповідає лівій клавіші Win"
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "Microsoft Internet Keyboard Pro, шведська"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "Microsoft Natural"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "Microsoft Natural Keyboard Pro OEM"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "Microsoft Office Keyboard"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "Microsoft Internet Keyboard"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr ""
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Мкд"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Млт"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Ммр"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Мнг"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "Монгольська"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr ""
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Нор"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "Саамська (Фінляндия)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "Саамська (Норвегія)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "Саамська (Швеція)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "Норвежська"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "Індикатор Num Lock відображає додаткову групу"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Огх"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "Огхам (староірландська)"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "Типова ACPI"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/Internet keyboard"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Орі"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Орія"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "Моделі PC-98xx"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr ""
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Пан"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr ""
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Пол"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "Польська"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "Польська (qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr ""
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "Португальська"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr ""
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "Вибір 3-го рівня натисненням лівої клавіші Win"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "Вибір 3-го рівня натисненням лівої клавіші Win"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "Вібор 3-го рівня натисненням клавіші Menu"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "Вибір 3-го рівня натисненням правої клавіші Win"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "Вибір 3-го рівня натисненням правої клавіші Control"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "Вибір 3-го рівня натисненням правої клавіші Win"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "Вибір 3-го рівня натисненням довільної клавіші Win"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "Вибір 3-го рівня натисненням довільної клавіші Win"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Пор"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "Права клавіша Alt переключає групу на час натиснення"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "Права клавіша Alt відповідає клавіші Alt"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "Права клавіша Alt міняє групу"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "Права клавіша Control функціонує як права клавіша Alt"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "Права клавіша Ctrl міняє групу"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "Права клавіша Shift міняє групу"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "Права клавіша Win міняє групу"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "Права клавіша Win відповідає клавіші Compose"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "Права клавіша Win переключає групу на час натиснення"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "Руминська"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr ""
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Рос"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "Російська"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "Samsung SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "Samsung SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 #, fuzzy
 msgid "Sapmi"
 msgstr "Тамільська"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr ""
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Індикатор Scroll Lock відображає додаткову групу"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "Сербська"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr ""
 "Клавіша Shift з клавішами на додатковій цировій клавіатурі функціонує як в "
 "Ms Windows"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "Клавіша Caps Lock міняє групу"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "Словацька"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "Словацька (qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "Словенська"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Сме"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "Іспанська"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "Спеціальні клавіші (Ctrl+Alt+&lt;key&gt;) обробляються на сервері."
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 #, fuzzy
 msgid "Standard"
 msgstr "Типова ACPI"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 #, fuzzy
 msgid "Sun dead keys"
 msgstr "Вилучити спеціальні клавіші (dead keys)"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super відповідає клавішам Win (за замовчанням)"
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr ""
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr ""
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "Замінити містами клавіші Control і Caps Lock"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Шве"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "Шведська"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "Французька (Швейцарія)"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "Німецька (Швейцарія)"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook (переносний ПК)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Сир"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "Сирійська"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Російська (кирилица, фонетична)"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "Таджикська"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "Тамільська"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Тел"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "Телугу"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Тай"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "Тайландська (Кедмані)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "Тайландська (Паттачот)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "Тайландська (TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "Вибір 3-го рівня"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Тдж"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Тмл"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "Toshiba Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access Keyboard"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust Wireless Keyboard Classic"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Тук"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "Турецька"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "Турецька (F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "Турецька Alt-Q розкладка"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "Англійська (США)"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "Англійська (США) з ISO9995-3"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 #, fuzzy
 msgid "U.S. English w/ dead keys"
 msgstr "Англійська (США) із спеціальними клавішами (dead keys)"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 #, fuzzy
 msgid "US"
 msgstr "США"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr ""
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "США"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Укр"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "Українська"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr ""
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "Англійська (Великобританія)"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr ""
 "Використовувати клавіатурні індикатори для відображання додаткових груп"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "Використовувати внутрішнє збільшення літер. Shift відміняє Caps."
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "Використовувати внутрішнє збільшення літер. Shift не відміняє Caps."
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Узб"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "Узбецька"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "В'єтнамська"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Внм"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr ""
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "Малайська"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "Yahoo! Internet Keyboard"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Юго"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "Югославська"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr ""
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr ""
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr ""
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr ""
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr ""
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 #, fuzzy
 msgid "l2/102/qwerty/comma"
 msgstr "Угорська (Latin2 pc102, qwerty, кома)"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr ""
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr ""
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 #, fuzzy
 msgid "qwerty"
 msgstr "Чешська (qwerty)"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr ""
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr ""
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr ""
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr ""
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr ""
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr ""
 
@@ -1867,9 +1877,6 @@ msgstr ""
 #~ msgid "ua(winkeys) - No decription"
 #~ msgstr "Українська (Microsoft)"
 
-#~ msgid "Russian (cyrillic phonetic)"
-#~ msgstr "Російська (кирилица, фонетична)"
-
 #~ msgid "Thai"
 #~ msgstr "Тайландська"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1b9a2a76..5a560472 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfree86_xkb_xml 4.4pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-26 00:21+0000\n"
+"POT-Creation-Date: 2004-04-04 02:42+0100\n"
 "PO-Revision-Date: 2003-11-28 22:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -649,909 +649,919 @@ msgid "Israeli"
 msgstr "以色列"
 
 #: xfree86.xml.in.h:159
+#, fuzzy
+msgid "Israeli phonetic"
+msgstr "以色列"
+
+#: xfree86.xml.in.h:160
 msgid "Ita"
 msgstr "Ita"
 
-#: xfree86.xml.in.h:160
+#: xfree86.xml.in.h:161
 msgid "Italian"
 msgstr "意大利"
 
-#: xfree86.xml.in.h:161
+#: xfree86.xml.in.h:162
 msgid "Japanese"
 msgstr "日语"
 
-#: xfree86.xml.in.h:162
+#: xfree86.xml.in.h:163
 msgid "Japanese 106-key"
 msgstr "日语 106 键"
 
-#: xfree86.xml.in.h:163
+#: xfree86.xml.in.h:164
 msgid "Jpn"
 msgstr "Jpn"
 
-#: xfree86.xml.in.h:164
+#: xfree86.xml.in.h:165
 msgid "Kan"
 msgstr "Kan"
 
-#: xfree86.xml.in.h:165
+#: xfree86.xml.in.h:166
 msgid "Kannada"
 msgstr "埃纳德"
 
-#: xfree86.xml.in.h:166
+#: xfree86.xml.in.h:167
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: xfree86.xml.in.h:167
+#: xfree86.xml.in.h:168
 #, fuzzy
 msgid "Kor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:168
+#: xfree86.xml.in.h:169
 #, fuzzy
 msgid "Korean"
 msgstr "挪威"
 
-#: xfree86.xml.in.h:169
+#: xfree86.xml.in.h:170
 msgid "LAm"
 msgstr "LAm"
 
-#: xfree86.xml.in.h:170
+#: xfree86.xml.in.h:171
 msgid "Laptop"
 msgstr "便携"
 
-#: xfree86.xml.in.h:171
+#: xfree86.xml.in.h:172
 msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
 msgstr "便携/笔记本 Compaq(如 Armada)便携键盘"
 
-#: xfree86.xml.in.h:172
+#: xfree86.xml.in.h:173
 msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
 msgstr "便携/笔记本 Compaq(如自由人)网际键盘"
 
-#: xfree86.xml.in.h:173
+#: xfree86.xml.in.h:174
 msgid "Laptop/notebook Dell Inspiron 8xxx"
 msgstr "便携/笔记本 Dell Inspiron 8xxx"
 
-#: xfree86.xml.in.h:174
+#: xfree86.xml.in.h:175
 msgid "Latin"
 msgstr "拉丁"
 
-#: xfree86.xml.in.h:175
+#: xfree86.xml.in.h:176
 msgid "Latin America"
 msgstr "拉美"
 
-#: xfree86.xml.in.h:176
+#: xfree86.xml.in.h:177
 msgid "Latvian"
 msgstr "拉脱维亚"
 
-#: xfree86.xml.in.h:177
+#: xfree86.xml.in.h:178
 msgid "Left Alt key changes group"
 msgstr "左 Alt 键更改组"
 
-#: xfree86.xml.in.h:178
+#: xfree86.xml.in.h:179
 #, fuzzy
 msgid "Left Alt key switches group while pressed"
 msgstr "按下左 Windows 键切换组"
 
-#: xfree86.xml.in.h:179
+#: xfree86.xml.in.h:180
 msgid "Left Ctrl key changes group"
 msgstr "左 Ctrl 键更改组"
 
-#: xfree86.xml.in.h:180
+#: xfree86.xml.in.h:181
 msgid "Left Shift key changes group"
 msgstr "左 Shift 键更改组"
 
-#: xfree86.xml.in.h:181
+#: xfree86.xml.in.h:182
 msgid "Left Win-key changes group"
 msgstr "左 Windows 键更改组"
 
-#: xfree86.xml.in.h:182
+#: xfree86.xml.in.h:183
 msgid "Left Win-key switches group while pressed"
 msgstr "按下左 Windows 键切换组"
 
-#: xfree86.xml.in.h:183
+#: xfree86.xml.in.h:184
 msgid "Lithuanian azerty standard"
 msgstr "立陶宛 azerty 标准"
 
-#: xfree86.xml.in.h:184
+#: xfree86.xml.in.h:185
 msgid "Lithuanian qwerty \"numeric\""
 msgstr "立陶宛 qwerty“数字式”"
 
-#: xfree86.xml.in.h:185
+#: xfree86.xml.in.h:186
 #, fuzzy
 msgid "Logitech Access Keyboard"
 msgstr "罗技强手键盘"
 
-#: xfree86.xml.in.h:186
+#: xfree86.xml.in.h:187
 msgid "Logitech Cordless Desktop"
 msgstr "罗技无影手"
 
-#: xfree86.xml.in.h:187
+#: xfree86.xml.in.h:188
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "罗技无影手桌面导航器"
 
-#: xfree86.xml.in.h:188
+#: xfree86.xml.in.h:189
 msgid "Logitech Cordless Desktop Optical"
 msgstr "罗技无影手光学组合"
 
-#: xfree86.xml.in.h:189
+#: xfree86.xml.in.h:190
 msgid "Logitech Cordless Desktop Pro"
 msgstr "罗技无影手高级版"
 
-#: xfree86.xml.in.h:190
+#: xfree86.xml.in.h:191
 msgid "Logitech Cordless Desktop Pro (alternate option)"
 msgstr "罗技无影手高级版(替代选项)"
 
-#: xfree86.xml.in.h:191
+#: xfree86.xml.in.h:192
 msgid "Logitech Cordless Desktop Pro (alternate option2)"
 msgstr "罗技无影手高级版(替代选项)"
 
-#: xfree86.xml.in.h:192
+#: xfree86.xml.in.h:193
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "罗技网际无影手"
 
-#: xfree86.xml.in.h:193
+#: xfree86.xml.in.h:194
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "罗技极光无影手组合/桌面导航器"
 
-#: xfree86.xml.in.h:194
+#: xfree86.xml.in.h:195
 msgid "Logitech Deluxe Access Keyboard"
 msgstr "罗技强手键盘"
 
-#: xfree86.xml.in.h:195
+#: xfree86.xml.in.h:196
 msgid "Logitech Internet Keyboard"
 msgstr "罗技网际键盘"
 
-#: xfree86.xml.in.h:196
+#: xfree86.xml.in.h:197
 msgid "Logitech Internet Navigator Keyboard"
 msgstr "罗技网际导航键盘"
 
-#: xfree86.xml.in.h:197
+#: xfree86.xml.in.h:198
 msgid "Logitech iTouch"
 msgstr "罗技 iTouch"
 
-#: xfree86.xml.in.h:198
+#: xfree86.xml.in.h:199
 msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 msgstr "罗技 iTouch 无影手键盘(型号 Y-RB6)"
 
-#: xfree86.xml.in.h:199
+#: xfree86.xml.in.h:200
 msgid "Logitech iTouch keyboard Internet Navigator"
 msgstr "罗技 iTouch 键盘网际导航器"
 
-#: xfree86.xml.in.h:200
+#: xfree86.xml.in.h:201
 msgid "Ltu"
 msgstr "Ltu"
 
-#: xfree86.xml.in.h:201
+#: xfree86.xml.in.h:202
 msgid "Lva"
 msgstr "Lva"
 
-#: xfree86.xml.in.h:202
+#: xfree86.xml.in.h:203
 msgid "Macedonian"
 msgstr "马其顿"
 
-#: xfree86.xml.in.h:203
+#: xfree86.xml.in.h:204
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: xfree86.xml.in.h:204
+#: xfree86.xml.in.h:205
 msgid "Macintosh Old"
 msgstr "Macintosh 旧产品"
 
-#: xfree86.xml.in.h:205
+#: xfree86.xml.in.h:206
 msgid "Make CapsLock an additional Control"
 msgstr "将 CapsLock 作为额外的 Ctrl"
 
-#: xfree86.xml.in.h:206
+#: xfree86.xml.in.h:207
 msgid "Mal"
 msgstr "Mal"
 
-#: xfree86.xml.in.h:207
+#: xfree86.xml.in.h:208
 msgid "Malayalam"
 msgstr "马来西亚"
 
-#: xfree86.xml.in.h:208
+#: xfree86.xml.in.h:209
 msgid "Maltese"
 msgstr "马耳他"
 
-#: xfree86.xml.in.h:209
+#: xfree86.xml.in.h:210
 msgid "Maltese (US layout)"
 msgstr "马耳他(美国布局)"
 
-#: xfree86.xml.in.h:210
+#: xfree86.xml.in.h:211
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: xfree86.xml.in.h:211
+#: xfree86.xml.in.h:212
 msgid "Memorex MX2500 EZ-Access Keyboard"
 msgstr "Memorex MX2500 EZ-Access 键盘"
 
-#: xfree86.xml.in.h:212
+#: xfree86.xml.in.h:213
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: xfree86.xml.in.h:213
+#: xfree86.xml.in.h:214
 msgid "Menu is Compose"
 msgstr "菜单已编排"
 
-#: xfree86.xml.in.h:214
+#: xfree86.xml.in.h:215
 msgid "Menu key changes group"
 msgstr "菜单键更改组"
 
-#: xfree86.xml.in.h:215
+#: xfree86.xml.in.h:216
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta 被映射到 Windows 键。"
 
-#: xfree86.xml.in.h:216
+#: xfree86.xml.in.h:217
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta 被映射到左 Windows 键。"
 
-#: xfree86.xml.in.h:217
+#: xfree86.xml.in.h:218
 msgid "Microsoft Internet Keyboard"
 msgstr "微软网际键盘"
 
-#: xfree86.xml.in.h:218
+#: xfree86.xml.in.h:219
 msgid "Microsoft Internet Keyboard Pro, Swedish"
 msgstr "微软网际键盘增强版，瑞典"
 
-#: xfree86.xml.in.h:219
+#: xfree86.xml.in.h:220
 msgid "Microsoft Natural"
 msgstr "微软自然键盘"
 
-#: xfree86.xml.in.h:220
+#: xfree86.xml.in.h:221
 msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 msgstr "微软自然键盘增强版/微软网际键盘增强版"
 
-#: xfree86.xml.in.h:221
+#: xfree86.xml.in.h:222
 msgid "Microsoft Natural Keyboard Pro OEM"
 msgstr "微软自然键盘增强版 OEM"
 
-#: xfree86.xml.in.h:222
+#: xfree86.xml.in.h:223
 msgid "Microsoft Office Keyboard"
 msgstr "微软 Office 键盘"
 
-#: xfree86.xml.in.h:223
+#: xfree86.xml.in.h:224
 #, fuzzy
 msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
 msgstr "微软网际键盘"
 
-#: xfree86.xml.in.h:224
+#: xfree86.xml.in.h:225
 msgid "Miscellaneous compatibility options"
 msgstr "其它兼容选项"
 
-#: xfree86.xml.in.h:225
+#: xfree86.xml.in.h:226
 msgid "Mkd"
 msgstr "Mkd"
 
-#: xfree86.xml.in.h:226
+#: xfree86.xml.in.h:227
 msgid "Mlt"
 msgstr "Mlt"
 
-#: xfree86.xml.in.h:227
+#: xfree86.xml.in.h:228
 msgid "Mmr"
 msgstr "Mmr"
 
-#: xfree86.xml.in.h:228
+#: xfree86.xml.in.h:229
 msgid "Mng"
 msgstr "Mng"
 
-#: xfree86.xml.in.h:229
+#: xfree86.xml.in.h:230
 msgid "Mongolian"
 msgstr "蒙古"
 
-#: xfree86.xml.in.h:230
+#: xfree86.xml.in.h:231
 msgid "Nld"
 msgstr "Nld"
 
-#: xfree86.xml.in.h:231
+#: xfree86.xml.in.h:232
 msgid "Nor"
 msgstr "Nor"
 
-#: xfree86.xml.in.h:232
+#: xfree86.xml.in.h:233
 msgid "Northern Saami (Finland)"
 msgstr "北部沙米(芬兰)"
 
-#: xfree86.xml.in.h:233
+#: xfree86.xml.in.h:234
 msgid "Northern Saami (Norway)"
 msgstr "北部沙米(挪威)"
 
-#: xfree86.xml.in.h:234
+#: xfree86.xml.in.h:235
 msgid "Northern Saami (Sweden)"
 msgstr "北部沙米(瑞典)"
 
-#: xfree86.xml.in.h:235
+#: xfree86.xml.in.h:236
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: xfree86.xml.in.h:236
+#: xfree86.xml.in.h:237
 msgid "Norwegian"
 msgstr "挪威"
 
-#: xfree86.xml.in.h:237
+#: xfree86.xml.in.h:238
 msgid "Num_Lock LED shows alternative group"
 msgstr "NumLock 灯显示替代组(_L)"
 
-#: xfree86.xml.in.h:238
+#: xfree86.xml.in.h:239
 msgid "Ogh"
 msgstr "Ogh"
 
-#: xfree86.xml.in.h:239
+#: xfree86.xml.in.h:240
 msgid "Ogham"
 msgstr "欧甘"
 
-#: xfree86.xml.in.h:240
+#: xfree86.xml.in.h:241
 #, fuzzy
 msgid "Old standard"
 msgstr "标准"
 
-#: xfree86.xml.in.h:241
+#: xfree86.xml.in.h:242
 msgid "Oretec MCK-800 MM/Internet keyboard"
 msgstr "Oretec MCK-800 MM/网际键盘"
 
-#: xfree86.xml.in.h:242
+#: xfree86.xml.in.h:243
 msgid "Ori"
 msgstr "Ori"
 
-#: xfree86.xml.in.h:243
+#: xfree86.xml.in.h:244
 msgid "Oriya"
 msgstr "Oriya"
 
-#: xfree86.xml.in.h:244
+#: xfree86.xml.in.h:245
 msgid "PC-98xx Series"
 msgstr "PC-98xx 系列"
 
-#: xfree86.xml.in.h:245
+#: xfree86.xml.in.h:246
 msgid "PC104"
 msgstr "PC104"
 
-#: xfree86.xml.in.h:246
+#: xfree86.xml.in.h:247
 msgid "Pan"
 msgstr "Pan"
 
-#: xfree86.xml.in.h:247
+#: xfree86.xml.in.h:248
 msgid "Phonetic"
 msgstr "Phonetic"
 
-#: xfree86.xml.in.h:248
+#: xfree86.xml.in.h:249
 msgid "Pol"
 msgstr "Pol"
 
-#: xfree86.xml.in.h:249
+#: xfree86.xml.in.h:250
 msgid "Polish"
 msgstr "波兰"
 
-#: xfree86.xml.in.h:250
+#: xfree86.xml.in.h:251
 msgid "Polish (qwertz)"
 msgstr "波兰(qwertz)"
 
-#: xfree86.xml.in.h:251
+#: xfree86.xml.in.h:252
 msgid "Polish with Polish quotes on key \"1/!\""
 msgstr ""
 
-#: xfree86.xml.in.h:252
+#: xfree86.xml.in.h:253
 msgid "Polytonic"
 msgstr "Polytonic"
 
-#: xfree86.xml.in.h:253
+#: xfree86.xml.in.h:254
 msgid "Portuguese"
 msgstr "葡萄牙"
 
-#: xfree86.xml.in.h:254
+#: xfree86.xml.in.h:255
 msgid "PowerPC PS/2"
 msgstr "PowerPC PS/2"
 
-#: xfree86.xml.in.h:255
+#: xfree86.xml.in.h:256
 #, fuzzy
 msgid "Press Left Alt key to choose 3rd level"
 msgstr "按左 Windows 键选择第三级"
 
-#: xfree86.xml.in.h:256
+#: xfree86.xml.in.h:257
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "按左 Windows 键选择第三级"
 
-#: xfree86.xml.in.h:257
+#: xfree86.xml.in.h:258
 msgid "Press Menu key to choose 3rd level"
 msgstr "按菜单键选择第三级"
 
-#: xfree86.xml.in.h:258
+#: xfree86.xml.in.h:259
 #, fuzzy
 msgid "Press Right Alt key to choose 3rd level"
 msgstr "按右 Windows 键选择第三级"
 
-#: xfree86.xml.in.h:259
+#: xfree86.xml.in.h:260
 msgid "Press Right Control to choose 3rd level"
 msgstr "按右 Ctrl 选择第三级"
 
-#: xfree86.xml.in.h:260
+#: xfree86.xml.in.h:261
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "按右 Windows 键选择第三级"
 
-#: xfree86.xml.in.h:261
+#: xfree86.xml.in.h:262
 #, fuzzy
 msgid "Press any of Alt keys to choose 3rd level"
 msgstr "按任何 Windows 键选择第三级"
 
-#: xfree86.xml.in.h:262
+#: xfree86.xml.in.h:263
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "按任何 Windows 键选择第三级"
 
-#: xfree86.xml.in.h:263
+#: xfree86.xml.in.h:264
 msgid "Propeller Voyager (KTEZ-1000)"
 msgstr "Propeller Voyager (KTEZ-1000)"
 
-#: xfree86.xml.in.h:264
+#: xfree86.xml.in.h:265
 msgid "Prt"
 msgstr "Prt"
 
-#: xfree86.xml.in.h:265
+#: xfree86.xml.in.h:266
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: xfree86.xml.in.h:266
+#: xfree86.xml.in.h:267
 msgid "R-Alt switches group while pressed"
 msgstr "按下右 Alt 切换组"
 
-#: xfree86.xml.in.h:267
+#: xfree86.xml.in.h:268
 msgid "Right Alt is Compose"
 msgstr "右 Alt 已编排"
 
-#: xfree86.xml.in.h:268
+#: xfree86.xml.in.h:269
 msgid "Right Alt key changes group"
 msgstr "右 Alt 键更改组"
 
-#: xfree86.xml.in.h:269
+#: xfree86.xml.in.h:270
 msgid "Right Control key works as Right Alt"
 msgstr "右 Ctrl 键等同于右 Alt"
 
-#: xfree86.xml.in.h:270
+#: xfree86.xml.in.h:271
 msgid "Right Ctrl key changes group"
 msgstr "右 Ctrl 键更改组"
 
-#: xfree86.xml.in.h:271
+#: xfree86.xml.in.h:272
 msgid "Right Shift key changes group"
 msgstr "右 Shift 健更改组"
 
-#: xfree86.xml.in.h:272
+#: xfree86.xml.in.h:273
 msgid "Right Win-key changes group"
 msgstr "右 Windows 键更改组"
 
-#: xfree86.xml.in.h:273
+#: xfree86.xml.in.h:274
 msgid "Right Win-key is Compose"
 msgstr "右 Windows 键已编排"
 
-#: xfree86.xml.in.h:274
+#: xfree86.xml.in.h:275
 msgid "Right Win-key switches group while pressed"
 msgstr "按下右 Windows 键切换组"
 
-#: xfree86.xml.in.h:275
+#: xfree86.xml.in.h:276
 msgid "Romanian"
 msgstr "罗马尼亚"
 
-#: xfree86.xml.in.h:276
+#: xfree86.xml.in.h:277
 msgid "Rou"
 msgstr "Rou"
 
-#: xfree86.xml.in.h:277
+#: xfree86.xml.in.h:278
 msgid "Rus"
 msgstr "Rus"
 
-#: xfree86.xml.in.h:278
+#: xfree86.xml.in.h:279
 msgid "Russian"
 msgstr "俄语"
 
-#: xfree86.xml.in.h:279
+#: xfree86.xml.in.h:280
 msgid "SK-1300"
 msgstr "SK-1300"
 
-#: xfree86.xml.in.h:280
+#: xfree86.xml.in.h:281
 msgid "SK-2500"
 msgstr "SK-2500"
 
-#: xfree86.xml.in.h:281
+#: xfree86.xml.in.h:282
 msgid "SK-6200"
 msgstr "SK-6200"
 
-#: xfree86.xml.in.h:282
+#: xfree86.xml.in.h:283
 msgid "SK-7100"
 msgstr "SK-7100"
 
-#: xfree86.xml.in.h:283
+#: xfree86.xml.in.h:284
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: xfree86.xml.in.h:284
+#: xfree86.xml.in.h:285
 msgid "Samsung SDM 4500P"
 msgstr "三星 SDM 4500P"
 
-#: xfree86.xml.in.h:285
+#: xfree86.xml.in.h:286
 msgid "Samsung SDM 4510P"
 msgstr "三星 SDM 4510P"
 
-#: xfree86.xml.in.h:286
+#: xfree86.xml.in.h:287
 msgid "Sapmi"
 msgstr "Sapmi"
 
-#: xfree86.xml.in.h:287
+#: xfree86.xml.in.h:288
 msgid "Scg"
 msgstr "Scg"
 
-#: xfree86.xml.in.h:288
+#: xfree86.xml.in.h:289
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "ScrollLock 灯显示替代组(_L)"
 
-#: xfree86.xml.in.h:289
+#: xfree86.xml.in.h:290
 msgid "Serbian"
 msgstr "塞尔维亚"
 
-#: xfree86.xml.in.h:290
+#: xfree86.xml.in.h:291
 msgid "Serbian Cyrillic (swap Zhe, Ze)"
 msgstr ""
 
-#: xfree86.xml.in.h:291
+#: xfree86.xml.in.h:292
 msgid "Serbian Latin (swap Y, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:292
+#: xfree86.xml.in.h:293
 msgid "Serbian Latin Unicode"
 msgstr ""
 
-#: xfree86.xml.in.h:293
+#: xfree86.xml.in.h:294
 msgid "Serbian Latin Unicode (swap ZHE, Z)"
 msgstr ""
 
-#: xfree86.xml.in.h:294
+#: xfree86.xml.in.h:295
 msgid "Shift with numpad keys works as in MS Windows"
 msgstr "Shift+数字键盘的功能等同于 MS Windows"
 
-#: xfree86.xml.in.h:295
+#: xfree86.xml.in.h:296
 #, fuzzy
 msgid "Shift+CapsLock changes group"
 msgstr "CapsLock 键更改组"
 
-#: xfree86.xml.in.h:296
+#: xfree86.xml.in.h:297
 msgid "Slovak"
 msgstr "斯洛伐克"
 
-#: xfree86.xml.in.h:297
+#: xfree86.xml.in.h:298
 msgid "Slovak (qwerty)"
 msgstr "斯洛伐克(qwerty)"
 
-#: xfree86.xml.in.h:298
+#: xfree86.xml.in.h:299
 msgid "Slovenian"
 msgstr "斯洛文尼亚"
 
-#: xfree86.xml.in.h:299
+#: xfree86.xml.in.h:300
 msgid "Sme"
 msgstr "Sme"
 
-#: xfree86.xml.in.h:300
+#: xfree86.xml.in.h:301
 msgid "Spanish"
 msgstr "西班牙"
 
-#: xfree86.xml.in.h:301
+#: xfree86.xml.in.h:302
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "服务器处理的特殊键 (Ctrl+Alt+&lt;key&gt;)。"
 
-#: xfree86.xml.in.h:302
+#: xfree86.xml.in.h:303
 msgid "Standard"
 msgstr "标准"
 
-#: xfree86.xml.in.h:303
+#: xfree86.xml.in.h:304
 msgid "Sun dead keys"
 msgstr "Sun 死键"
 
-#: xfree86.xml.in.h:304
+#: xfree86.xml.in.h:305
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super 被映射到 Windows 键(默认)。"
 
-#: xfree86.xml.in.h:305
+#: xfree86.xml.in.h:306
 msgid "Svk"
 msgstr "Svk"
 
-#: xfree86.xml.in.h:306
+#: xfree86.xml.in.h:307
 msgid "Svn"
 msgstr "Svn"
 
-#: xfree86.xml.in.h:307
+#: xfree86.xml.in.h:308
 msgid "Swap Control and Caps Lock"
 msgstr "交换 Ctrl 和 CapsLock"
 
-#: xfree86.xml.in.h:308
+#: xfree86.xml.in.h:309
 msgid "Swe"
 msgstr "Swe"
 
-#: xfree86.xml.in.h:309
+#: xfree86.xml.in.h:310
 msgid "Swedish"
 msgstr "瑞典"
 
-#: xfree86.xml.in.h:310
+#: xfree86.xml.in.h:311
 msgid "Swiss French"
 msgstr "瑞典法语"
 
-#: xfree86.xml.in.h:311
+#: xfree86.xml.in.h:312
 msgid "Swiss German"
 msgstr "瑞典德语"
 
-#: xfree86.xml.in.h:312
+#: xfree86.xml.in.h:313
 msgid "Symplon PaceBook (tablet PC)"
 msgstr "Symplon PaceBook(平板电脑)"
 
-#: xfree86.xml.in.h:313
+#: xfree86.xml.in.h:314
 msgid "Syr"
 msgstr "Syr"
 
-#: xfree86.xml.in.h:314
+#: xfree86.xml.in.h:315
 msgid "Syriac"
 msgstr "叙利亚"
 
-#: xfree86.xml.in.h:315
+#: xfree86.xml.in.h:316
+#, fuzzy
+msgid "Syriac phonetic"
+msgstr "Phonetic"
+
+#: xfree86.xml.in.h:317
 msgid "Tajik"
 msgstr "塔吉克"
 
-#: xfree86.xml.in.h:316
+#: xfree86.xml.in.h:318
 msgid "Tamil"
 msgstr "泰米尔"
 
-#: xfree86.xml.in.h:317
+#: xfree86.xml.in.h:319
 msgid "Tel"
 msgstr "Tel"
 
-#: xfree86.xml.in.h:318
+#: xfree86.xml.in.h:320
 msgid "Telugu"
 msgstr "泰卢固"
 
-#: xfree86.xml.in.h:319
+#: xfree86.xml.in.h:321
 msgid "Tha"
 msgstr "Tha"
 
-#: xfree86.xml.in.h:320
+#: xfree86.xml.in.h:322
 msgid "Thai (Kedmanee)"
 msgstr "泰语(Kedmanee)"
 
-#: xfree86.xml.in.h:321
+#: xfree86.xml.in.h:323
 msgid "Thai (Pattachote)"
 msgstr "泰语(Pattachote)"
 
-#: xfree86.xml.in.h:322
+#: xfree86.xml.in.h:324
 msgid "Thai (TIS-820.2538)"
 msgstr "泰语(TIS-820.2538)"
 
-#: xfree86.xml.in.h:323
+#: xfree86.xml.in.h:325
 msgid "Third level choosers"
 msgstr "第三级选择"
 
-#: xfree86.xml.in.h:324
+#: xfree86.xml.in.h:326
 msgid "Tjk"
 msgstr "Tjk"
 
-#: xfree86.xml.in.h:325
+#: xfree86.xml.in.h:327
 msgid "Tml"
 msgstr "Tml"
 
-#: xfree86.xml.in.h:326
+#: xfree86.xml.in.h:328
 msgid "Toshiba Satellite S3000"
 msgstr "东芝 Satellite S3000"
 
-#: xfree86.xml.in.h:327
+#: xfree86.xml.in.h:329
 msgid "Trust Direct Access Keyboard"
 msgstr "Trust Direct Access 键盘"
 
-#: xfree86.xml.in.h:328
+#: xfree86.xml.in.h:330
 msgid "Trust Wireless Keyboard Classic"
 msgstr "Trust 无线经典键盘"
 
-#: xfree86.xml.in.h:329
+#: xfree86.xml.in.h:331
 msgid "Tur"
 msgstr "Tur"
 
-#: xfree86.xml.in.h:330
+#: xfree86.xml.in.h:332
 msgid "Turkish"
 msgstr "土耳其"
 
-#: xfree86.xml.in.h:331
+#: xfree86.xml.in.h:333
 msgid "Turkish (F)"
 msgstr "土耳其(F)"
 
-#: xfree86.xml.in.h:332
+#: xfree86.xml.in.h:334
 msgid "Turkish Alt-Q Layout"
 msgstr "土耳其 ALt-Q 布局"
 
-#: xfree86.xml.in.h:333
+#: xfree86.xml.in.h:335
 msgid "U.S. English"
 msgstr "美国英语"
 
-#: xfree86.xml.in.h:334
+#: xfree86.xml.in.h:336
 msgid "U.S. English w/ ISO9995-3"
 msgstr "美国英语 ISO9995-3"
 
-#: xfree86.xml.in.h:335
+#: xfree86.xml.in.h:337
 msgid "U.S. English w/ dead keys"
 msgstr "美国英语带死键"
 
-#: xfree86.xml.in.h:336
+#: xfree86.xml.in.h:338
 msgid "US"
 msgstr "US"
 
-#: xfree86.xml.in.h:337
+#: xfree86.xml.in.h:339
 msgid "US keyboard with Romanian letters"
 msgstr "美国键盘，带罗马尼亚字符"
 
-#: xfree86.xml.in.h:338
+#: xfree86.xml.in.h:340
 msgid "USA"
 msgstr "USA"
 
-#: xfree86.xml.in.h:339
+#: xfree86.xml.in.h:341
 msgid "Ukr"
 msgstr "Ukr"
 
-#: xfree86.xml.in.h:340
+#: xfree86.xml.in.h:342
 msgid "Ukrainian"
 msgstr "乌克兰"
 
-#: xfree86.xml.in.h:341
+#: xfree86.xml.in.h:343
 msgid "UnicodeExpert"
 msgstr "UnicodeExpert"
 
-#: xfree86.xml.in.h:342
+#: xfree86.xml.in.h:344
 msgid "United Kingdom"
 msgstr "英国"
 
-#: xfree86.xml.in.h:343
+#: xfree86.xml.in.h:345
 msgid "Use keyboard LED to show alternative group"
 msgstr "使用键盘灯显示替代组"
 
-#: xfree86.xml.in.h:344
+#: xfree86.xml.in.h:346
 msgid "Uses internal capitalization. Shift cancels Caps."
 msgstr "使用内部大写。Shift 取消大写。"
 
-#: xfree86.xml.in.h:345
+#: xfree86.xml.in.h:347
 msgid "Uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "使用内部大写。Shift 不取消大写。"
 
-#: xfree86.xml.in.h:346
+#: xfree86.xml.in.h:348
 msgid "Uzb"
 msgstr "Uzb"
 
-#: xfree86.xml.in.h:347
+#: xfree86.xml.in.h:349
 msgid "Uzbek"
 msgstr "乌兹别克"
 
-#: xfree86.xml.in.h:348
+#: xfree86.xml.in.h:350
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: xfree86.xml.in.h:349
+#: xfree86.xml.in.h:351
 msgid "Vnm"
 msgstr "Vnm"
 
-#: xfree86.xml.in.h:350
+#: xfree86.xml.in.h:352
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: xfree86.xml.in.h:351
+#: xfree86.xml.in.h:353
 msgid "Winkeys"
 msgstr "Winkeys"
 
-#: xfree86.xml.in.h:352
+#: xfree86.xml.in.h:354
 #, fuzzy
 msgid "With Malayalam digits"
 msgstr "马来西亚"
 
-#: xfree86.xml.in.h:353
+#: xfree86.xml.in.h:355
 msgid "Yahoo! Internet Keyboard"
 msgstr "雅虎网际键盘"
 
-#: xfree86.xml.in.h:354
+#: xfree86.xml.in.h:356
 msgid "Yug"
 msgstr "Yug"
 
-#: xfree86.xml.in.h:355
+#: xfree86.xml.in.h:357
 msgid "Yugoslavian"
 msgstr "南斯拉夫"
 
-#: xfree86.xml.in.h:356
+#: xfree86.xml.in.h:358
 msgid "abnt2"
 msgstr "abnt2"
 
-#: xfree86.xml.in.h:357
+#: xfree86.xml.in.h:359
 msgid "azerty"
 msgstr "azerty"
 
-#: xfree86.xml.in.h:358
+#: xfree86.xml.in.h:360
 msgid "azerty/digits"
 msgstr "azerty/数字"
 
-#: xfree86.xml.in.h:359
+#: xfree86.xml.in.h:361
 msgid "bksl"
 msgstr "bksl"
 
-#: xfree86.xml.in.h:360
+#: xfree86.xml.in.h:362
 msgid "digits"
 msgstr "数字"
 
-#: xfree86.xml.in.h:361
+#: xfree86.xml.in.h:363
 msgid "l2/101/qwerty/comma"
 msgstr "l2/101/qwerty/comma"
 
-#: xfree86.xml.in.h:362
+#: xfree86.xml.in.h:364
 msgid "l2/101/qwerty/dot"
 msgstr "l2/101/qwerty/dot"
 
-#: xfree86.xml.in.h:363
+#: xfree86.xml.in.h:365
 msgid "l2/101/qwertz/comma"
 msgstr "l2/101/qwertz/comma"
 
-#: xfree86.xml.in.h:364
+#: xfree86.xml.in.h:366
 msgid "l2/101/qwertz/dot"
 msgstr "l2/101/qwertz/dot"
 
-#: xfree86.xml.in.h:365
+#: xfree86.xml.in.h:367
 msgid "l2/102/qwerty/comma"
 msgstr "l2/102/qwerty/comma"
 
-#: xfree86.xml.in.h:366
+#: xfree86.xml.in.h:368
 msgid "l2/102/qwerty/dot"
 msgstr "l2/102/qwerty/dot"
 
-#: xfree86.xml.in.h:367
+#: xfree86.xml.in.h:369
 msgid "l2/102/qwertz/comma"
 msgstr "l2/102/qwertz/comma"
 
-#: xfree86.xml.in.h:368
+#: xfree86.xml.in.h:370
 msgid "l2/102/qwertz/dot"
 msgstr "l2/102/qwertz/dot"
 
-#: xfree86.xml.in.h:369
+#: xfree86.xml.in.h:371
 msgid "laptop"
 msgstr "laptop"
 
-#: xfree86.xml.in.h:370
+#: xfree86.xml.in.h:372
 msgid "lyx"
 msgstr "lyx"
 
-#: xfree86.xml.in.h:371
+#: xfree86.xml.in.h:373
 msgid "qwerty"
 msgstr "qwerty"
 
-#: xfree86.xml.in.h:372
+#: xfree86.xml.in.h:374
 msgid "qwerty/digits"
 msgstr "qwerty/digits"
 
-#: xfree86.xml.in.h:373
+#: xfree86.xml.in.h:375
 msgid "sefi"
 msgstr "sefi"
 
-#: xfree86.xml.in.h:374
+#: xfree86.xml.in.h:376
 msgid "si1452"
 msgstr "si1452"
 
-#: xfree86.xml.in.h:375
+#: xfree86.xml.in.h:377
 msgid "uni/101/qwerty/comma"
 msgstr "uni/101/qwerty/comma"
 
-#: xfree86.xml.in.h:376
+#: xfree86.xml.in.h:378
 msgid "uni/101/qwerty/dot"
 msgstr "uni/101/qwerty/dot"
 
-#: xfree86.xml.in.h:377
+#: xfree86.xml.in.h:379
 msgid "uni/101/qwertz/comma"
 msgstr "uni/101/qwertz/comma"
 
-#: xfree86.xml.in.h:378
+#: xfree86.xml.in.h:380
 msgid "uni/101/qwertz/dot"
 msgstr "uni/101/qwertz/dot"
 
-#: xfree86.xml.in.h:379
+#: xfree86.xml.in.h:381
 msgid "uni/102/qwerty/comma"
 msgstr "uni/102/qwerty/comma"
 
-#: xfree86.xml.in.h:380
+#: xfree86.xml.in.h:382
 msgid "uni/102/qwerty/dot"
 msgstr "uni/102/qwerty/dot"
 
-#: xfree86.xml.in.h:381
+#: xfree86.xml.in.h:383
 msgid "uni/102/qwertz/comma"
 msgstr "uni/102/qwertz/comma"
 
-#: xfree86.xml.in.h:382
+#: xfree86.xml.in.h:384
 msgid "uni/102/qwertz/dot"
 msgstr "uni/102/qwertz/dot"
 
diff --git a/rules/README b/rules/README
new file mode 100644
index 00000000..2d992c0a
--- /dev/null
+++ b/rules/README
@@ -0,0 +1,6 @@
+This directory lists sets of rules which can be used to obtain an exact XKB
+configuration.
+
+
+
+/* $XFree86$ */
diff --git a/rules/base b/rules/base
new file mode 100644
index 00000000..927743a8
--- /dev/null
+++ b/rules/base
@@ -0,0 +1,196 @@
+// $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 $
+//
+
+// Layouts that still need be composed by old rules
+! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hu hu_qwerty lt_std mn vn hr_US
+
+// If you want non-latin layouts implicitly include the en_US layout
+// uncomment lines below
+//! $nonlatin = am ar ben bg by dev el ge_la ge_ru guj gur il il_phonetic\
+//              ir iu kan lo mk mm ml ori ru sr syr syr_phonetic tel th\
+//              tj tml ua
+
+! $pcmodels = pc101 pc102 pc104 pc105
+! $maclaptop = ibook powerbook
+! $mac = macintosh macintosh_old ibook powerbook
+
+! model 	=	keycodes
+  macintosh_old	=	macintosh
+  powerpcps2	=	powerpcps2
+  pc98		=	xfree98(pc98)
+  abnt2		=	xfree86(abnt2)
+  jp106		=	xfree86(jp106)
+  *		=	xfree86
+
+! $azerty = be fr fr-latin9
+! $qwertz = al cz de hr pl2 ro si sk 
+
+! layout[1]	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! layout	=	keycodes
+  $azerty       =       +aliases(azerty)
+  $qwertz       =       +aliases(qwertz)
+  *             =       +aliases(qwerty)
+
+! model 	=	geometry
+  microsoft	=	microsoft(natural)
+  microsoftpro	=	microsoft(natural)
+  microsoftprose =	microsoft(natural)
+  dell101	=	dell(dell101)
+  flexpro	=	keytronic(FlexPro)
+  hp6000	=	hp(omnibook)
+  omnikey101	=	northgate(omnikey101)
+  thinkpad	=	ibm/thinkpad(common)
+ $pcmodels	=	pc(%m)
+  jp106		=	pc(jp106)
+  everex	=	everex(STEPnote)
+  winbook	=	winbook(XP5)
+  pc98		=	nec(pc98)
+  abnt2		=	pc(abnt2)
+ $mac		=	macintosh(macintosh)
+  *		=       pc(pc104)
+
+! model		variant		layout	=	symbols
+ $maclaptop	nodeadkeys	*	=	macintosh/us(extended)+macintosh/%l%(v)+apple(laptop_bad_switch)
+ $mac		nodeadkeys	*	=	macintosh/us(extended)+macintosh/%l%(v)
+ $pcmodels	nodeadkeys  $oldlayouts	=	en_US(%m%_v)+%l%(v)
+  *		nodeadkeys  $oldlayouts	=	en_US(pc105%_v)+%l%(v)
+
+! model		layout	=	symbols
+  pc98		nec/jp	=	nec/jp(pc98)
+  abnt2		br	=	pc/pc(pc104)+pc/br
+ $maclaptop	us	=	macintosh/us(extended)+apple(laptop_bad_switch)
+ $maclaptop	en_US	=	macintosh/us(extended)+apple(laptop_bad_switch)
+ $maclaptop	*	=	macintosh/us(extended)+apple(laptop_bad_switch)+macintosh/%l%(v)
+ $mac		us	=	macintosh/us(extended)
+ $mac		en_US	=	macintosh/us(extended)
+ $mac		*	=	macintosh/us(extended)+macintosh/%l%(v)
+ $pcmodels      intl    =       us(%mcompose)
+  *		intl	=	us(pc104compose) 
+  *		jp	=	jp
+ $pcmodels $oldlayouts  =       en_US(%m)+%l%(v)
+ $pcmodels $nonlatin	=	pc/pc(%m)+pc/us+pc/%l%(v):2
+ $pcmodels	*	=	pc/pc(%m)+pc/%l%(v)
+  *	   $oldlayouts  =       en_US(pc105)+%l%(v)
+  *	   $nonlatin	=	pc/pc(pc105)+pc/us+pc/%l%(v):2
+  *		*	=	pc/pc(pc105)+pc/%l%(v)
+
+! model	    layout[1]	=	symbols
+ $pcmodels	*	=	pc/pc(%m)+pc/%l[1]%(v[1])
+  *		*	=	pc/pc(pc105)+pc/%l[1]%(v[1])
+
+! layout[2]	=	symbols
+  *		=	+pc/%l[2]%(v[2]):2
+
+! layout[3]	=	symbols
+  *		=	+pc/%l[3]%(v[3]):3
+
+! layout[4]	=	symbols
+  *		=	+pc/%l[4]%(v[4]):4
+ 
+! $inetkbds = airkey acpi scorpius azonaRF2300 \
+              brother \
+              btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090\
+              cherryblue cherrybluea \
+              chicony chicony9885 \
+              compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \
+              dell inspiron dtk2000 \
+              dexxa diamond genius geniuscomfy2 \
+              ennyah_dkb1008 \
+              hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
+              hp500fa hp5xx hp5185 \
+              honeywell_euroboard \
+              rapidaccess rapidaccess2 rapidaccess2a \
+              ltcd logiaccess logicdp logicdpa logicink logiciink \
+              logiinkse logiinkseusb logiik itouch \
+              mx1998 mx2500 mx2750 \
+              microsoftinet microsoftpro microsoftprooem microsoftprose \
+              microsoftoffice microsoftmult \
+              oretec \
+              propeller \
+              qtronix \
+              samsung4500 samsung4510 \
+              sk1300 sk2500 sk6200 sk7100 \
+              sven symplon toshiba_s3000 trust trustda yahoo
+
+! model         =       symbols
+  $inetkbds     =       +inet(%m)
+
+! model		layout	=	compat
+  pc98		nec/jp	=	pc98(basic)
+  *		*	=	complete
+
+! model	     layout[1]	=	compat
+  *		*	=	complete
+
+! model		=	types
+  *		=	complete
+
+! option		=	symbols
+  grp:switch		=	+group(switch)
+  grp:lswitch		=	+group(lswitch)
+  grp:win_switch	=	+group(win_switch)
+  grp:lwin_switch	=	+group(lwin_switch)
+  grp:rwin_switch	=	+group(rwin_switch)
+  grp:toggle		=	+group(toggle)
+  grp:shift_toggle	=	+group(shift_toggle)
+  grp: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)
+  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)
+  compose:ralt		=	+compose(ralt)
+  compose:rwin		=	+compose(rwin)
+  compose:menu		=	+compose(menu)
+  srvrkeys:none		=	+srvr_ctrl(no_srvr_keys)
+
+! option		=	compat
+  grp_led:num		=	+leds(num)
+  grp_led:caps		=	+leds(caps)
+  grp_led:scroll	=	+leds(scroll)
+
+! option			=	types
+  caps:internal			=	+caps(internal)
+  caps:internal_nocancel	=	+caps(internal_nocancel)
+  caps:shift			=	+caps(shift)
+  caps:shift_nocancel		=	+caps(shift_nocancel)
+  numpad:microsoft		=	+numpad(microsoft)
diff --git a/rules/base-it.lst b/rules/base-it.lst
new file mode 100644
index 00000000..7506755c
--- /dev/null
+++ b/rules/base-it.lst
@@ -0,0 +1,51 @@
+// $Xorg: xfree86-it.lst,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+
+//
+//  Elenco dei modelli e dei lingauggi
+//  Copyright 1996 by Joseph Moss
+//
+// $XFree86: xc/programs/xkbcomp/rules/xfree86-it.lst,v 1.5 2001/01/17 23:45:57 dawes Exp $
+
+! model
+  microsoft       Microsoft Natural
+  dell101         Dell 101-key PC
+  flexpro         Keytronic FlexPro
+  omnikey101      Northgate OmniKey 101
+  pc101           101-key PC Generico
+  pc102           102-key (Intl) PC Generico
+  pc104           104-key PC Generico
+  pc105           105-key (Intl) PC Generico
+  jp106           106-key Giapponese
+  everex          Everex STEPnote
+  winbook         Winbook Modello XP5
+  pc98            PC-98xx Series
+
+! layout
+  us              Inglese Statunitense
+  en_US           U.S. Inglese + ISO9995-3
+  be              Belga
+  bg              Bulgaro
+  ca              Canadese
+  cz              Ceco
+  cz_qwerty       Ceco (qwerty)
+  de              Tedesco
+  de_CH           Tedesco Svizzero
+  dk              Danese
+  es              Spagnolo
+  fi              Finlandese
+  fr              Francese
+  fr_CH           Francese Svizzero
+  gb              Regno Unito
+  hu              Ungherese
+  hu_qwerty       Ungherese (qwerty)
+  it              Italiano
+  jp              Giapponese
+  no              Norvegese
+  pl              Polacco
+  pt              Portoghese
+  ru              Russo
+  se              Svedese
+  sk              Slovacco
+  sk_qwerty       Slovacco (qwerty)
+  th              Tailandese
+  nec/jp          nec/jp(pc98)
diff --git a/rules/base.lst b/rules/base.lst
new file mode 100644
index 00000000..9f018cbf
--- /dev/null
+++ b/rules/base.lst
@@ -0,0 +1,269 @@
+// $XdotOrg: xc/programs/xkbcomp/rules/xfree86.lst,v 1.1.4.5 2004/03/05 13:41:31 eich Exp $
+// $Xorg: xfree86.lst,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+
+//
+//  Rules descriptions for XFree86
+//  Copyright 1996 by Joseph Moss
+//
+//  $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.80 2004/01/09 14:59:17 pascal Exp $
+
+! 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
+  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
+  abnt2		Brazilian ABNT2
+  airkey	Acer AirKey V
+  acpi		ACPI Standard
+  azonaRF2300	Azona RF2300 wireless Internet Keyboard
+  scorpius	Advance Scorpius KI
+  brother	Brother Internet Keyboard
+  btc5113rf	BTC 5113RF Multimedia
+  btc5126t	BTC 5126T
+  btc9000	BTC 9000
+  btc9000a	BTC 9000A
+  cherryblue	Cherry Blue Line CyBo@rd
+  cherrybluea	Cherry Blue Line CyBo@rd (alternate option)
+  chicony	Chicony Internet Keyboard
+  chicony9885	Chicony KB-9885
+  compaqeak8	Compaq Easy Access Keyboard
+  compaqik7	Compaq Internet Keyboard (7 keys)
+  compaqik13	Compaq Internet Keyboard (13 keys)
+  compaqik18	Compaq Internet Keyboard (18 keys)
+  armada	Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard
+  presario	Laptop/notebook Compaq (eg. Presario) Internet Keyboard
+  ipaq		Compaq iPaq Keyboard
+  dell		Dell
+  inspiron	Laptop/notebook Dell Inspiron 8xxx
+  dexxa		Dexxa Wireless Desktop Keyboard
+  diamond	Diamond 9801 / 9802 series
+  dtk2000	DTK2000
+  ennyah_dkb1008 Ennyah DKB-1008
+  genius	Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+  geniuscomfy2	Genius Comfy KB-21e-Scroll
+  hpi6		Hewlett-Packard Internet Keyboard
+  hp2501	Hewlett-Packard SK-2501 Multimedia Keyboard
+  hp2505	Hewlett-Packard SK-2505 Internet Keyboard
+  hp5181	Hewlett-Packard 5181 Internet Keyboard
+  hpxe3gc	Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion N5xxx
+  hpxe3gf	Hewlett-Packard Omnibook XE3 GF
+  hpxe4xxx	Hewlett-Packard Omnibook XE4xxx and ZE4xxx
+  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
+  hp5185	Hewlett-Packard 5185 Internet Keyboard
+  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
+  ltcd		Logitech Cordless Desktop
+  logicdp	Logitech Cordless Desktop Pro
+  logicdpa	Logitech Cordless Desktop Pro (alternate option)
+  logiaccess	Logitech Access Keyboard
+  logicink	Logitech Internet Navigator Keyboard
+  logiciink	Logitech iTouch Internet Navigator Keyboard
+  logiinkse	Logitech iTouch Internet Navigator Keyboard SE
+  logiinkseusb	Logitech iTouch Internet Navigator Keyboard SE (USB)
+  logiik	Logitech Internet Keyboard
+  itouch	Logitech iTouch
+  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
+  microsoftprooem Microsoft Natural Keyboard Pro OEM
+  microsoftprose Microsoft Internet Keyboard Pro, Swedish
+  microsoftoffice Microsoft Office Keyboard
+  microsoftmult Microsoft Wireless Multimedia Keyboard
+  oretec	Oretec MCK-800 MM/Internet keyboard
+  propeller	Propeller Voyager (KTEZ-1000)
+  qtronix	QTronix Scorpius 98N+
+  samsung4500	Samsung SDM 4500P
+  samsung4510	Samsung SDM 4510P
+  sk1300	SK-1300
+  sk2500	SK-2500
+  sk6200	SK-6200
+  sk7100	SK-7100
+  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
+
+
+// The entries here should be ordered as follows:
+//
+//   US entries first
+//   others in alphabetical order by the language/country name in English
+
+! layout
+  us		U.S. English
+  en_US		U.S. English w/ ISO9995-3
+  us_intl	U.S. English w/ deadkeys
+  al		Albanian
+  ar		Arabic
+  am		Armenian
+  az		Azerbaijani
+  by		Belarusian
+  be		Belgian
+  ben		Bengali
+  bs		Bosnian
+  br		Brazilian
+  bg		Bulgarian
+  mm		Burmese
+  ca		Canadian
+  ca_enhanced	French Canadian
+  hr		Croatian
+  hr_US		Croatian (US)
+  cz		Czech
+  cz_qwerty	Czech (qwerty)
+  dk		Danish
+  nl		Dutch
+  dvorak	Dvorak
+  dz		Dzongkha / Tibetan
+  ee		Estonian
+  fo		Faroese 
+  fi		Finnish
+  fr		French
+  fr-latin9	French (alternative)
+  ge_la		Georgian (latin)
+  ge_ru		Georgian (russian)
+  de		German
+  el		Greek
+  guj		Gujarati
+  gur		Gurmukhi
+  dev		Hindi
+  hu		Hungarian
+  hu_qwerty	Hungarian (qwerty)
+  is		Icelandic
+  iu		Inuktitut
+  ir		Iranian
+  il		Israeli
+  it		Italian
+  jp		Japanese
+  kan		Kannada
+  ko		Korean
+  lo		Lao
+  la		Latin America
+  lt		Lithuanian qwerty "numeric"
+  lt_std	Lithuanian azerty standard
+  lv		Latvian
+  mk		Macedonian
+  ml		Malayalam
+  mt		Maltese
+  mt_us		Maltese (US layout)
+  mn		Mongolian
+  no		Norwegian
+  ogham		Ogham
+  ori		Oriya
+  pl		Polish
+  pl2		Polish (qwertz)
+  pt		Portuguese
+  ro		Romanian
+  ru		Russian
+  se_FI		Northern Saami (Finland)
+  se_NO		Northern Saami (Norway)
+  se_SE		Northern Saami (Sweden)
+  sr		Serbian (Cyrillic)
+  yu		Serbian (Latin)
+  si		Slovenian
+  sk		Slovak
+  sk_qwerty	Slovak (qwerty)
+  es		Spanish
+  se		Swedish
+  fr_CH		Swiss French
+  de_CH		Swiss German
+  syr		Syriac
+  tj		Tajik
+  tml		Tamil
+  tel		Telugu
+  th		Thai (Kedmanee)
+  th_tis	Thai (TIS-820.2538)
+  th_pat	Thai (Pattachote)
+  tr		Turkish 
+  tr_f		Turkish (F)
+  ua		Ukrainian 
+  gb		United Kingdom
+  uz            Uzbek
+  vn		Vietnamese
+  nec/jp	PC-98xx Series
+
+! variant
+  nodeadkeys	Eliminate dead keys
+
+! option
+  grp			Group Shift/Lock behavior
+  grp:switch		Right Alt key switches group while pressed
+  grp:lswitch		Left Alt key switches group while pressed
+  grp:lwin_switch	Left Win-key switches group while pressed
+  grp:rwin_switch	Right Win-key switches group while pressed
+  grp:win_switch	Both Win-keys switch group while pressed
+  grp:toggle		Right Alt key changes group
+  grp:lalt_toggle       Left Alt key changes group
+  grp:caps_toggle	Caps Lock key changes group
+  grp:shift_caps_toggle	Shift+CapsLock changes group
+  grp:shift_toggle 	Both Shift keys together change group
+  grp:alts_toggle 	Both Alt keys together change group
+  grp:ctrls_toggle 	Both Ctrl keys together change group
+  grp:ctrl_shift_toggle Control+Shift changes group
+  grp:ctrl_alt_toggle	Alt+Control changes group
+  grp:alt_shift_toggle	Alt+Shift changes group
+  grp:menu_toggle	Menu key changes group
+  grp:lwin_toggle	Left Win-key changes group
+  grp:rwin_toggle	Right Win-key changes group
+  grp:lshift_toggle     Left Shift key changes group
+  grp:rshift_toggle     Right Shift key changes group
+  grp:lctrl_toggle      Left Ctrl key changes group
+  grp:rctrl_toggle      Right Ctrl key changes group
+  lv3			Third level choosers
+  lv3:switch		Press Right Control to choose 3rd level
+  lv3:lalt_switch	Press Left Alt key to choose 3rd level
+  lv3:ralt_switch	Press Right Alt key to choose 3rd level
+  lv3:alt_switch	Press any of Alt keys 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
+  ctrl			Control Key Position
+  ctrl:nocaps		Make CapsLock an additional Control
+  ctrl:swapcaps		Swap Control and Caps Lock
+  ctrl:ctrl_ac		Control key at left of 'A'
+  ctrl:ctrl_aa		Control key at bottom left
+  ctrl:ctrl_ra		Right Control key works as Right Alt
+  grp_led		Use keyboard LED to show alternative group
+  grp_led:num		Num_Lock LED shows alternative group
+  grp_led:caps		Caps_Lock LED shows alternative group
+  grp_led:scroll	Scroll_Lock LED shows alternative group
+  caps			CapsLock key behavior
+  caps:internal		uses internal capitalization. Shift cancels Caps.
+  caps:internal_nocancel uses internal capitalization. Shift doesn't cancel Caps.
+  caps:shift		acts as Shift with locking. Shift cancels Caps.
+  caps:shift_nocancel	acts as Shift with locking. Shift doesn't cancel Caps.
+
+  altwin		Alt/Win key behavior
+  altwin:menu		Add the standard behavior to Menu key.
+  altwin:meta_alt	Alt and Meta on the Alt keys (default).
+  altwin:meta_win	Meta is mapped to the Win-keys.
+  altwin:left_meta_win	Meta is mapped to the left Win-key.
+  altwin:meta_super	Super is mapped to the Win-keys (default).
+  altwin:meta_hyper	Hyper is mapped to the Win-keys.
+
+  compose:ralt		Right Alt is Compose
+  compose:rwin		Right Win-key is Compose
+  compose:menu		Menu is Compose
+
+  numpad:microsoft	Shift with numpad keys works as in MS Windows.
+
+  srvrkeys:none		Special keys (Ctrl+Alt+<key>) handled in a server.
diff --git a/xfree86.xml.in b/rules/base.xml.in
index d69643e3..d69643e3 100644
--- a/xfree86.xml.in
+++ b/rules/base.xml.in
diff --git a/rules/sgi b/rules/sgi
new file mode 100644
index 00000000..218c25be
--- /dev/null
+++ b/rules/sgi
@@ -0,0 +1,73 @@
+// $Xorg: sgi,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+
+! option                =   symbols
+  grp:switch            =   +group(switch)
+  grp:toggle            =   +group(toggle)
+  grp:shift_toggle      =   +group(shift_toggle)
+  grp:ctrl_shift_toggle =   +group(ctrl_shift_toggle)
+  grp:ctrl_alt_toggle   =   +group(ctrl_alt_toggle)
+  grp:caps_toggle	=   +group(caps_toggle)
+  ctrl:nocaps           =   +ctrl(nocaps)
+  ctrl:swapcaps         =   +ctrl(swapcaps)
+  ctrl:ctrl_ac          =   +ctrl(ctrl_ac)
+  ctrl:ctrl_aa          =   +ctrl(ctrl_aa)
+  keypad:overlay	=   +keypad(overlay)
+  keypad:overlay1	=   +keypad(overlay)
+  keypad:overlay2	=   +keypad(overlay)
+  lock:shift		=   +lock(shift)
+  pc104:altmeta		=   +pc104(altmeta)
+  pc104:compose		=   +pc104(compose)
+
+! option		=   keycodes
+  lock:shift		=   +sgi/indy(shiftLock)
+
+! option		=   keycodes			compat
+  keypad:overlay	=   +sgi/indy(overlayKeypad)	+keypad(overlay)
+  keypad:overlay1	=   +sgi/indy(overlayKeypad)	+keypad(overlay1)
+  keypad:overlay2	=   +sgi/indy(overlayKeypad)	+keypad(overlay2)
+
+! model   layout   	=    keycodes			geometry
+  indy    us		=    sgi/indy(universal)	sgi/indy(pc101)
+  indy    intl          =    sgi/indy(universal)        sgi/indy(pc101)
+  indy    dvorak	=    sgi/indy(universal)	sgi/indy(pc101)
+  indigo  us		=    sgi/indigo(pc101)      	sgi/indigo(pc101)
+  indigo  intl          =    sgi/indigo(pc101)          sgi/indigo(pc101)
+  indigo  dvorak	=    sgi/indigo(pc101)		sgi/indigo(pc101)
+  indy    jp		=    sgi/indy(jp106)		sgi/indy(jp106)
+
+! model			=    keycodes			geometry
+  indy			=    sgi/indy(universal)	sgi/indy(pc102)
+  indy101		=    sgi/indy(universal)	sgi/indy(pc101)
+  indy102               =    sgi/indy(universal)	sgi/indy(pc102)
+  indy104               =    sgi/indy(universal)	microsoft(natural)
+  indy105               =    sgi/indy(universal)	microsoft(natural)
+  indy106		=    sgi/indy(jp106)		sgi/indy(jp106)
+  indigo		=    sgi/indigo(pc102)		sgi/indigo(pc102)
+  indigo102             =    sgi/indigo(pc102)          sgi/indigo(pc102)
+  microsoft		=    sgi/indy(universal)	microsoft(natural)
+  kinesis		=    sgi/indy(universal)	kinesis
+  dell101		=    sgi/indy(universal)	dell(dell101)
+  flexpro		=    sgi/indy(universal)	keytronic(FlexPro)
+  omnikey101		=    sgi/indy(universal)	northgate(omnikey101)
+  pc101			=    sgi/indy(universal)	pc(pc101)
+  pc102			=    sgi/indy(universal)	pc(pc102)
+  jp106			=    sgi/indy(jp106)		pc(jp106)
+  digital101		=    sgi/indy(universal)	digital/pc(pc101)
+  digital102		=    sgi/indy(universal)	digital/pc(pc102)
+  digitalpcxaj		=    sgi/indy(jp106)		digital/pc(pcxaj)
+
+! model     variant	=  symbols
+  *         nodeadkeys	=  en_US(pc_universal%_v)+%l%(v)
+
+! model     layout   =   symbols
+  *         us       =   us(pc_universal)
+  *	    jp       =   us(pc101)+sgi/%l%(v)
+  *         intl     =   us(pc_universal_compose)
+  *         en_US    =   en_US(pc_universal)
+  *         *        =   en_US(pc_universal)+%l%(v)
+
+! layout	=	compat
+  jp		=	complete+japan
+
+! model   layout   =    compat     types
+  *       *        =    complete   complete
diff --git a/rules/sgi.lst b/rules/sgi.lst
new file mode 100644
index 00000000..2486f80f
--- /dev/null
+++ b/rules/sgi.lst
@@ -0,0 +1,82 @@
+// $Xorg: sgi.lst,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
+
+
+
+
+// $XFree86: xc/programs/xkbcomp/rules/sgi.lst,v 3.6 2001/05/18 23:35:34 dawes Exp $
+
+! model
+  indy			SGI O2, Indigo^2 or Indy
+  indy101		SGI O2, Indigo^2 or Indy (101-key US)
+  indy102		SGI O2, Indigo^2 or Indy (102-key European)
+  indy104               Generic 104-key PC
+  indy105               Generic 105-key PC
+  indy106               SGI O2, Indigo^2 or Indy (106-key Japanese)
+  indigo		SGI Indigo
+  indigo102             SGI Indigo (102-key European)
+  dell101		Dell 101-key PC
+  flexpro		Keytronic FlexPro
+  jp106			Generic 106-key Japanese PC
+  microsoft		Microsoft Natural
+  omnikey101		Northgate OmniKey 101
+  pc101			Generic 101-key PC
+  pc102			Generic 102-key (European) PC
+
+! layout
+  be			Belgian
+  bg			Bulgarian
+  ca			Canadian
+  cz			Czech
+  cz_qwerty		Czech (qwerty)
+  de 			German
+  de_CH			Swiss German
+  dvorak		Dvorak (US)
+  dk			Danish
+  en_US			US/English w/ISO9995-3
+  es			Spanish
+  fi			Finnish
+  fr			French
+  fr_CH			Swiss French
+  gb			United Kingdom
+  hu			Hungarian
+  it			Italian
+  intl			US w/Compose Key
+  jp			Japanese
+  no			Norwegian
+  pl			Polish
+  pt			Portuguese
+  ru			Russian
+  se			Swedish
+  sk			Slovak
+  sk_qwerty		Slovak (qwerty)
+  th			Thai
+  us			US/ASCII
+  tr			Turkish
+
+! variant
+  nodeadkeys		Eliminate dead keys from European keyboards
+  typewriter		Cyrillic layout similar to manual typewriters
+  phonetic		Cyrillic layout similar to US/ASCII layout
+
+! option
+  grp			Group Shift/Lock behavior
+  grp:switch		Right Alt key switches group while held down
+  grp:toggle		Pressing Right Alt key toggles group
+  grp:shift_toggle	Pressing both shift keys together toggles group
+  grp:ctrl_shift_toggle	Pressing shift and control together toggles group
+  grp:ctrl_alt_toggle	Pressing alt and control together toggles group
+  grp:caps_toggle       Caps Lock key toggles group
+  ctrl			Control Key Position
+  ctrl:nocaps		Replace Caps Lock with another control key
+  ctrl:swapcaps		Swap positions of control and Caps Lock
+  ctrl:ctrl_ac		Control key is left of the 'A' key
+  ctrl:ctrl_aa		Control key is at the left of the bottom row
+  keypad		Specify behavior of the numeric keypad
+  keypad:overlay	Use default Overlay instead of modifier for keypad
+  keypad:overlay1	Use Overlay1 instead of modifier for keypad
+  keypad:overlay2	Use Overlay2 instead of modifier for keypad
+  lock			Specify behavior of the lock key
+  lock:shift		Key is shift lock
+  lock:caps		Key is captals lock
+  lock:group		Key is group lock
+
diff --git a/rules/sun b/rules/sun
new file mode 100644
index 00000000..1af228e4
--- /dev/null
+++ b/rules/sun
@@ -0,0 +1,43 @@
+// $XFree86: xc/programs/xkbcomp/rules/sun,v 3.1 2000/05/18 23:21:43 dawes Exp $
+
+! model			=    keycodes			geometry
+  type4			=    sun(type4)			sun(type4)
+  type5			=    sun(type5)			sun
+  type5_euro		=    sun(type5_euro)		sun(type5euro)
+  type5_unix		=    sun(type5)			sun(type5unix)
+  type6			=    sun(type6)                 sun(type5) // no type6 yet
+  type6_euro		=    sun(type6_euro)            sun(type5)
+
+! model		layout	=  symbols
+  type4		us	=  sun/us(sun4)
+  type5		us	=  sun/us(sun5)
+  type5_unix	us	=  sun/us(sun5)
+  type6		us      =  sun/us(sun6)
+  type4		en_US	=  sun/us(sun4)+iso9995-3(basic)
+  type5		en_US	=  sun/us(sun5)+iso9995-3(basic)
+  type5_unix	en_US	=  sun/us(sun5)+iso9995-3(basic)
+  type6		en_US   =  sun/us(sun6)+iso9995-3(basic)
+  type4		*	=  sun/us(sun4)+%l%(v)
+  type5		*	=  sun/us(sun5)+%l%(v)
+  type5_euro	*	=  sun/us(sun5)+%l%(v)
+  type6		*	=  sun/us(sun6)+%l%(v)
+  type6_euro	*	=  sun/us(sun6)+%l%(v)
+
+! model   layout   =    compat     types
+  *       *        =    complete   complete
+
+! option                =   symbols
+  grp:switch            =   +group(switch)
+  grp:toggle            =   +group(toggle)
+  grp:shift_toggle      =   +group(shift_toggle)
+  grp:ctrl_shift_toggle =   +group(ctrl_shift_toggle)
+  grp:ctrl_alt_toggle   =   +group(ctrl_alt_toggle)
+  grp:caps_toggle	=   +group(caps_toggle)
+  ctrl:nocaps           =   +ctrl(nocaps)
+  ctrl:swapcaps         =   +ctrl(swapcaps)
+  ctrl:ctrl_ac          =   +ctrl(ctrl_ac)
+  ctrl:ctrl_aa          =   +ctrl(ctrl_aa)
+  keypad:overlay	=   +keypad(overlay)
+  keypad:overlay1	=   +keypad(overlay)
+  keypad:overlay2	=   +keypad(overlay)
+  lock:shift		=   +lock(shift)
diff --git a/rules/sun.lst b/rules/sun.lst
new file mode 100644
index 00000000..0129f4fe
--- /dev/null
+++ b/rules/sun.lst
@@ -0,0 +1,62 @@
+// $XFree86: xc/programs/xkbcomp/rules/sun.lst,v 3.5 2001/05/23 16:03:51 dawes Exp $
+
+! model
+  type4			Sun Type4
+  type5			Sun Type5
+  type5_euro		Sun Type5 European
+  type5_unix		Sun Type5 Unix
+  type6                 Sun Type6
+  type6_euro            Sun Type6 European
+
+! layout
+  be			Belgian
+  bg			Bulgarian
+  ca			Canadian
+  cz			Czech
+  de 			German
+  de_CH			Swiss German
+  dvorak		Dvorak (US)
+  dk			Danish
+  en_US			US/English w/ISO9995-3
+  es			Spanish
+  fi			Finnish
+  fr			French
+  fr_CH			Swiss French
+  gb			United Kingdom
+  hu			Hungarian
+  it			Italian
+  intl			US w/Compose Key
+  jp			Japanese
+  no			Norwegian
+  pl			Polish
+  pt			Portuguese
+  ru			Russian
+  se			Swedish
+  sk			Slovak
+  th			Thai
+  us			US/ASCII
+  tr			Turkish
+
+! variant
+  nodeadkeys		Eliminate dead keys from European keyboards
+  typewriter		Cyrillic layout similar to manual typewriters
+  phonetic		Cyrillic layout similar to US/ASCII layout
+
+! option
+  grp			Group Shift/Lock behavior
+  grp:switch		Right Alt key switches group while held down
+  grp:toggle		Pressing Right Alt key toggles group
+  grp:shift_toggle	Pressing both shift keys together toggles group
+  grp:ctrl_shift_toggle	Pressing shift and control together toggles group
+  grp:ctrl_alt_toggle	Pressing alt and control together toggles group
+  grp:caps_toggle       Caps Lock key toggles group
+  ctrl			Control Key Position
+  ctrl:nocaps		Replace Caps Lock with another control key
+  ctrl:swapcaps		Swap positions of control and Caps Lock
+  ctrl:ctrl_ac		Control key is left of the 'A' key
+  ctrl:ctrl_aa		Control key is at the left of the bottom row
+  lock			Specify behavior of the lock key
+  lock:shift		Key is shift lock
+  lock:caps		Key is captals lock
+  lock:group		Key is group lock
+
diff --git a/rules/xfree98 b/rules/xfree98
new file mode 100644
index 00000000..8fda6439
--- /dev/null
+++ b/rules/xfree98
@@ -0,0 +1,29 @@
+//
+//  Rules for resolving XKB components for use with XFree86
+//  Copyright 1996 by Joseph Moss
+//
+//  $XFree86: xc/programs/xkbcomp/rules/xfree86,v 3.5 1996/12/17 21:03:59 dawes Exp $
+//
+
+! model 	=	keycodes	geometry
+  pc98		=	xfree98(pc98)	nec(pc98)
+  jp106		=	xfree98(jp106)	pc(jp106)
+
+! model		layout	=	symbols
+  pc98		nec/jp	=	nec/jp(pc98)
+  jp106		jp	=	jp
+
+! model		layout	=	compat		types
+  *		*	=	complete	complete
+
+! option		=	symbols
+  grp:switch		=	+group(switch)
+  grp:toggle		=	+group(toggle)
+  grp:shift_toggle	=	+group(shift_toggle)
+  grp:ctrl_shift_toggle	=	+group(ctrl_shift_toggle)
+  grp:ctrl_alt_toggle	=	+group(ctrl_alt_toggle)
+  ctrl:nocaps		=	+ctrl(nocaps)
+  ctrl:swapcaps		=	+ctrl(swapcaps)
+  ctrl:ctrl_ac		=	+ctrl(ctrl_ac)
+  ctrl:ctrl_aa		=	+ctrl(ctrl_aa)
+
diff --git a/rules/xfree98.lst b/rules/xfree98.lst
new file mode 100644
index 00000000..012c9919
--- /dev/null
+++ b/rules/xfree98.lst
@@ -0,0 +1,30 @@
+//
+//  Rules descriptions for XFree86
+//  Copyright 1996 by Joseph Moss
+//
+//  $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.3 1996/12/18 03:30:14 dawes Exp $
+
+! model
+  pc98		PC-98 series standard
+  jp106		Japanese 106-key
+
+! layout
+  pc98		PC98
+  jp		Japanese
+
+! variant
+  nodeadkeys	Eliminate dead keys
+
+! option
+  grp			Group Shift/Lock behavior
+  grp:switch		R-Alt switches group while pressed
+  grp:toggle		Right Alt key changes group
+  grp:shift_toggle 	Both Shift keys together change group
+  grp:ctrl_shift_toggle Control+Shift changes group
+  grp:ctrl_alt_toggle	Alt+Control changes group
+  ctrl			Control Key Position
+  ctrl:nocaps		Make CapsLock an additional Control
+  ctrl:swapcaps		Swap Control and Caps Lock
+  ctrl:ctrl_ac		Control key at left of 'A'
+  ctrl:ctrl_aa		Control key at bottom left
+
diff --git a/xkb.dtd b/rules/xkb.dtd
index 2dc53520..2dc53520 100644
--- a/xkb.dtd
+++ b/rules/xkb.dtd
diff --git a/rules/xml2lst.pl b/rules/xml2lst.pl
new file mode 100644
index 00000000..56cf0cdc
--- /dev/null
+++ b/rules/xml2lst.pl
@@ -0,0 +1,288 @@
+#!/usr/bin/perl
+
+# converts the <rules>.xml file to the old format <rules>.lst file
+#
+# Usage:
+#
+# perl xml2lst.pl [lang] < filename.xml > filename.lst
+#
+# author Ivan Pascal
+
+if (@ARGV) {
+   $lang = shift @ARGV;
+} else {
+   $lang = '';
+}
+
+$doc = new_document( 0, '');
+parse('', $doc);
+
+($reg)   = node_by_name($doc, '/xkbConfigRegistry');
+@models  = node_by_name($reg, 'modelList/model/configItem');
+@layouts = node_by_name($reg, 'layoutList/layout/configItem');
+@options = node_by_name($reg, 'optionList/group/configItem');
+
+print "! model\n";
+for $i (@models) {
+   ($name) = node_by_name($i, 'name');
+    @desc =  node_by_name($i, 'description');
+    $descr = with_attribute(\@desc, 'xml:lang='.$lang);
+    if (! defined $descr) {
+        $descr = with_attribute(\@desc, 'xml:lang=');
+    }
+    printf("  %-15s %s\n", text_child($name), text_child($descr));
+}
+
+print "\n! layout\n";
+for $i (@layouts) {
+   ($name) = node_by_name($i, 'name');
+    @desc =  node_by_name($i, 'description');
+    $descr = with_attribute(\@desc, 'xml:lang='.$lang);
+    if (! defined $descr ) {
+        $descr = with_attribute(\@desc, 'xml:lang=');
+    }
+    printf("  %-15s %s\n", text_child($name), text_child($descr));
+}
+
+print "\n! variant\n";
+for $l (@layouts) {
+   ($lname) = node_by_name($l, 'name');
+    @variants = node_by_name($l, '../variantList/variant/configItem');
+    for $v (@variants) {
+      ($name) = node_by_name($v, 'name');
+       @desc  = node_by_name($v, 'description');
+       $descr = with_attribute(\@desc, 'xml:lang='.$lang);
+       if (! defined $descr) {
+           $descr = with_attribute(\@desc, 'xml:lang=');
+       }
+       printf("  %-15s %s: %s\n",
+               text_child($name), text_child($lname), text_child($descr));
+    }
+}
+
+print "\n! options\n";
+for $g (@options) {
+   ($name) = node_by_name($g, 'name');
+    @desc =  node_by_name($g, 'description');
+    $descr = with_attribute(\@desc, 'xml:lang='.$lang);
+    if (! defined $descr) {
+        $descr = with_attribute(\@desc, 'xml:lang=');
+    }
+    printf("  %-20s %s\n", text_child($name), text_child($descr));
+
+    @opts = node_by_name($g, '../option/configItem');
+    for $o (@opts) {
+      ($name) = node_by_name($o, 'name');
+       @desc  = node_by_name($o, 'description');
+       $descr = with_attribute(\@desc, 'xml:lang='.$lang);
+       if (! defined $descr) {
+           $descr = with_attribute(\@desc, 'xml:lang=');
+       }
+       printf("  %-20s %s\n",
+               text_child($name), text_child($descr));
+    }
+}
+
+sub with_attribute {
+    local ($nodelist, $attrexpr) = @_;
+    local ($attr, $value) = split (/=/, $attrexpr);
+    local ($node, $attrvalue);
+    if (defined $value && $value ne '') {
+        $value =~ s/"//g;
+        foreach $node (@{$nodelist}) {
+           $attrvalue = node_attribute($node, $attr); 
+           if (defined $attrvalue && $attrvalue eq $value) {
+               return $node;
+           }
+        }
+    } else {
+        foreach $node (@{$nodelist}) {
+           if (! defined node_attribute($node, $attr)) {
+               return $node;
+           }
+        }
+    }
+    undef;
+}
+
+# Subroutines
+
+sub parse {
+   local $intag = 0;
+   my (@node_stack, $parent);
+   $parent = @_[1];
+   local ($tag, $text);
+
+   while (<>) {
+      chomp;
+      @str = split /([<>])/;
+      shift @str if ($str[0] eq '' || $str[0] =~ /^[ \t]*$/);
+
+      while (scalar @str) {
+         $token = shift @str;
+         if ($token eq '<') {
+            $intag = 1;
+            if (defined $text) {
+               add_text_node($parent, $text);
+               undef $text;
+            }
+         } elsif ($token eq '>') {
+            $intag = 0;
+            if ($tag =~ /^\/(.*)/) { # close tag
+               $parent = pop @node_stack;
+            } elsif ($tag =~ /^([^\/]*)\/$/) {
+               empty_tag($parent, $1);
+            } else {
+               if (defined ($node = open_tag($parent, $tag))) {
+                  push @node_stack, $parent;
+                  $parent = $node;
+               }
+            }
+            undef $tag;
+         } else {
+            if ($intag == 1) {
+               if (defined $tag) {
+                  $tag .= ' '. $token;
+               } else {
+                  $tag = $token;
+               }
+            } else {
+               if (defined $text) {
+                  $text .= "\n" . $token;
+               } else {
+                  $text = $token;
+               }
+            }
+         }
+      }
+   }
+}
+
+sub new_document {
+   $doc = new_node( 0, '', 'DOCUMENT');
+   $doc->{CHILDREN} = [];
+   return $doc;
+}
+
+sub new_node {
+  local ($parent_node, $tag, $type) = @_;
+
+  my %node;
+  $node{PARENT} = $parent_node;
+  $node{TYPE} = $type;
+
+  if ($type eq 'COMMENT' || $type eq 'TEXT') {
+     $node{TEXT} = $tag;
+     $node{NAME} = $type;
+     return \%node;
+  }
+
+  local ($tname, $attr) = split(' ', $tag, 2);
+  $node{NAME} = $tname;
+
+  if (defined $attr && $attr ne '') {
+     my %attr_table;
+     local @attr_list = split ( /"/, $attr);
+     local ($name, $value);
+     while (scalar @attr_list) {
+        $name = shift @attr_list;
+        $name =~ s/[ =]//g;
+        next if ($name eq '');
+        $value =  shift @attr_list;
+        $attr_table{$name} =$value;
+     }
+     $node{ATTRIBUTES} = \%attr_table;
+  }
+  return \%node;
+}
+
+sub add_node {
+  local ($parent_node, $node) = @_;
+  push @{$parent_node->{CHILDREN}}, $node;
+
+  local $tname = $node->{NAME};
+  if (defined $parent_node->{$tname}) {
+      push @{$parent_node->{$tname}}, $node
+  } else {
+      $parent_node->{$tname} = [ $node ];
+  }
+}
+
+sub empty_tag {
+   local ($parent_node, $tag) = @_;
+   local $node = new_node($parent_node, $tag, 'EMPTY');
+   add_node($parent_node, $node);
+}
+
+sub open_tag {
+   local ($parent_node, $tag) = @_;
+   local $node;
+
+   if ($tag =~ /^\?.*/ || $tag =~ /^\!.*/) {
+      $node = new_node($parent_node, $tag, 'COMMENT');
+      add_node($parent_node, $node);
+      undef; return;
+   } else {
+      $node = new_node($parent_node, $tag, 'NODE');
+      $node->{CHILDREN} = [];
+      add_node($parent_node, $node);
+      return $node;
+   }
+}
+
+sub add_text_node {
+   local ($parent_node, $text) = @_;
+   local $node = new_node($parent_node, $text, 'TEXT');
+   add_node($parent_node, $node);
+}
+
+sub node_by_name {
+   local ($node, $name) = @_;
+   local ($tagname, $path) = split(/\//, $name, 2);
+
+   my @nodelist;
+
+   if ($tagname eq '') {
+      while ($node->{PARENT} != 0) {
+         $node = $node->{PARENT};
+      }
+      sublist_by_name($node, $path, \@nodelist);
+   } else {
+      sublist_by_name($node, $name, \@nodelist);
+   }
+   return @nodelist;
+}
+
+sub sublist_by_name {
+   local ($node, $name, $res) = @_;
+   local ($tagname, $path) = split(/\//, $name, 2);
+
+   if (! defined $path) {
+       push @{$res}, (@{$node->{$tagname}});
+       return;
+   }
+
+   if ($tagname eq '..' && $node->{PARENT} != 0) {
+      $node = $node->{PARENT};
+      sublist_by_name($node, $path, $res);
+   } else {
+      local $n;
+      for $n (@{$node->{$tagname}}) {
+         sublist_by_name($n, $path, $res);
+      }
+   }
+}
+
+sub node_attribute {
+    local $node = @_[0];
+    if (defined $node->{ATTRIBUTES}) {
+       return $node->{ATTRIBUTES}{@_[1]};
+    }
+    undef;
+}
+
+sub text_child {
+    local ($node) = @_;
+    local ($child) = node_by_name($node, 'TEXT');
+    return $child->{TEXT};
+}
diff --git a/semantics/basic b/semantics/basic
new file mode 100644
index 00000000..014e9ca6
--- /dev/null
+++ b/semantics/basic
@@ -0,0 +1,7 @@
+// $Xorg: basic,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+default xkb_semantics "basic" {
+
+xkb_types		{ include "basic" 	};
+xkb_compatibility	{ include "basic"	};
+
+};
diff --git a/semantics/complete b/semantics/complete
new file mode 100644
index 00000000..df1632e2
--- /dev/null
+++ b/semantics/complete
@@ -0,0 +1,7 @@
+// $Xorg: complete,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+default xkb_semantics "complete" {
+
+xkb_types		{ include "complete" 	};
+xkb_compatibility	{ include "complete"	};
+
+};
diff --git a/semantics/default b/semantics/default
new file mode 100644
index 00000000..42e755e3
--- /dev/null
+++ b/semantics/default
@@ -0,0 +1,7 @@
+// $Xorg: default,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+default xkb_semantics "default" {
+
+xkb_types		{ include "default" 	};
+xkb_compatibility	{ include "default"	};
+
+};
diff --git a/semantics/xtest b/semantics/xtest
new file mode 100644
index 00000000..d221fe5b
--- /dev/null
+++ b/semantics/xtest
@@ -0,0 +1,7 @@
+// $Xorg: xtest,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+default xkb_semantics "xtest" {
+
+xkb_types		{ include "basic" 	};
+xkb_compatibility	{ include "xtest"	};
+
+};
diff --git a/symbols/al b/symbols/al
new file mode 100644
index 00000000..4e025c98
--- /dev/null
+++ b/symbols/al
@@ -0,0 +1,43 @@
+
+// based on
+// albanian keyboard layout
+// done by Pablo Saratxaga <pablo@mandrakesoft.com>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/al,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin(type3)"
+
+    name[Group1]="Albanian";
+
+    key <AE01>	{ [         1,     exclam,   asciitilde,   dead_tilde ]	};
+    key <AE02>	{ [         2,   quotedbl,   dead_caron,    oneeighth ]	};
+    key <AE03>	{ [         3, numbersign, dead_circumflex,  sterling ]	};
+    key <AE04>	{ [         4,     dollar,   dead_breve,       dollar ]	};
+    key <AE05>	{ [         5,    percent, dead_abovering, threeeighths] };
+    key <AE06>	{ [         6, asciicircum,  dead_ogonek, fiveeighths ]	};
+    key <AE07>	{ [         7,  ampersand,        grave,   dead_grave ]	};
+    key <AE08>	{ [         8,   asterisk, dead_abovedot,   trademark ]	};
+    key <AE09>	{ [         9,  parenleft,   dead_acute,    plusminus ]	};
+    key <AE10>	{ [         0, parenright, dead_doubleacute,   degree ]	};
+    key <AE11>	{ [     minus, underscore, dead_diaeresis, questiondown] };
+
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD11>	{ [  ccedilla,   Ccedilla,     division, dead_abovering ] };
+    key <AD12>	{ [        at, apostrophe,     multiply,  dead_macron ]	};
+
+    key <AC02>	{ [         s,          S,      dstroke,      section ]	};
+    key <AC03>	{ [         d,          D,      Dstroke,          ETH ]	};
+    key <AC10>	{ [ediaeresis, Ediaeresis,   dollar, dead_doubleacute ]	};
+    key <AC11>	{ [bracketleft,  braceleft,      ssharp,   dead_caron ]	};
+    key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [bracketright, braceright,   currency,   dead_breve ]	};
+    key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};
+    key <AB09>	{ [    period,      colon,      greater,     division ]	};
+    key <AB10>	{ [     slash,   question, dead_belowdot, dead_abovedot ] };
+
+    include "level3(ralt_switch_multikey)"
+};
diff --git a/symbols/am b/symbols/am
new file mode 100644
index 00000000..f7ea4e92
--- /dev/null
+++ b/symbols/am
@@ -0,0 +1,174 @@
+
+// based on a keyboard map from an 'xkb/symbols/am' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/am,v 1.4 2003/05/29 12:41:58 pascal Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Armenian";
+
+    // Alphanumeric section
+    key <TLDE> {	[ 0x100055d, 0x100055c	]	};
+    key	<LSGT> {	[  question,  0x100058a	]	};
+    key <BKSL> {        [ guillemotright, guillemotleft ] };
+
+    key <AE01> {	[ 0x1000586,  0x1000556	]	};
+    key <AE02> {	[ 0x1000571,  0x1000541	]	};
+    key <AE03> {	[ 0x1002013,  0x1002014 ]	};
+    key <AE04> {	[     comma,  dollar	]	};
+    key <AE05> {	[ 0x1000589,  0x1002026	] 	};
+    key <AE06> {	[ 0x100055e,  percent	]	};
+    key <AE07> {	[    period,  0x1000587	] 	};
+    key <AE08> {	[ 0x100055b,  0x10002bc	] 	};
+    key <AE09> {	[ parenright, parenleft ] 	};
+    key <AE10> {	[ 0x1000585,  0x1000555	]	};
+    key <AE11> {	[ 0x1000567,  0x1000537	]	};
+    key <AE12> {	[ 0x1000572,  0x1000542	]	};
+
+
+    key <AD01> {	[ 0x1000573, 0x1000543	]       };
+    key <AD02> {	[ 0x1000583, 0x1000553	]	};
+    key <AD03> {	[ 0x1000562, 0x1000532	]       };
+    key <AD04> {	[ 0x100057d, 0x100054d	]	};
+    key <AD05> {	[ 0x1000574, 0x1000544	]       };
+    key <AD06> {	[ 0x1000578, 0x1000548	]       };
+    key <AD07> {	[ 0x1000582, 0x1000552	]       };
+    key <AD08> {	[ 0x100056f, 0x100053f	]       };
+    key <AD09> {	[ 0x1000568, 0x1000538	]       };
+    key <AD10> {	[ 0x1000569, 0x1000539	]       };
+    key <AD11> {	[ 0x100056e, 0x100053e	]       };
+    key <AD12> {	[ 0x1000581, 0x1000551	]       };
+
+    key <AC01> {	[ 0x100057b, 0x100054b	]       };
+    key <AC02> {	[ 0x100057e, 0x100054e	]	};
+    key <AC03> {	[ 0x1000563, 0x1000533	]       };
+    key <AC04> {	[ 0x1000565, 0x1000535	]       };
+    key <AC05> {	[ 0x1000561, 0x1000531	]       };
+    key <AC06> {	[ 0x1000576, 0x1000546	]	};
+    key <AC07> {	[ 0x100056b, 0x100053b	]       };
+    key <AC08> {	[ 0x100057f, 0x100054f	]       };
+    key <AC09> {	[ 0x1000570, 0x1000540	]       };
+    key <AC10> {	[ 0x100057a, 0x100054a	]       };
+    key <AC11> {	[ 0x1000580, 0x1000550	]       };
+
+    key <AB01> {	[ 0x100056a, 0x100053a	]       };
+    key <AB02> {	[ 0x1000564, 0x1000534	]       };
+    key <AB03> {	[ 0x1000579, 0x1000549	]       };
+    key <AB04> {	[ 0x1000575, 0x1000545	]       };
+    key <AB05> {	[ 0x1000566, 0x1000536	]       };
+    key <AB06> {	[ 0x100056c, 0x100053c	]       };
+    key <AB07> {	[ 0x1000584, 0x1000554	]       };
+    key <AB08> {	[ 0x100056d, 0x100053d	]       };
+    key <AB09> {	[ 0x1000577, 0x1000547	]       };
+    key <AB10> {	[ 0x100057c, 0x100054c	]       };
+
+};
+
+xkb_symbols "old" {
+    include "pc/am(basic)"
+	
+    key <BKSL> {	[ 0x1002026,  0x1000587 ]	};
+
+    key <AE01> {	[ 0x1000573,  0x1000543 ]	};
+    key <AE02> {	[ 0x100057b,  0x100054b ]	};
+    key <AE03> {	[ 0x100056a,  0x100053a ]	};
+    key <AE04> {	[ 0x1000571,  0x1000541 ]	};
+    key <AE05> {	[ 0x1000575,  0x1000545 ]	};
+    key <AE06> {	[ 0x100057c,  0x100054c ]	};
+    key <AE07> {	[ 0x1000580,  0x1000550 ]	};
+    key <AE08> {	[ 0x1000581,  0x1000551 ]	};
+    key <AE09> {	[ 0x1000567,  0x1000537 ]	};
+    key <AE10> {	[ 0x1000572,  0x1000542 ]	};
+    key <AE11> {	[ 0x1002013,  0x1002014 ]	};
+    key <AE12> {	[ parenleft,  parenright]	};
+	
+    key <AD01> {	[ 0x1000583,  0x1000553 ]	};
+    key <AD02> {	[ 0x1000562,  0x1000532 ]	};
+    key <AD03> {	[ 0x100057d,  0x100054d ]	};
+    key <AD04> {	[ 0x1000574,  0x1000544 ]	};
+    key <AD05> {	[ 0x1000578,  0x1000548 ]	};
+    key <AD06> {	[ 0x1000582,  0x1000552 ]	};
+    key <AD07> {	[ 0x100056f,  0x100053f ]	};
+    key <AD08> {	[ 0x1000568,  0x1000538 ]	};
+    key <AD09> {	[ 0x1000569,  0x1000539 ]	};
+    key <AD10> {	[ 0x100056e,  0x100053e ]	};
+    key <AD11> {	[ 0x1000585,  0x1000555 ]	};
+    key <AD12> {	[ 0x1000586,  0x1000556 ]	};
+
+    key <AC01> {	[ 0x100057e,  0x100054e ]	};
+    key <AC02> {	[ 0x1000563,  0x1000533 ]	};
+    key <AC03> {	[ 0x1000565,  0x1000535 ]	};
+    key <AC04> {	[ 0x1000561,  0x1000531 ]	};
+    key <AC05> {	[ 0x1000576,  0x1000546 ]	};
+    key <AC06> {	[ 0x100056b,  0x100053b ]	};
+    key <AC07> {	[ 0x100057f,  0x100054f ]	};
+    key <AC08> {	[ 0x1000570,  0x1000540 ]	};
+    key <AC09> {	[ 0x100057a,  0x100054a ]	};
+    key <AC10> {	[ 0x1000589,  0x100058a ]	};
+    key <AC11> {	[ 0x100055b,  0x10002bc ]	};
+
+    key <AB01> {	[ 0x1000564,  0x1000534 ]	};
+    key <AB02> {	[ 0x1000579,  0x1000549 ]	};
+    key <AB03> {	[ 0x1000566,  0x1000536 ]	};
+    key <AB04> {	[ 0x100056c,  0x100053c ]	};
+    key <AB05> {	[ 0x1000584,  0x1000554 ]	};
+    key <AB06> {	[ 0x100056d,  0x100053d ]	};
+    key <AB07> {	[ 0x1000577,  0x1000547 ]	};
+    key <AB08> {	[ comma,      guillemotleft ]	};
+    key <AB09> {	[ period,     guillemotright ]	};
+    key <AB10> {	[ 0x100055e,  0x100055e ]	};
+
+};
+
+xkb_symbols "phonetic" {
+    include "pc/am(old)"
+	
+    key <BKSL> {	[ 0x1000577,  0x1000547 ]	};
+	
+    key <AE01> {	[ 0x1000567,  0x1000537 ]	};
+    key <AE02> {	[ 0x1000569,  0x1000539 ]	};
+    key <AE03> {	[ 0x1000583,  0x1000553 ]	};
+    key <AE05> {	[ 0x100057b,  0x100054b ]	};
+    key <AE06> {	[ 0x1000582,  0x1000552 ]	};
+    key <AE07> {	[ 0x1000587,  0x1000587 ]	};
+    key <AE08> {	[ 0x1000580,  0x1000550 ]	};
+    key <AE09> {	[ 0x1000579,  0x1000549 ]	};
+    key <AE10> {	[ 0x1000573,  0x1000543 ]	};
+    key <AE12> {	[ 0x100056a,  0x100053a ]	};
+
+    key <LatQ> {	[ 0x1000584,  0x1000554 ]	};
+    key <LatW> {	[ 0x1000578,  0x1000548 ]	};
+    key <LatE> {	[ 0x1000565,  0x1000535 ]	};
+    key <LatR> {	[ 0x100057c,  0x100054c ]	};
+    key <LatT> {	[ 0x100057f,  0x100054f ]	};
+    key <LatY> {	[ 0x1000568,  0x1000538 ]	};
+    key <LatU> {	[ 0x1000582,  0x1000552 ]	};
+    key <LatI> {	[ 0x100056b,  0x100053b ]	};
+    key <LatO> {	[ 0x1000585,  0x1000555 ]	};
+    key <LatP> {	[ 0x100057a,  0x100054a ]	};
+    key <AD11> {	[ 0x100056d,  0x100053d ]	};
+    key <AD12> {	[ 0x100056e,  0x100053e ]	};
+
+    key <LatA> {	[ 0x1000561,  0x1000531 ]	};
+    key <LatS> {	[ 0x100057d,  0x100054d ]	};
+    key <LatD> {	[ 0x1000564,  0x1000534 ]	};
+    key <LatF> {	[ 0x1000586,  0x1000556 ]	};
+    key <LatG> {	[ 0x1000563,  0x1000533 ]	};
+    key <LatH> {	[ 0x1000570,  0x1000540 ]	};
+    key <LatJ> {	[ 0x1000575,  0x1000545 ]	};
+    key <LatK> {	[ 0x100056f,  0x100053f ]	};
+    key <LatL> {	[ 0x100056c,  0x100053c ]	};
+    key <AC10> {	[ semicolon,  0x1000589 ]	};
+    key <AC11> {	[ 0x100055b,  0x1000022 ]	};
+
+    key <LatZ> {	[ 0x1000566,  0x1000536 ]	};
+    key <LatX> {	[ 0x1000572,  0x1000542 ]	};
+    key <LatC> {	[ 0x1000581,  0x1000551 ]	};
+    key <LatV> {	[ 0x100057e,  0x100054e ]	};
+    key <LatB> {	[ 0x1000562,  0x1000532 ]	};
+    key <LatN> {	[ 0x1000576,  0x1000546 ]	};
+    key <LatM> {	[ 0x1000574,  0x1000544 ]	};
+    key <AB10> {	[ 0x1002026,  0x100055e ]	};
+
+};
diff --git a/symbols/ar b/symbols/ar
new file mode 100644
index 00000000..373fb6b4
--- /dev/null
+++ b/symbols/ar
@@ -0,0 +1,142 @@
+
+// based on a keyboard map from an 'xkb/symbols/ar' file
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    name[Group1]= "Arabic";
+
+// NOTES:
+//
+// there is also combined shadda diacritis in AltGr position of simple
+// diacritics fatha, fathatan, damma, dammatan, kasra and kasratan
+// should a third state be added to Group2 ?
+//
+
+    key <TLDE> {  [     Arabic_thal,      Arabic_shadda   ]	};
+    key <AE01> {  [               1,          exclam      ]     };
+    key <AE02> {  [               2,              at      ]     };
+    key <AE03> {  [               3,      numbersign      ]     };
+    key <AE04> {  [               4,          dollar      ]     };
+    key <AE05> {  [               5,         percent      ]     };
+    key <AE06> {  [               6,     asciicircum      ]     };
+    key <AE07> {  [               7,       ampersand      ]     };
+    key <AE08> {  [               8,        asterisk      ]     };
+    key <AE09> {  [               9,       parenleft      ]     };
+    key <AE10> {  [               0,      parenright      ]     };
+    key <AE11> {  [           minus,      underscore      ]     };
+    key <AE12> {  [           equal,            plus      ]     };
+						
+    key <AD01> {  [      Arabic_dad,     Arabic_fatha     ]     };
+    key <AD02> {  [      Arabic_sad,     Arabic_fathatan  ]     };
+    key <AD03> {  [     Arabic_theh,     Arabic_damma     ]     };
+    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan  ]     };
+    key <AD05> {  [      Arabic_feh,       0x100fef9      ]     };
+    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef ]     };
+    key <AD07> {  [      Arabic_ain,         grave        ]     };
+    key <AD08> {  [       Arabic_ha,        division      ]     };
+    key <AD09> {  [     Arabic_khah,       multiply       ]     };
+    key <AD10> {  [      Arabic_hah,    Arabic_semicolon  ]     };
+    key <AD11> {  [     Arabic_jeem,       braceleft      ]     };
+    key <AD12> {  [      Arabic_dal,       braceright     ]     };
+
+    key <AC01> {  [    Arabic_sheen,       backslash      ]     };
+    key <AC02> {  [     Arabic_seen,               S      ]     };
+    key <AC03> {  [      Arabic_yeh,       bracketleft    ]     };
+    key <AC04> {  [      Arabic_beh,       bracketright   ]     };
+    key <AC05> {  [      Arabic_lam,       0x100fef7      ]     };
+    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef ]     };
+    key <AC07> {  [      Arabic_teh,      Arabic_tatweel  ]     };
+    key <AC08> {  [     Arabic_noon,      Arabic_comma    ]     };
+    key <AC09> {  [     Arabic_meem,         slash        ]     };
+    key <AC10> {  [      Arabic_kaf,           colon      ]     };
+    key <AC11> {  [      Arabic_tah,        quotedbl      ]     };
+    key <BKSL> {  [            less,         greater      ]     };
+
+    key <LSGT> {  [             bar,      brokenbar	  ]     };
+    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde       ]     };
+    key <AB02> {  [    Arabic_hamza,      Arabic_sukun    ]     };
+    key <AB03> {  [Arabic_hamzaonwaw,     Arabic_kasra    ]     };
+    key <AB04> {  [       Arabic_ra,      Arabic_kasratan ]     };
+    key <AB05> {  [       0x100fefb,      0x100fef5       ]     };
+    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef ]     };
+    key <AB07> {  [Arabic_tehmarbuta,    apostrophe       ]     };
+    key <AB08> {  [      Arabic_waw,         comma        ]     };
+    key <AB09> {  [     Arabic_zain,         period       ]     };
+    key <AB10> {  [      Arabic_zah, Arabic_question_mark ]     };
+
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwerty" {
+    include "pc/ar(basic)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "azerty" {
+    include "pc/ar(basic)"
+
+	// the north african arabic keyboard differs from the middle east one
+	// by the numeric row; it follows French keyboard style
+	//
+	// PROBLEM: some chars are inaccessible: ! @ # $ % ^ *
+	// should they go elsewhere? replace " ' that are now in double ?
+	// also, dead_circumflex and dead_diaeresis from French keyboard
+	// as well as ugrave are missing, which questions the utility of the
+	// other accentuated latin letters. Maybe this is useful only with
+	// a French keyboard in Group1 ? Then, shouldn't Group1 be filled ?
+
+    key <AE01> {  [       ampersand,               1      ]       };
+    key <AE02> {  [          eacute,               2      ]       };
+    key <AE03> {  [        quotedbl,               3      ]       };
+    key <AE04> {  [      apostrophe,               4      ]       };
+    key <AE05> {  [       parenleft,               5      ]       };
+    key <AE06> {  [           minus,               6      ]       };
+    key <AE07> {  [          egrave,               7      ]       };
+    key <AE08> {  [      underscore,               8      ]       };
+    key <AE09> {  [        ccedilla,               9      ]       };
+    key <AE10> {  [          agrave,               0      ]       };
+    key <AE11> {  [      parenright,          degree      ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "digits" {
+    include "pc/ar(basic)"
+
+	// use arabic script digits
+
+    key <AE01> {  [       0x1000661,          exclam      ]       };
+    key <AE02> {  [       0x1000662,              at      ]       };
+    key <AE03> {  [       0x1000663,      numbersign      ]       };
+    key <AE04> {  [       0x1000664,          dollar      ]       };
+    key <AE05> {  [       0x1000665,         percent      ]       };
+    key <AE06> {  [       0x1000666,     asciicircum      ]       };
+    key <AE07> {  [       0x1000667,       ampersand      ]       };
+    key <AE08> {  [       0x1000668,        asterisk      ]       };
+    key <AE09> {  [       0x1000669,       parenleft      ]       };
+    key <AE10> {  [       0x1000660,      parenright      ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "qwerty_digits" {
+    include "pc/ar(digits)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "azerty_digits" {
+    include "pc/ar(azerty)"
+	
+    key <AE01> {  [       ampersand,       0x1000661      ]       };
+    key <AE02> {  [          eacute,       0x1000662      ]       };
+    key <AE03> {  [        quotedbl,       0x1000663      ]       };
+    key <AE04> {  [      apostrophe,       0x1000664      ]       };
+    key <AE05> {  [       parenleft,       0x1000665      ]       };
+    key <AE06> {  [           minus,       0x1000666      ]       };
+    key <AE07> {  [          egrave,       0x1000667      ]       };
+    key <AE08> {  [      underscore,       0x1000668      ]       };
+    key <AE09> {  [        ccedilla,       0x1000669      ]       };
+    key <AE10> {  [          agrave,       0x1000660      ]       };
+};
+
diff --git a/symbols/be b/symbols/be
new file mode 100644
index 00000000..323a0636
--- /dev/null
+++ b/symbols/be
@@ -0,0 +1,98 @@
+
+// based on a keyboard map from an 'xkb/symbols/be' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/be,v 1.3 2003/04/12 10:53:48 pascal Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin"
+
+    name[Group1]="Belgian";
+
+    key <AE01>	{ [ ampersand,          1,          bar,   exclamdown ]	};
+    key <AE02>	{ [    eacute,          2,           at,    oneeighth ]	};
+    key <AE03>	{ [  quotedbl,          3,   numbersign,     sterling ]	};
+    key <AE04>	{ [apostrophe,          4,   onequarter,       dollar ]	};
+    key <AE05>	{ [ parenleft,          5,      onehalf, threeeighths ]	};
+    key <AE06>	{ [   section,          6,  asciicircum,  fiveeighths ]	};
+    key <AE07>	{ [    egrave,          7,    braceleft, seveneighths ]	};
+    key <AE08>	{ [    exclam,          8,  bracketleft,    trademark ]	};
+    key <AE09>	{ [  ccedilla,          9,    braceleft,    plusminus ]	};
+    key <AE10>	{ [    agrave,          0,   braceright,       degree ]	};
+    key <AE11>	{ [parenright,     degree,    backslash, questiondown ]	};
+    key <AE12>	{ [     minus, underscore, dead_cedilla,  dead_ogonek ]	};
+
+    key <AD01>	{ [         a,          A,           at,  Greek_OMEGA ]	};
+    key <AD02>	{ [         z,          Z,      lstroke,      Lstroke ]	};
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD11>	{ [dead_circumflex, dead_diaeresis,  bracketleft, dead_abovering ] };
+    key <AD12>	{ [    dollar,   asterisk, bracketright,  dead_macron ]	};
+
+    key <AC01>	{ [         q,          Q,           ae,           AE ]	};
+    key <AC10>	{ [         m,          M,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [    ugrave,    percent,   dead_acute,   dead_caron ]	};
+    key <TLDE>	{ [twosuperior, threesuperior,  notsign,      notsign ]	};
+
+    key <BKSL>	{ [        mu,   sterling,   dead_grave,   dead_breve ]	};
+    key <AB01>	{ [         w,          W, guillemotleft,        less ]	};
+    key <AB07>	{ [     comma,   question, dead_cedilla,    masculine ]	};
+    key <AB08>	{ [ semicolon,     period, horizconnector,   multiply ]	};
+    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
+    key <AB10>	{ [     equal,       plus,   dead_tilde, dead_abovedot]	};
+    key <LSGT>  { [      less,    greater,    backslash,    backslash ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "iso-alternate" {
+    include "pc/be(basic)"
+
+    key <AD01>	{ [         a,          A,           ae,           AE ]	};
+    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
+    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
+    key <AC10>	{ [         m,          M,           mu,    masculine ]	};
+    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};
+    key <AB07>	{ [ comma,   question, dead_cedilla, dead_doubleacute ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // Use the Sun dead keys
+
+    include "pc/be(basic)"
+
+    key <AD11>	{ [SunFA_Circum, SunFA_Diaeresis, bracketleft, bracketleft] };
+    key <AC11>	{ [    ugrave,    percent,  SunFA_Acute,  SunFA_Acute ]	};
+    key <BKSL>	{ [        mu,   sterling,  SunFA_Grave,  SunFA_Grave ]	};
+    key <AB07>	{ [     comma,  question, SunFA_Cedilla, SunFA_Cedilla]	};
+    key <AB10>	{ [     equal,       plus,  SunFA_Tilde,  SunFA_Tilde ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    // Use the Sun dead keys
+
+    include "pc/be(Sundeadkeys)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Eliminates dead keys from the basic Belgian layout
+
+    include "pc/be(basic)"
+
+    key <AE12>	{ [     minus, underscore,      cedilla,       ogonek ]	};
+    key <AD11>	{ [asciicircum,  diaeresis,  bracketleft,  bracketleft]	};
+    key <AD12>	{ [    dollar,   asterisk, bracketright,       macron ]	};
+    key <AC10>	{ [         m,          M,        acute,  doubleacute ]	};
+    key <AC11>	{ [    ugrave,    percent,   quoteright,   quoteright ]	};
+    key <BKSL>	{ [        mu,   sterling,    quoteleft,    quoteleft ]	};
+    key <AB07>	{ [     comma,   question,      cedilla,    masculine ]	};
+    key <AB10>	{ [     equal,       plus,   asciitilde,   asciitilde ]	};
+};
diff --git a/symbols/ben b/symbols/ben
new file mode 100644
index 00000000..9dd48e50
--- /dev/null
+++ b/symbols/ben
@@ -0,0 +1,143 @@
+
+// based on a keyboard map from an 'xkb/symbols/ben' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/ben,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    name[Group1]= "Bengali";
+
+      // Mainly numbers.
+      key <AE01> { [      0x10009E7 		]	};
+      key <AE02> { [      0x10009E8 		]	};
+      key <AE03> { [      0x10009E9 		]	};
+      key <AE04> { [      0x10009EA 		]	};
+      key <AE05> { [      0x10009EB		]	};
+      key <AE06> { [      0x10009EC 		]	};
+      key <AE07> { [      0x10009ED	        ]	};
+      key <AE08> { [      0x10009EE 		]	};
+      key <AE09> { [      0x10009EF, parenleft	]	};
+      key <AE10> { [      0x10009E6, parenright	]	};
+      key <AE11> { [      minus, 0x1000983 	]	};
+      key <AE12> { [      0x100098B, 0x10009C3	]	};
+
+// Mainly long vowels
+
+      key <AD01> { [      0x10009CC,  0x1000994	]	};
+      key <AD02> { [      0x10009C8,  0x1000990	]	};
+      key <AD03> { [      0x10009BE,  0x1000986	]	};
+      key <AD04> { [      0x10009C0,  0x1000988	]	};
+      key <AD05> { [      0x10009C2,  0x100098A	]	};
+
+// Mainly voiced consonants
+
+      key <AD06> { [      0x10009AC,  0x10009AD	]	};
+      key <AD07> { [      0x10009B9,  0x1000999 ]	};
+      key <AD08> { [      0x1000997,  0x1000998 ]	};
+      key <AD09> { [      0x10009A6,  0x10009A7 ]	};
+      key <AD10> { [      0x100099C,  0x100099D ]	};
+      key <AD11> { [      0x10009A1, 0x10009A2 	]	};
+      key <AD12> { [      0x10009BC, 0x100099E 	]	};
+
+// Mainly short vowels
+      key <AC01> { [      0x10009CB,  0x1000993 ]	};
+      key <AC02> { [      0x10009C7,  0x100098F ]	};
+      key <AC03> { [      0x10009CD,  0x1000985 ]	};
+      key <AC04> { [      0x10009BF,  0x1000987 ]	};
+      key <AC05> { [      0x10009C1,  0x1000989 ]	};
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      0x10009AA,  0x10009AB ]	};
+      key <AC07> { [      0x10009B0,  0x10009DD ]	};
+      key <AC08> { [      0x1000995,  0x1000996 ]	};
+      key <AC09> { [      0x10009A4,  0x10009A5 ]	};
+      key <AC10> { [      0x100099A,  0x100099B ]	};
+      key <AC11> { [      0x100099F, 0x10009A0 	]	};
+      key <BKSL> { [      backslash, bar 	]	};
+
+      key <AB01> { [      z, Z  		]       };
+      key <AB02> { [      0x1000982,  0x1000981 ]       };
+      key <AB03> { [      0x10009AE,  0x10009A3 ]       };
+      key <AB04> { [      0x10009A8,  0x10009A8 ]       };
+      key <AB05> { [      0x10009AC,  0x10009AC ]       };
+      key <AB06> { [      0x10009B2,  0x10009B2 ]       };
+      key <AB07> { [      0x10009B8,  0x10009B6 ]       };
+      key <AB08> { [      comma,      0x10009B7 ]       };
+      key <AB09> { [      period,     0x1000964 ]       };
+      key <AB10> { [      0x10009DF,  0x10009AF	]       };
+};
+
+xkb_symbols "probhat" {
+ name[Group1]= "Bengali";
+   key <ESC>  { [ Escape ] };
+
+// numbers
+   key <TLDE> { [ quoteleft, asciitilde   ] };
+   key <AE01> { [ 0x10009E7, exclam       ] };
+   key <AE02> { [ 0x10009E8, at           ] };
+   key <AE03> { [ 0x10009E9, numbersign   ] };
+   key <AE04> { [ 0x10009EA, 0x10009F3    ] };
+   key <AE05> { [ 0x10009EB, percent      ] };
+   key <AE06> { [ 0x10009EC, asciicircum  ] };
+   key <AE07> { [ 0x10009ED, 0x100099E    ] };
+   key <AE08> { [ 0x10009EE, asterisk     ] };
+   key <AE09> { [ 0x10009EF, parenleft    ] };
+   key <AE10> { [ 0x10009E6, parenright   ] };
+   key <AE11> { [ minus,     0x1000983    ] };
+   key <AE12> { [ 0x100098B, 0x10009C3    ] };
+   key <BKSP> { [ BackSpace               ] };
+
+// tab, q to ] 
+   key <TAB>  { [   Tab,  ISO_Left_Tab     ] };
+   key <AD01> { [   0x10009A6,  0x10009A7  ] };
+   key <AD02> { [   0x10009C2,  0x100098A  ] };
+   key <AD03> { [   0x10009C0,  0x1000988  ] };
+   key <AD04> { [   0x10009B0,  0x10009DC  ] };
+   key <AD05> { [   0x100099F,  0x10009A0  ] };
+   key <AD06> { [   0x100098F,  0x1000990  ] };
+   key <AD07> { [   0x10009C1,  0x1000989  ] };
+   key <AD08> { [   0x10009BF,  0x1000987  ] };
+   key <AD09> { [   0x1000993,  0x1000994  ] };
+   key <AD10> { [   0x10009AA,  0x10009AB  ] };
+   key <AD11> { [   0x10009C7,  0x10009C8  ] };
+   key <AD12> { [   0x10009CB,  0x10009CC  ] };
+   key <RTRN> { [   Return                 ] };
+
+// caps, a to ' 
+//   key <CAPS> { [   Caps_Lock              ] };
+   key <AC01> { [   0x10009BE,  0x1000985  ] };
+   key <AC02> { [   0x10009B8,  0x10009B7  ] };
+   key <AC03> { [   0x10009A1,  0x10009A2  ] };
+   key <AC04> { [   0x10009A4,  0x10009A5  ] };
+   key <AC05> { [   0x1000997,  0x1000998  ] };
+   key <AC06> { [   0x10009B9,  0x1000983  ] };
+   key <AC07> { [   0x100099C,  0x100099D  ] };
+   key <AC08> { [   0x1000995,  0x1000996  ] };
+   key <AC09> { [   0x10009B2,  0x1000982  ] };
+   key <AC10> { [   semicolon,  colon      ] };
+   key <AC11> { [   quoteright, quotedbl   ] };
+
+// shift, z to /
+//   key <LFSH> { [   Shift_L                ] };
+   key <AB01> { [   0x10009DF,  0x10009AF  ] };
+   key <AB02> { [   0x10009B6,  0x10009DD  ] };
+   key <AB03> { [   0x100099A,  0x100099B  ] };
+   key <AB04> { [   0x1000986,  0x100098B  ] };
+   key <AB05> { [   0x10009AC,  0x10009AD  ] };
+   key <AB06> { [   0x10009A8,  0x10009A3  ] };
+   key <AB07> { [   0x10009AE,  0x1000999  ] };
+   key <AB08> { [   comma,      0x10009C3  ] };
+   key <AB09> { [   period,     0x1000981  ] };
+   key <AB10> { [   0x10009CD,  question   ] };
+   key <BKSL> { [   backslash,  bar        ] };
+
+//   key <LCTL> { [   Control_L              ] };
+//   key <SPCE> { [   space                  ] };
+
+//   modifier_map Shift  { Shift_L };
+//   modifier_map Lock   { Caps_Lock };
+//   modifier_map Control{ Control_L };
+
+};
+
diff --git a/symbols/bg b/symbols/bg
new file mode 100644
index 00000000..9dbf1a1a
--- /dev/null
+++ b/symbols/bg
@@ -0,0 +1,141 @@
+
+// based on a keyboard map:
+//
+//////////////////////////////////////////////////////////////////////////
+// Copyright (C) 1999, 2000 by Anton Zinoviev <anton@lml.bas.bg>
+//
+// This software may be used, modified, copied, distributed, and sold,
+// in both source and binary form provided that the above copyright
+// and these terms are retained. Under no circumstances is the author
+// responsible for the proper functioning of this software, nor does
+// the author assume any responsibility for damages incurred with its
+// use.
+//
+////////////////////////////////////////////////////////////////////////// 
+// Version 1.6r1
+//
+// $XFree86$
+
+partial default alphanumeric_keys
+xkb_symbols "bds" {
+
+  name[Group1]= "Cyrillic";
+  
+  key <TLDE> {   [ parenleft,         parenright          ]    };
+  key <AE01> {   [ 1,                 exclam              ]    };
+  key <AE02> {   [ 2,                 question            ]    };
+  key <AE03> {   [ 3,                 plus                ]    };
+  key <AE04> {   [ 4,                 quotedbl            ]    };
+  key <AE05> {   [ 5,                 percent             ]    };
+  key <AE06> {   [ 6,                 equal               ]    };
+  key <AE07> {   [ 7,                 colon               ]    };
+  key <AE08> {   [ 8,                 slash               ]    };
+  key <AE09> {   [ 9,                 emdash              ]    };
+  key <AE10> {   [ 0,                 numerosign          ]    };
+  key <AE11> {   [ minus,             I                   ]    };
+  key <AE12> {   [ period,            V                   ]    };
+
+  key <AD01> {   [ comma,             Cyrillic_yeru       ]    };
+  key <AD02> {   [ Cyrillic_u,        Cyrillic_U          ]    };
+  key <AD03> {   [ Cyrillic_ie,       Cyrillic_IE         ]    };
+  key <AD04> {   [ Cyrillic_i,        Cyrillic_I          ]    };
+  key <AD05> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  key <AD06> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
+  key <AD07> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
+  key <AD08> {   [ Cyrillic_es,       Cyrillic_ES         ]    };
+  key <AD09> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
+  key <AD10> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
+  key <AD11> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
+  key <AD12> {   [ semicolon,         section             ]    };
+
+  key <AC01> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
+  key <AC02> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
+  key <AC03> {   [ Cyrillic_a,        Cyrillic_A          ]    };
+  key <AC04> {   [ Cyrillic_o,        Cyrillic_O          ]    };
+  key <AC05> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <AC06> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
+  key <AC07> {   [ Cyrillic_te,       Cyrillic_TE         ]    };
+  key <AC08> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
+  key <AC09> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+  key <AC10> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
+  key <AC11> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <BKSL> {   [ apostrophe,        Cyrillic_YERU       ]    };
+
+  key <AB01> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
+  key <AB02> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
+  key <AB03> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN   ]    };
+  key <AB04> {   [ Cyrillic_e,        Cyrillic_E          ]    };
+  key <AB05> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
+  key <AB06> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
+  key <AB07> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
+  key <AB08> {   [ Cyrillic_er,       Cyrillic_ER         ]    };
+  key <AB09> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
+  key <AB10> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
+    
+  // End alphanumeric section
+  
+  key <RALT> {   [ Alt_R,             Meta_R              ]    };
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "phonetic" {
+  
+  name[Group1]= "Cyrillic";
+  
+  key <TLDE> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <AE01> {   [ 1,                 exclam              ]    };
+  key <AE02> {   [ 2,                 at                  ]    };
+  key <AE03> {   [ 3,                 numbersign          ]    };
+  key <AE04> {   [ 4,                 dollar              ]    };
+  key <AE05> {   [ 5,                 percent             ]    };
+  key <AE06> {   [ 6,                 asciicircum         ]    };
+  key <AE07> {   [ 7,                 ampersand           ]    };
+  key <AE08> {   [ 8,                 asterisk            ]    };
+  key <AE09> {   [ 9,                 parenleft           ]    };
+  key <AE10> {   [ 0,                 parenright          ]    };
+  key <AE11> {   [ minus,             underscore          ]    };
+  key <AE12> {   [ equal,             plus                ]    };
+
+  key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
+  key <LatW> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+  key <LatE> {   [ Cyrillic_ie,       Cyrillic_IE         ]    };
+  key <LatR> {   [ Cyrillic_er,       Cyrillic_ER         ]    };
+  key <LatT> {   [ Cyrillic_te,       Cyrillic_TE         ]    };
+  key <LatY> {   [ Cyrillic_hardsign, Cyrillic_HARDSIGN   ]    };
+  key <LatU> {   [ Cyrillic_u,        Cyrillic_U          ]    };
+  key <LatI> {   [ Cyrillic_i,        Cyrillic_I          ]    };
+  key <LatO> {   [ Cyrillic_o,        Cyrillic_O          ]    };
+  key <LatP> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
+  key <AD11> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  key <AD12> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
+
+  key <LatA> {   [ Cyrillic_a,        Cyrillic_A          ]    };
+  key <LatS> {   [ Cyrillic_es,       Cyrillic_ES         ]    };
+  key <LatD> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
+  key <LatF> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
+  key <LatG> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
+  key <LatH> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
+  key <LatJ> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
+  key <LatK> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
+  key <LatL> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
+  key <AC10> {   [ semicolon,         colon               ]    };
+  key <AC11> {   [ quoteright,        quotedbl            ]    };
+  key <BKSL> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
+
+  key <LatZ> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
+  key <LatX> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
+  key <LatC> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
+  key <LatV> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <LatB> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
+  key <LatN> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
+  key <LatM> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
+  key <AB08> {   [ comma,             less                ]    };
+  key <AB09> {   [ period,            greater             ]    };
+  key <AB10> {   [ slash,             question            ]    };
+
+  // End alphanumeric section
+
+  key <RALT> {   [ Alt_R,             Meta_R              ]    };
+
+};
diff --git a/symbols/br b/symbols/br
new file mode 100644
index 00000000..6c4536c3
--- /dev/null
+++ b/symbols/br
@@ -0,0 +1,60 @@
+
+// based on 
+// "a very simple Brasilian ABNT2 keybaord
+// by Ricardo Y. Igarashi (iga@that.com.br)
+// Adds suport for dead-keys in I18N applications
+// by Conectiva  (http://www.conectiva.com.br)"
+//
+// $XdotOrg: xc/programs/xkbcomp/symbols/pc/br,v 1.1.4.3 2004/03/05 13:41:32 eich Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/pc/br,v 1.3 2003/04/19 12:22:11 pascal Exp $
+
+xkb_symbols "abnt2" {
+
+    include "pc/latin"
+
+    name[Group1]="Brazilian";
+
+    key <AE02>	{ [         2,         at,  twosuperior,      onehalf ]	};
+    key <AE03>	{ [         3, numbersign, threesuperior, threequarters ] };
+    key <AE04>	{ [         4,     dollar,     sterling,   onequarter ]	};
+    key <AE05>	{ [         5,    percent,         cent, threeeighths ]	};
+    key <AE06>	{ [         6, dead_diaeresis,  notsign,    diaeresis ]	};
+    key <AE12>	{ [     equal,       plus,      section,  dead_ogonek ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD04>	{ [         r,          R,   registered,   registered ]	};
+    key <AD11>	{ [dead_acute, dead_grave,        acute,        grave ]	};
+    key <AD12>	{ [bracketleft,  braceleft, ordfeminine,  dead_macron ]	};
+
+    key <AC10>	{ [  ccedilla,   Ccedilla,  dead_acute, dead_doubleacute] };
+    key <AC11>	{ [dead_tilde, dead_circumflex, asciitilde, asciicircum ] };
+    key <AC12>  { [bracketright, braceright,  masculine,    masculine   ] };
+
+    key <TLDE>	{ [apostrophe,   quotedbl,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [ backslash,        bar,    masculine,   dead_breve ]	};
+    key <AB03>	{ [         c,          C,    copyright,    copyright ]	};
+    key <AB07>  { [         m,          M,           mu,           mu ] };
+    key <AB10>	{ [ semicolon,    colon, dead_belowdot, dead_abovedot ]	};
+
+// ABNT-2 keyboard has this special key
+
+    key <AB11>	{ [     slash,   question,       degree, questiondown ]	};
+
+    key <KPPT>	{ [KP_Decimal ]	};
+    key <KPDL>	{ [ KP_Delete,      comma ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "pc/br(abnt2)" // for consistent naming
+
+    key <AE06>	{ [         6,  diaeresis,      notsign,      notsign ]	};
+    key <AD11>	{ [apostrophe,      grave ]	};
+    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};
+    key <AC11>	{ [asciitilde, asciicircum ]	};
+    key <AB10>	{ [ semicolon,      colon, dead_belowdot,    abovedot ]	};
+};
diff --git a/symbols/by b/symbols/by
new file mode 100644
index 00000000..d8c6a4b4
--- /dev/null
+++ b/symbols/by
@@ -0,0 +1,75 @@
+
+// based on
+// belarusian standard keyboard 
+// Alexander Mikhailian <mikhailian@altern.org>
+//
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Belarusian";
+
+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<LSGT> {	[		bar,	brokenbar	]	};
+
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE04> {	[		4,        semicolon	]	};
+    key	<AE05> {	[		5,	     percent	]	};
+    key	<AE06> {	[		6,	     colon	]	};
+    key	<AE07> {	[		7,	    question	]	};
+
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[  Byelorussian_shortu,  Byelorussian_SHORTU	]};
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<AD12> {	[	apostrophe,	apostrophe	]	};
+
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
+
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB05> {	[     Ukrainian_i,     Ukrainian_I	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<AB10> {	[	    period,	     comma	]	};
+
+    key	<BKSL> {	[	slash,		       bar	]	};
+
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+    include "pc/by(basic)"
+    key	<AE04> {	[		4,       semicolon	]	};
+    key	<AE03> {	[		3,      numbersign	]	};
+    key	<AE05> {	[		5,	   percent	]	};
+    key	<AE06> {	[		6,	     colon	]	};
+    key	<AE07> {	[		7,	  question	]	};
+    key	<AE08> {	[		8,	  asterisk	]	};
+    key	<AB10> {	[	   period,	     comma	]	};
+    key	<BKSL> {	[	    slash,             bar	]	};
+};
diff --git a/symbols/cz b/symbols/cz
new file mode 100644
index 00000000..dbacdb11
--- /dev/null
+++ b/symbols/cz
@@ -0,0 +1,83 @@
+// $XFree86: xc/programs/xkbcomp/symbols/pc/cz,v 1.2 2002/11/22 04:02:22 dawes 
+// Exp $
+
+partial alphanumeric_keys 
+xkb_symbols "basic" {
+     
+     // This layout conforms to a new cz compromise standard designed 
+     // to satisfy most unix, windows and mac users.
+     // 2001 by Kamil Toman <ktoman@email.cz>
+
+    include "pc/latin"
+
+    name[Group1]= "Czech";
+
+    key <TLDE>	{ [ semicolon, dead_abovering,    grave,   asciitilde ]	};
+    key <AE01>	{ [      plus,          1,       exclam,   dead_tilde ]	};
+    key <AE02>	{ [    ecaron,          2,           at,   dead_caron ]	};
+    key <AE03>	{ [    scaron,          3,   numbersign, dead_circumflex ] };
+    key <AE04>	{ [    ccaron,          4,       dollar,   dead_breve ]	};
+    key <AE05>	{ [    rcaron,          5,      percent, dead_abovering ] };
+    key <AE06>	{ [    zcaron,          6,  asciicircum,  dead_ogonek ]	};
+    key <AE07>	{ [    yacute,          7,    ampersand,   dead_grave ]	};
+    key <AE08>	{ [    aacute,          8,     asterisk, dead_abovedot]	};
+    key <AE09>	{ [    iacute,          9,    braceleft,   dead_acute ]	};
+    key <AE10>	{ [    eacute,          0,   braceright, dead_doubleacute ] };
+    key <AE11>	{ [     equal,    percent,     NoSymbol, dead_diaeresis ] };
+    key <AE12>	{ [dead_acute, dead_caron,  dead_macron, dead_cedilla ]	};
+
+    key <AD01>	{ [         q,          Q,    backslash,     NoSymbol ]	};
+    key <AD02>	{ [         w,          W,          bar,     Nosymbol ]	};
+    key <AD03>	{ [         e,          E,     EuroSign,     NoSymbol ]	};
+    key <AD04>	{ [         r,          R,     NoSymbol,     NoSymbol ]	};
+    key <AD05>	{ [         t,          T,     NoSymbol,     NoSymbol ]	};
+    key <AD06>	{ [         z,          Z,     NoSymbol,     NoSymbol ]	};
+    key <AD07>	{ [         u,          U,     NoSymbol,     NoSymbol ]	};
+    key <AD08>	{ [         i,          I,     NoSymbol,     NoSymbol ]	};
+    key <AD09>	{ [         o,          O,     NoSymbol,     NoSymbol ]	};
+    key <AD10>	{ [         p,          P,     NoSymbol,     NoSymbol ]	};
+
+    key <AD11>	{ [    uacute,      slash,  bracketleft,     division ]	};
+    key <AD12>	{ [parenright,  parenleft, bracketright,     multiply ]	};
+
+    key <AC01>	{ [         a,          A,   asciitilde,     NoSymbol ]	};
+    key <AC02>	{ [         s,          S,      dstroke,     NoSymbol ]	};
+    key <AC03>	{ [         d,          D,      Dstroke,     NoSymbol ]	};
+    key <AC04>	{ [         f,          F,  bracketleft,     NoSymbol ]	};
+    key <AC05>	{ [         g,          G, bracketright,     NoSymbol ]	};
+    key <AC06>	{ [         h,          H,        grave,     NoSymbol ]	};
+    key <AC07>	{ [         j,          J,   apostrophe,     NoSymbol ]	};
+    key <AC08>	{ [         k,          K,      lstroke,     NoSymbol ]	};
+    key <AC09>	{ [         l,          L,      Lstroke,     NoSymbol ]	};
+                  
+    key <AC10>	{ [     uring,   quotedbl,       dollar,     NoSymbol ]	};
+    key <AC11>	{ [   section,     exclam,   apostrophe,       ssharp ]	};
+    key <AC12>	{ [  EuroSign, dead_diaeresis, NoSymbol,     NoSymbol ]	};
+    key <BKSL>	{ [dead_diaeresis, apostrophe, backslash,         bar ]	};
+
+    key <LSGT>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+    key <AB01>	{ [         y,          Y,       degree,     NoSymbol ]	};
+    key <AB02>	{ [         x,          X,   numbersign,     Nosymbol ]	};
+    key <AB03>	{ [         c,          C,    ampersand,     NoSymbol ]	};
+    key <AB04>	{ [         v,          V,           at,     NoSymbol ]	};
+    key <AB05>	{ [         b,          B,    braceleft,     NoSymbol ]	};
+    key <AB06>	{ [         n,          N,   braceright,     NoSymbol ]	};
+    key <AB07>	{ [         m,          M,  asciicircum,     NoSymbol ]	};
+    key <AB08>	{ [     comma,   question,         less,     NoSymbol ]	};
+    key <AB09>	{ [    period,      colon,      greater,     NoSymbol ]	};
+    key <AB10>	{ [     minus, underscore,     asterisk,     NoSymbol ]	};
+
+    key <SPCE>	{ [     space,      space, nobreakspace, nobreakspace ]	};
+
+    key <KPDL>	{ type[Group1]="FOUR_LEVEL_KEYPAD",
+                  [ KP_Delete,      comma,    KP_Delete,   KP_Decimal ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+xkb_symbols "bksl" {
+    include "pc/cz(basic)"
+
+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+};
diff --git a/symbols/cz_qwerty b/symbols/cz_qwerty
new file mode 100644
index 00000000..1d1c47a0
--- /dev/null
+++ b/symbols/cz_qwerty
@@ -0,0 +1,21 @@
+// $XFree86$
+
+partial alphanumeric_keys 
+xkb_symbols "basic" {
+ 
+    // This layout should work exactly as a cz with the exception 
+    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
+    // 2001 by Kamil Toman <ktoman@email.cz>
+    
+    include "pc/cz(basic)"
+
+    key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
+    key <AD06>	{ [         y,          Y,     NoSymbol,     NoSymbol ]	};
+};
+
+// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+xkb_symbols "bksl" {
+    include "pc/cz_qwerty(basic)"
+
+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+};
diff --git a/symbols/de b/symbols/de
new file mode 100644
index 00000000..86be7a34
--- /dev/null
+++ b/symbols/de
@@ -0,0 +1,108 @@
+
+// based on a keyboard map from an 'xkb/symbols/de' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
+
+xkb_symbols "basic" {
+
+    include "pc/latin(type4)"
+
+    name[Group1]="German";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE03>	{ [         3,    section, threesuperior,    sterling ]	};
+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
+    key <AE11>	{ [    ssharp,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [dead_acute, dead_grave, dead_cedilla,  dead_ogonek ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD06>	{ [         z,          Z,    leftarrow,          yen ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
+
+    key <AC10>	{ [odiaeresis, Odiaeresis, dead_doubleacute, dead_doubleacute ] };
+    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron]	};
+    key <TLDE>	{ [dead_circumflex, degree,     notsign,      notsign ]	};
+
+    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_breve ]	};
+    key <AB01>	{ [         y,          Y, guillemotleft,        less ]	};
+
+    key <KPDL>	{ [ KP_Delete, KP_Separator                           ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // modify the default German layout to not have any dead keys
+
+    include "pc/de(basic)"
+
+    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
+    key <AE12>	{ [     acute,      grave,      cedilla,      cedilla ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};
+    key <AC10>	{ [odiaeresis, Odiaeresis,  doubleacute,  doubleacute ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};
+    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};
+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "deadgraveacute" {
+    // modify the default German layout to have only acute and grave
+    // as dead keys (tilde and circumflex are needed as spacing characters
+    // in many programming languages)
+
+    include "pc/de(basic)"
+
+    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde,  dead_macron ]	};
+    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "deadacute" {
+    // modify the default German layout to have only acute as
+    // dead keys (ASCII grave, tilde and circumflex are needed as
+    // spacing characters in many programming languages and text formatters)
+
+    include "pc/de(deadgraveacute)"
+
+    key <AE12>	{ [dead_acute,      grave, dead_cedilla,  dead_ogonek ]	};
+    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_grave ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "de_ro" {
+    // add romanian-specific letters to the basic German layout.
+    // Romanian symbols are accessible with combination of <AltGr> and
+    // 'a', 's', 't', 'i', '� (&auml)' (+<Shift> for capital letters).
+    // To view romanian-specific symbols, add "export LC_CTYPE=ro_RO"
+    // or "export LC_CTYPE=de_DE.utf8" to your .profile.
+
+    include "pc/de(basic)"
+
+    name[Group1]="Romanian for German keyboard";
+
+    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };
+    key <AD08> { [         i,    I,        icircumflex,  Icircumflex    ] };
+    key <AC01> { [         a,    A,        acircumflex,  Acircumflex    ] };
+    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };
+    key <AC11> { [ adiaeresis,   Adiaeresis,    abreve,       Abreve    ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "de_ro_nodeadkeys" {
+    // add romanian-specific letters to the German nodeadkeys layout.
+    // Read the comment for de_ro !
+
+    include "pc/de(nodeadkeys)"
+
+    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };
+    key <AD08> { [         i,    I,        icircumflex,  Icircumflex    ] };
+    key <AC01> { [         a,    A,        acircumflex,  Acircumflex    ] };
+    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };
+    key <AC11> { [ adiaeresis,   Adiaeresis, abreve,       Abreve       ] };
+};
diff --git a/symbols/dev b/symbols/dev
new file mode 100644
index 00000000..94ac8440
--- /dev/null
+++ b/symbols/dev
@@ -0,0 +1,71 @@
+
+// based on a keyboard map from an 'xkb/symbols/dev' file
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+      name[Group1]= "Hindi";
+
+      key <TLDE> { [      0x100094A, 0x1000912		]	};
+
+      // Mainly numbers.
+      key <AE01> { [      0x1000967, 0x100090D 		]	};
+      key <AE02> { [      0x1000968, 0x1000945 		]	};
+      key <AE03> { [      0x1000969 	 		]	};
+      key <AE04> { [      0x100096A  	 		]	};
+      key <AE05> { [      0x100096B  	 		]	};
+      key <AE06> { [      0x100096C  	 		]	};
+      key <AE07> { [      0x100096D                     ]	};
+      key <AE08> { [      0x100096e  	 		]	};
+      key <AE09> { [      0x100096F, parenleft 		]	};
+      key <AE10> { [      0x1000966, parenright 	]	};
+      key <AE11> { [      0x1000903 	 		]	};
+      key <AE12> { [      0x1000943, 0x100090B 		]	};
+
+// Mainly long vowels
+
+      key <AD01> { [      0x100094C,  0x1000914       	]	};
+      key <AD02> { [      0x1000948,  0x1000910       	]	};
+      key <AD03> { [      0x100093E,  0x1000906       	]	};
+      key <AD04> { [      0x1000940,  0x1000908       	]	};
+      key <AD05> { [      0x1000942,  0x100090A       	]	};
+
+// Mainly voiced consonants
+
+      key <AD06> { [      0x100092C,  0x100092D 	]	};
+      key <AD07> { [      0x1000939,  0x1000919 	]	};
+      key <AD08> { [      0x1000917,  0x1000918 	]	};
+      key <AD09> { [      0x1000926,  0x1000927 	]	};
+      key <AD10> { [      0x100091C,  0x100091D 	]	};
+      key <AD11> { [      0x1000921,  0x1000922		]	};
+      key <AD12> { [      0x100093C,  0x100091E		]	};
+
+// Mainly short vowels
+      key <AC01> { [      0x100094B,  0x1000913       	]	};
+      key <AC02> { [      0x1000947,  0x100090F       	]	};
+      key <AC03> { [      0x100094D,  0x1000905       	]	};
+      key <AC04> { [      0x100093F,  0x1000907       	]	};
+      key <AC05> { [      0x1000941,  0x1000909       	]	};
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      0x100092A,  0x100092B 	]	};
+      key <AC07> { [      0x1000930,  0x1000931 	]	};
+      key <AC08> { [      0x1000915,  0x1000916 	]	};
+      key <AC09> { [      0x1000924,  0x1000925 	]	};
+      key <AC10> { [      0x100091A,  0x100091B 	]	};
+      key <AC11> { [      0x100091F,  0x1000920 	]	};
+      key <BKSL> { [      0x1000949,  0x1000911 	]	};
+
+      key <AB01> { [      0x1000946,  0x100090E		]	};
+      key <AB02> { [      0x1000902,  0x1000901		]	};
+      key <AB03> { [      0x100092E,  0x1000923         ]       };
+      key <AB04> { [      0x1000928,  0x1000929		]       };
+      key <AB05> { [      0x1000935,  0x1000934		]       };
+      key <AB06> { [      0x1000932,  0x1000933         ]       };
+      key <AB07> { [      0x1000938,  0x1000936         ]       };
+      key <AB08> { [      comma,      0x1000937         ]       };
+      key <AB09> { [      period,     0x1000964		]       };
+      key <AB10> { [      0x100092F,  question		]       };
+};
diff --git a/symbols/digital.vndr/lk b/symbols/digital.vndr/lk
new file mode 100644
index 00000000..e5732a30
--- /dev/null
+++ b/symbols/digital.vndr/lk
@@ -0,0 +1,131 @@
+// $Xorg: lk,v 1.3 2000/08/17 19:54:44 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log: lk,v 
+// Revision 1.2  1996/06/18  09:10:09  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.2.2  1995/03/10  17:16:52  William_Walker
+// 	Rename to avoid name conflicts with XKB stuff
+// 	[1995/03/10  17:10:33  William_Walker]
+//
+// Revision 1.1.2.2  1994/10/31  15:22:00  William_Walker
+// 	New experimental version.
+// 	[1994/10/31  14:48:37  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: lk,v  Revision: 1.2  (DEC) Date: 1996/01/24 12:14:58
+// 
+// Symbols common to all the LK-style keyboards.
+//
+default xkb_symbols "common" {
+
+    // Modifier mappings
+    modifier_map Shift  	{ Shift_L, 	Shift_R	  };
+    modifier_map Lock   	{ Caps_Lock };
+    modifier_map Control	{ Control_L, Control_R };
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R };
+    modifier_map Mod2		{ Num_Lock };
+    modifier_map Mod3   	{ Scroll_Lock };
+
+    // Additional alphanumeric keys
+    key <LSGT>		{ [ less,	greater		] };
+    key <LALT>		{ [ Alt_L,	Meta_L		] };
+
+    // "Function" keys
+    key <FK01>		{ [ F1				] };
+    key <FK02>		{ [ F2				] };
+    key <FK03>		{ [ F3				] };
+    key <FK04>		{ [ F4				] };
+    key <FK05>		{ [ F5				] };
+    key <FK06>		{ [ F6				] };
+    key <FK07>		{ [ F7				] };
+    key <FK08>		{ [ F8				] };
+    key <FK09>		{ [ F9				] };
+    key <FK10>		{ [ F10				] };
+    key <FK11>		{ [ Escape,	F11		] };
+    key <FK12>		{ [ F12				] };
+    key <FK13>		{ [ F13				] };
+    key <FK14>		{ [ F14				] };
+    key <FK17>		{ [ F17				] };
+    key <FK18>		{ [ F18				] };
+    key <FK19>		{ [ F19				] };
+    key <FK20>		{ [ F20				] };
+
+    // "Editing" keys
+    key <HELP>		{ [ Help			] };
+    key <DO>		{ [ Menu			] };
+    key <FIND>		{ [ Find			] };
+    key <INS>		{ [ Insert			] };
+    key <DELE>		{ [ Delete			] };
+    key <SELE>		{ [ Select			] };
+    key <PGUP>		{ [ Prior			] };
+    key <PGDN>		{ [ Next			] };
+
+    key <UP>		{ [ Up				] };
+    key <LEFT>		{ [ Left			] };
+    key <DOWN>		{ [ Down			] };
+    key <RGHT>		{ [ Right			] };
+
+    // "Keypad" keys
+    key <KPF1>		{
+				type= "SHIFT+ALT",
+				symbols[Group1]=[ KP_F1,Pointer_EnableKeys ]
+			};
+    key <KPF2>		{ [ KP_F2			] };
+    key <KPF3>		{ [ KP_F3			] };
+    key <KPF4>		{ [ KP_F4			] };
+
+    key <KPCO>		{ [ KP_Separator		] };
+    key <KPSU>		{ [ KP_Subtract			] };
+
+    key <KP7>		{ [ KP_7			] };
+    key <KP8>		{ [ KP_8			] };
+    key <KP9>		{ [ KP_9			] };
+
+    key <KP4>		{ [ KP_4			] };
+    key <KP5>		{ [ KP_5			] };
+    key <KP6>		{ [ KP_6			] };
+
+    key <KP1>		{ [ KP_1			] };
+    key <KP2>		{ [ KP_2			] };
+    key <KP3>		{ [ KP_3			] };
+    key <KPEN>		{ [ KP_Enter			] };
+
+    key <KP0>		{ [ KP_0			] };
+    key <KPDL>		{ [ KP_Decimal			] };
+};
+
+xkb_symbols "lk401" {
+    include "symbols/digital/lk(common)"
+    key <RALT>              { [ Alt_R,      Meta_R          ] };
+    key <LCMP>              { [ Multi_key                   ] };
+    key <RCMP>              { [ Multi_key                   ] };
+};
diff --git a/symbols/digital.vndr/pc b/symbols/digital.vndr/pc
new file mode 100644
index 00000000..c6cc777d
--- /dev/null
+++ b/symbols/digital.vndr/pc
@@ -0,0 +1,176 @@
+// $Xorg: pc,v 1.3 2000/08/17 19:54:44 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:12  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.4  1995/12/19  19:55:58  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:07  William_Walker]
+//
+// Revision 1.1.6.3  1995/10/25  21:01:09  William_Walker
+// 	Make sure we use DIN 2137 and VT510 Spec for Group Semantics
+// 	[1995/10/23  15:49:03  William_Walker]
+// 
+// Revision 1.1.6.2  1995/08/07  17:40:40  William_Walker
+// 	Upgrade XKB to protocol 0.62 (dual submit from decx11)
+// 	[1995/08/06  14:06:32  William_Walker]
+// 
+// Revision 1.1.2.7  1995/08/05  15:25:57  William_Walker
+// 	Sync up with Erik's pool.
+// 	[1995/08/03  20:17:15  William_Walker]
+// 
+// Revision 1.1.2.6  1995/06/27  12:18:25  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:29:52  William_Walker]
+// 
+// Revision 1.1.2.5  1995/06/08	 17:10:28  William_Walker
+// 	Make RALT default to Mode_switch
+// 	[1995/06/08  17:08:50  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/05	 19:24:14  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:03  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: pc  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:02 
+// 
+
+// **************************************************************
+// *								*
+// * The symbols common to all Extended PC layouts.		*
+// *								*
+// **************************************************************
+xkb_symbols "pc" {
+
+    // Modifier mappings
+    //
+    modifier_map Shift		{ Shift_L, Shift_R		};
+    modifier_map Lock		{ Caps_Lock			};
+    modifier_map Control	{ Control_L, Control_R		};
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
+    modifier_map Mod3		{ Mode_switch			};
+    modifier_map Mod4		{ Num_Lock			};
+    modifier_map Mod5		{ Scroll_Lock			};
+
+    // Common keys
+    //
+    key <BKSP> {       [       BackSpace,	   Delete ] };
+    key	 <TAB> {       [	     Tab,    ISO_Left_Tab ] };
+    key <CAPS> {       [       Caps_Lock ] };
+    key <RTRN> {       [	  Return ] };
+    key <LFSH> {       [	 Shift_L ] };
+    key <RTSH> {       [	 Shift_R ] };
+    key <LCTL> {       [       Control_L ] };
+    key <LALT> {       [	   Alt_L,	   Meta_L ] };
+    key <SPCE> {       [	   space ] };
+    key <RALT> {       [     Mode_switch ] };
+    key <RCTL> {       [       Control_R ] };
+
+    // "Function" keys
+    //
+    key	 <ESC> {       [	  Escape ] };
+    key <FK01> {       [	      F1 ] };
+    key <FK02> {       [	      F2 ] };
+    key <FK03> {       [	      F3 ] };
+    key <FK04> {       [	      F4 ] };
+    key <FK05> {       [	      F5 ] };
+    key <FK06> {       [	      F6 ] };
+    key <FK07> {       [	      F7 ] };
+    key <FK08> {       [	      F8 ] };
+    key <FK09> {       [	      F9 ] };
+    key <FK10> {       [	     F10 ] };
+    key <FK11> {       [	     F11 ] };
+    key <FK12> {       [	     F12 ] };
+    key <PRSC> {
+	type= "PC_SYSRQ",
+	symbols[Group1]= [	     Print,	    Sys_Req ]
+    };
+    key <SCLK> {       [     Scroll_Lock ] };
+    key <PAUS> {
+	type= "PC_BREAK",
+	symbols[Group1]= [	     Pause,	      Break ]
+    };
+
+    // "Editing" keys
+    //
+    key	 <INS> {       [	  Insert ] };
+    key <HOME> {       [	    Home ] };
+    key <PGUP> {       [	   Prior ] };
+    key <DELE> {       [	  Delete ] };
+    key	 <END> {       [	     End ] };
+    key <PGDN> {       [	    Next ] };
+
+    key	  <UP> {       [	      Up ] };
+    key <LEFT> {       [	    Left ] };
+    key <DOWN> {       [	    Down ] };
+    key <RGHT> {       [	   Right ] };
+
+    // "Keypad" keys
+    //
+    key <NMLK> {
+	type= "SHIFT+ALT",
+	symbols[Group1]= [	  Num_Lock,Pointer_EnableKeys]
+    };
+    key <KPDV> {       [       KP_Divide ] };
+    key <KPMU> {       [     KP_Multiply ] };
+    key <KPSU> {       [     KP_Subtract ] };
+
+    key	 <KP7> {       [	 KP_Home,	     KP_7 ] };
+    key	 <KP8> {       [	   KP_Up,	     KP_8 ] };
+    key	 <KP9> {       [	KP_Prior,	     KP_9 ] };
+    key <KPAD> {       [	  KP_Add ] };
+
+    key	 <KP4> {       [	 KP_Left,	     KP_4 ] };
+    key	 <KP5> {       [	    KP_5 ] };
+    key	 <KP6> {       [	KP_Right,	     KP_6 ] };
+
+    key	 <KP1> {       [	  KP_End,	     KP_1 ] };
+    key	 <KP2> {       [	 KP_Down,	     KP_2 ] };
+    key	 <KP3> {       [	 KP_Next,	     KP_3 ] };
+    key <KPEN> {       [	KP_Enter ] };
+
+    key	 <KP0> {       [       KP_Insert,	     KP_0 ] };
+    key <KPDL> {       [       KP_Delete,      KP_Decimal ] };
+
+    // Key to support Lock-Down Modifier descriptions for R5
+    //
+    key	 <LDM> {       [	NoSymbol ] };
+};
+
+xkb_symbols "pc104" {
+    include "digital/pc(pc)"
+
+    replace key <LALT> {       [       Alt_L ] };
+    key	<LWIN> {       [	 Meta_L ] };
+    key	<RWIN> {       [	 Meta_R ] };
+    key	<MENU> {       [	 Menu   ] };
+};
diff --git a/symbols/digital.vndr/us b/symbols/digital.vndr/us
new file mode 100644
index 00000000..21636aa6
--- /dev/null
+++ b/symbols/digital.vndr/us
@@ -0,0 +1,212 @@
+// $Xorg: us,v 1.3 2000/08/17 19:54:44 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:16  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.3  1995/12/19  19:56:37  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:44  William_Walker]
+//
+// Revision 1.1.6.2  1995/10/25  21:01:25  William_Walker
+// 	Add pc104-key support
+// 	[1995/10/23  15:46:27  William_Walker]
+// 
+// Revision 1.1.2.7  1995/06/27  12:18:40  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:30:33  William_Walker]
+// 
+// Revision 1.1.2.6  1995/06/09	 20:55:20  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:43:05  William_Walker]
+// 
+// Revision 1.1.2.5  1995/06/08	 21:05:49  William_Walker
+// 	Use ISO_Next_Group instead of grouplock
+// 	[1995/06/08  21:03:56  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/05	 19:25:00  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:54  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: us  Revision: /main/4  (DEC) Date: 1996/01/24 12:15:05 
+// 
+
+// **************************************************************
+// *								*
+// * Symbols for en_US.ISO8859-1 - English for U.S.		*
+// *								*
+// **************************************************************
+
+xkb_symbols "us" {
+
+    key <AE00> {       [	    grave,     asciitilde ] };
+    key <AE01> {       [		1,	   exclam ] };
+    key <AE02> {       [		2,	       at ] };
+    key <AE03> {       [		3,     numbersign ] };
+    key <AE04> {       [		4,	   dollar ] };
+    key <AE05> {       [		5,	  percent ] };
+    key <AE06> {       [		6,    asciicircum ] };
+    key <AE07> {       [		7,	ampersand ] };
+    key <AE08> {       [		8,	 asterisk ] };
+    key <AE09> {       [		9,	parenleft ] };
+    key <AE10> {       [		0,     parenright ] };
+    key <AE11> {       [	    minus,     underscore ] };
+    key <AE12> {       [	    equal,	     plus ] };
+
+    key <AD01> {       [		q,		Q ] };
+    key <AD02> {       [		w,		W ] };
+    key <AD03> {       [		e,		E ] };
+    key <AD04> {       [		r,		R ] };
+    key <AD05> {       [		t,		T ] };
+    key <AD06> {       [		y,		Y ] };
+    key <AD07> {       [		u,		U ] };
+    key <AD08> {       [		i,		I ] };
+    key <AD09> {       [		o,		O ] };
+    key <AD10> {       [		p,		P ] };
+    key <AD11> {       [      bracketleft,	braceleft ] };
+    key <AD12> {       [     bracketright,     braceright ] };
+
+    key <AC01> {       [		a,		A ] };
+    key <AC02> {       [		s,		S ] };
+    key <AC03> {       [		d,		D ] };
+    key <AC04> {       [		f,		F ] };
+    key <AC05> {       [		g,		G ] };
+    key <AC06> {       [		h,		H ] };
+    key <AC07> {       [		j,		J ] };
+    key <AC08> {       [		k,		K ] };
+    key <AC09> {       [		l,		L ] };
+    key <AC10> {       [	semicolon,	    colon ] };
+    key <AC11> {       [       apostrophe,	 quotedbl ] };
+    key <BKSL> {       [	backslash,	      bar ] };
+
+    key <AB01> {       [		z,		Z ] };
+    key <AB02> {       [		x,		X ] };
+    key <AB03> {       [		c,		C ] };
+    key <AB04> {       [		v,		V ] };
+    key <AB05> {       [		b,		B ] };
+    key <AB06> {       [		n,		N ] };
+    key <AB07> {       [		m,		M ] };
+    key <AB08> {       [	    comma,	     less ] };
+    key <AB09> {       [	   period,	  greater ] };
+    key <AB10> {       [	    slash,	 question ] };
+};
+
+// **************************************************************
+// *								*
+// * The VT105 layouts						*
+// *								*
+// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
+// *	    for the VT108 layout are identical for the US.	*
+// *								*
+// **************************************************************
+xkb_symbols "vt105-tw" {
+    include "digital/us(us)"
+    include "digital/vt(vt105)"
+    override key <AE03> { 
+	symbols[Group1]= [ 3, numbersign ],
+	symbols[Group2]= [ sterling ]
+    };
+    key <AB00> {       [	     less,	  greater ] };
+};
+
+xkb_symbols "vt105-dp" { include "digital/us(vt105-tw)" };
+xkb_symbols "vt105"    { include "digital/us(vt105-tw)" };
+
+// **************************************************************
+// *								*
+// * The VT108 layouts - based upon the LK401-AA		*
+// *								*
+// * NOTES: The typewriter (TW) and dataprocessing (DP) keys	*
+// *	    for the VT108 layout are identical for the US.	*
+// *								*
+// **************************************************************
+xkb_symbols "vt108-tw" {
+    include "digital/us(us)"
+    include "digital/vt(vt108)"
+    replace key <LCMP> { [ Multi_key ] };
+    override key <AE03> { 
+	symbols[Group1]= [ 3, numbersign ],
+	symbols[Group2]= [ sterling ]
+    };
+    key <AB00> {       [	     less,	  greater ] };
+};
+
+xkb_symbols "vt108-dp" { include "digital/us(vt108-tw)" };
+xkb_symbols "vt108"    { include "digital/us(vt108-tw)" };
+
+// **************************************************************
+// *								*
+// * The "unix" layouts	- based upon the LK421-AA		*
+// *								*
+// * NOTES: The "unix" keyboard emits the same keycodes as the	*
+// *	    LK401, but is a shorter keyboard that uses an	*
+// *	    "extend" key.  To make life easier, we map <AE00>	*
+// *	    to Escape so users do not have to press Extend+F11	*
+// *	    to get Escape.					*
+// *								*
+// **************************************************************
+xkb_symbols "unix" {
+    include "digital/us(vt108)"
+    override key <AE00>	{ [ Escape ] };
+    override key <AB00>	{ [ grave, asciitilde ] };
+};
+
+// **************************************************************
+// *								*
+// * The "pcxal" layouts					*
+// *								*
+// * NOTES: The pcxal layouts are pretty much standardized for	*
+// *	    the US and use a 101-key keyboard.			*
+// *								*
+// **************************************************************
+xkb_symbols "pcxalga" {
+    include "digital/pc(pc)"
+    include "digital/us(us)"
+    replace key <RALT> { [ Alt_R, Meta_R ] };
+};
+
+xkb_symbols "pcxal"   { include "digital/us(pcxalga)" };
+xkb_symbols "pcxalaa" { include "digital/us(pcxalga)" };
+xkb_symbols "pcxalfa" { include "digital/us(pcxalga)" };
+xkb_symbols "pcxalka" { include "digital/us(pcxalga)" };
+xkb_symbols "lk44x"   { include "digital/us(pcxalga)" };
+
+// **************************************************************
+// *								*
+// * The "pc104" layouts.					*
+// *								*
+// **************************************************************
+xkb_symbols "pc104" {
+    include "digital/pc(pc104)"
+    include "digital/us(us)"
+    replace key <RALT> { [ Alt_R ] };
+};
diff --git a/symbols/digital.vndr/vt b/symbols/digital.vndr/vt
new file mode 100644
index 00000000..62257abf
--- /dev/null
+++ b/symbols/digital.vndr/vt
@@ -0,0 +1,159 @@
+// $Xorg: vt,v 1.3 2000/08/17 19:54:44 cpqbld Exp $
+//
+//Copyright (c) 1996  Digital Equipment Corporation
+//
+//Permission is hereby granted, free of charge, to any person obtaining
+//a copy of this software and associated documentation files (the
+//"Software"), to deal in the Software without restriction, including
+//without limitation the rights to use, copy, modify, merge, publish,
+//distribute, sublicense, and sell copies of the Software, and to
+//permit persons to whom the Software is furnished to do so, subject to
+//the following conditions:
+//
+//The above copyright notice and this permission notice shall be included
+//in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of the Digital Equipment 
+//Corporation shall not be used in advertising or otherwise to promote
+//the sale, use or other dealings in this Software without prior written
+//authorization from Digital Equipment Corporation.
+//
+// HISTORY
+// Log
+// Revision 1.2  1996/06/18  09:10:19  erik
+// use flags correctly, assorted cleanups and consortium fixes
+//
+// Revision 1.1.6.2  1995/12/19  19:56:39  William_Walker
+// 	Update to XKB 0.65
+// 	[1995/12/17  02:37:47  William_Walker]
+//
+// Revision 1.1.2.5  1995/07/11  21:20:50  William_Walker
+// 	Make RALT act as RALT
+// 	[1995/07/11  21:18:28  William_Walker]
+// 
+// Revision 1.1.2.4  1995/06/27  12:18:41  William_Walker
+// 	Add LK201 and LK450 support as well as TW and DP variants.
+// 	[1995/06/26  20:30:37  William_Walker]
+// 
+// Revision 1.1.2.3  1995/06/09	 20:55:21  William_Walker
+// 	Add VT105 layout support and ISO group support
+// 	[1995/06/09  20:43:09  William_Walker]
+// 
+// Revision 1.1.2.2  1995/06/05	 19:25:04  William_Walker
+// 	New file.  I love keymaps.
+// 	[1995/06/05  18:17:58  William_Walker]
+// 
+// EndLog
+// 
+// @(#)RCSfile: vt  Revision: /main/3  (DEC) Date: 1996/01/24 12:15:08 
+// 
+xkb_symbols "vt105" {
+
+    // Modifier mappings
+    //
+    modifier_map Shift		{ Shift_L, Shift_R		};
+    modifier_map Lock		{ Caps_Lock			};
+    modifier_map Control	{ Control_L, Control_R		};
+    modifier_map Mod1		{ Alt_L, Alt_R, Meta_L, Meta_R	};
+    modifier_map Mod3		{ Mode_switch			};
+
+    // Common keys
+    //
+    key <BKSP> {       [	  Delete ] };
+    key	 <TAB> {       [	     Tab ] };
+    key <RTRN> {       [	  Return ] };
+    key <LCTL> {       [       Control_L ] };
+    key <CAPS> {       [       Caps_Lock ] };
+    key <LFSH> {       [	 Shift_L ] };
+    key <RTSH> {       [	 Shift_R ] };
+    key <LCMP> {       [   Alt_L, Meta_L ] };
+    key <SPCE> {       [	   space ] };
+
+    // "Function" keys
+    //
+    key <FK01> {       [	       F1 ] };
+    key <FK02> {       [	       F2 ] };
+    key <FK03> {       [	       F3 ] };
+    key <FK04> {       [	       F4 ] };
+    key <FK05> {       [	       F5 ] };
+    key <FK06> {       [	       F6 ] };
+    key <FK07> {       [	       F7 ] };
+    key <FK08> {       [	       F8 ] };
+    key <FK09> {       [	       F9 ] };
+    key <FK10> {       [	      F10 ] };
+    key <FK11> {       [	   Escape,	      F11 ] };
+    key <FK12> {       [	      F12 ] };
+    key <FK13> {       [	      F13 ] };
+    key <FK14> {       [	      F14 ] };
+    key <FK17> {       [	      F17 ] };
+    key <FK18> {       [	      F18 ] };
+    key <FK19> {       [	      F19 ] };
+    key <FK20> {       [	      F20 ] };
+
+    // "Editing" keys
+    //
+    key <HELP> {       [	    Help ] };
+    key	  <DO> {       [	    Menu ] };
+    key <FIND> {       [	    Find ] };
+    key	 <INS> {       [	  Insert ] };
+    key <DELE> {       [       apLineDel ] };
+    key <SELE> {       [	  Select ] };
+    key <PGUP> {       [	   Prior ] };
+    key <PGDN> {       [	    Next ] };
+
+    key	  <UP> {       [	      Up ] };
+    key <LEFT> {       [	    Left ] };
+    key <DOWN> {       [	    Down ] };
+    key <RGHT> {       [	   Right ] };
+
+    // "Keypad" keys
+    //
+    key <KPF1> {
+	type= "SHIFT+ALT",
+	symbols[Group1]= [	     KP_F1,Pointer_EnableKeys ]
+    };
+    key <KPF2> {       [	   KP_F2 ] };
+    key <KPF3> {       [	   KP_F3 ] };
+    key <KPF4> {       [	   KP_F4 ] };
+
+    key	 <KP7> {       [	    KP_7 ] };
+    key	 <KP8> {       [	    KP_8 ] };
+    key	 <KP9> {       [	    KP_9 ] };
+    key <KPSU> {       [     KP_Subtract ] };
+
+    key	 <KP4> {       [	    KP_4 ] };
+    key	 <KP5> {       [	    KP_5 ] };
+    key	 <KP6> {       [	    KP_6 ] };
+    key <KPCO> {       [    KP_Separator ] };
+
+    key	 <KP1> {       [	    KP_1 ] };
+    key	 <KP2> {       [	    KP_2 ] };
+    key	 <KP3> {       [	    KP_3 ] };
+    key <KPEN> {       [	KP_Enter ] };
+
+    key	 <KP0> {       [	    KP_0 ] };
+    key <KPDL> {       [      KP_Decimal ] };
+
+    // Key to support Lock-Down Modifier descriptions for R5
+    //
+    key	 <LDM> {       [	NoSymbol ] };
+};
+
+xkb_symbols "vt108" {
+
+    include "digital/vt(vt105)"
+
+    replace key <LCMP> { [ Mode_switch ] };
+
+    key <LALT> {       [	   Alt_L,	   Meta_L ] };
+    key <RALT> {       [	   Alt_R,	   Meta_R ] };
+    key <RCMP> {       [       Multi_key ] };
+};
diff --git a/symbols/dk b/symbols/dk
new file mode 100644
index 00000000..a5013492
--- /dev/null
+++ b/symbols/dk
@@ -0,0 +1,44 @@
+
+// based on a keyboard map from an 'xkb/symbols/dk' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/dk,v 1.3 2002/12/19 01:07:56 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin(type2)"
+
+    name[Group1]="Danish";
+
+    key <AE11>	{ [      plus,   question,    plusminus, questiondown ]	};
+    key <AE12>	{ [dead_acute, dead_grave,          bar,    brokenbar ]	};
+
+
+    key <AC10>	{ [        ae,        AE,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [    oslash,  Ooblique, dead_circumflex, dead_caron ]	};
+    key <TLDE>	{ [   onehalf,   section, threequarters,    paragraph ]	};
+
+    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
+
+    key <LSGT>	{ [      less,    greater,    backslash,      notsign ]	};
+
+    key <KPDL>  { [ KP_Delete, KP_Separator                           ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "pc/dk(basic)"
+
+    key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};
+    key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};
+    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,       macron ]	};
+    key <AC10>	{ [        ae,         AE,        acute,  doubleacute ]	};
+    key <AC11>	{ [    oslash,   Ooblique,  asciicircum,        caron ]	};
+    key <BKSL>	{ [apostrophe,   asterisk,  doubleacute,     multiply ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
+    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
+
+};
diff --git a/symbols/dvorak b/symbols/dvorak
new file mode 100644
index 00000000..2cc95e6c
--- /dev/null
+++ b/symbols/dvorak
@@ -0,0 +1,278 @@
+
+// based on a keyboard map from an 'xkb/symbols/dk' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/dvorak,v 1.5 2004/01/03 16:35:07 herrb Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]= "Dvorak";
+
+    // Alphanumeric section
+
+    key <TLDE> { [       grave,	asciitilde, dead_grave, dead_tilde	] };
+
+    key <AE01> { [	    1,	exclam 		]	};
+    key <AE02> { [	    2,	at		]	};
+    key <AE03> { [	    3,	numbersign	]	};
+    key <AE04> { [	    4,	dollar		]	};
+    key <AE05> { [	    5,	percent		]	};
+    key <AE06> { [	    6,	asciicircum, dead_circumflex, dead_circumflex ]	};
+    key <AE07> { [	    7,	ampersand	]	};
+    key <AE08> { [	    8,	asterisk	]	};
+    key <AE09> { [	    9,	parenleft,  dead_grave]	};
+    key <AE10> { [	    0,	parenright	]	};
+    key <AE11> { [ bracketleft,	braceleft	]	};
+    key <AE12> { [ bracketright, braceright,  dead_tilde] };
+
+    key <AD01> { [  apostrophe,	quotedbl, dead_acute, dead_diaeresis	] };
+    key <AD02> { [	comma,	less,   dead_cedilla, dead_caron	] };
+    key <AD03> { [      period,	greater, dead_abovedot, periodcentered	] };
+    key <AD04> { [	    p,	P		]	};
+    key <AD05> { [	    y,	Y		]	};
+    key <AD06> { [	    f,	F		]	};
+    key <AD07> { [	    g,	G		]	};
+    key <AD08> { [	    c,	C		]	};
+    key <AD09> { [	    r,	R		]	};
+    key <AD10> { [	    l,	L		]	};
+    key <AD11> { [	slash,	question	]	};
+    key <AD12> { [	equal,	plus		]	};
+
+    key <AC01> { [	    a,	A 		]	};
+    key <AC02> { [	    o,	O		]	};
+    key <AC03> { [	    e,	E		]	};
+    key <AC04> { [	    u,	U		]	};
+    key <AC05> { [	    i,	I		]	};
+    key <AC06> { [	    d,	D		]	};
+    key <AC07> { [	    h,	H		]	};
+    key <AC08> { [	    t,	T		]	};
+    key <AC09> { [	    n,	N		]	};
+    key <AC10> { [	    s,	S		]	};
+    key <AC11> { [	minus,	underscore	]	};
+
+    key <AB01> { [   semicolon,	colon, dead_ogonek, dead_doubleacute ] };
+    key <AB02> { [	    q,	Q		]	};
+    key <AB03> { [	    j,	J		]	};
+    key <AB04> { [	    k,	K		]	};
+    key <AB05> { [	    x,	X		]	};
+    key <AB06> { [	    b,	B		]	};
+    key <AB07> { [	    m,	M		]	};
+    key <AB08> { [	    w,	W		]	};
+    key <AB09> { [	    v,	V		]	};
+    key <AB10> { [	    z,	Z		]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+// Norwegian Dvorak
+partial alphanumeric_keys 
+xkb_symbols "no" {
+    include "pc/dvorak(basic)"
+
+    key <TLDE> { [	  bar,	section, brokenbar, paragraph	] };
+
+    key <AE01> { [	    1,	exclam, exclamdown, onesuperior	] };
+    key <AE02> { [	    2,	quotedbl,   at,     twosuperior	] };
+    key <AE03> { [	    3,	numbersign, sterling, threesuperior ] };
+    key <AE04> { [	    4,	dollar,     currency,onequarter	] };
+    key <AE05> { [	    5,	percent,    onehalf,	onehalf	] };
+    key <AE06> { [	    6,	ampersand,  threequarters, threequarters ] };
+    key <AE07> { [	    7,	slash,      braceleft, division	] };
+    key <AE08> { [	    8,	parenleft,  bracketleft		] };
+    key <AE09> { [	    9,	parenright, bracketright	] };
+    key <AE10> { [	    0,	equal,	    braceright		] };
+    key <AE11> { [	 plus,	question,   plusminus, questiondown ] };
+    key <AE12> { [   backslash,	grave,	    dead_acute,	dead_grave  ] };
+
+    key <AD01> { [       aring,	Aring,  braceright, bracketright ] };
+    key <AD02> { [	comma,	semicolon, dead_cedilla, cedilla ] };
+    key <AD03> { [      period,	colon,  periodcentered		 ] };
+    key <AD04> { [	    p,	P,      thorn,	THORN		 ] };
+    key <AD05> { [	    y,	Y,      yen			 ] };
+    key <AD06> { [	    f,	F,      ordfeminine		 ] };
+    key <AD08> { [	    c,	C,      ccedilla, copyright	 ] };
+    key <AD09> { [	    r,	R,      registered		 ] };
+    key <AD11> { [  apostrophe,	asterisk, dead_circumflex, acute ] };
+    key <AD12> { [  asciitilde,	asciicircum, dead_diaeresis, dead_tilde	] };
+
+    key <AC03> { [	    e,	E,      EuroSign,	cent	 ] };
+    key <AC05> { [	    i,	I,      idotless,       Iabovedot] };
+    key <AC06> { [	    d,	D,      eth,		ETH	 ] };
+    key <AC10> { [	    s,	S,      ssharp			 ] };
+    key <AC11> { [	minus,	underscore, hyphen,	diaeresis] };
+
+    key <AB01> { [	   ae,	AE,     braceleft,	bracketleft] };
+    key <AB05> { [	    x,	X,      multiply		 ] };
+    key <AB07> { [	    m,	M,	mu			 ] };
+    key <BKSL> { [	 less,	greater, guillemotleft, guillemotright	] };
+
+    key <SPCE> { [	 space,	space, nobreakspace, nobreakspace] };
+
+    key <LSGT> { [	oslash,	Ooblique,  bar,	backslash	 ] };
+
+};
+
+// Swedish Dvorak
+partial alphanumeric_keys 
+xkb_symbols "se" {
+    include "pc/dvorak(no)"
+
+    key <TLDE> { [     section,	onehalf		]	};
+
+    key <AE04> { [	    4,	currency,   dollar,    onequarter	] };
+    key <AE11> { [        plus,	question,   backslash, questiondown	] };
+    key <AE12> { [  dead_acute, dead_grave, backslash, grave		] };
+
+    key <AD01> { [  odiaeresis,  Odiaeresis, braceright, bracketright	] };
+    key <AD02> { [       aring,	Aring	  	]	};
+    key <AD03> { [  adiaeresis,	Adiaeresis	]	};
+    key <AD11> { [           q,	Q       	]	};
+    key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, asciicircum ] };
+
+    key <AB01> { [     comma,    semicolon, dead_cedilla, cedilla	] };
+    key <AB02> { [    period,    colon,     periodcentered		] };
+
+    key <BKSL> { [      less,	greater,    bar,	brokenbar	] };
+
+    key <LSGT> { [ apostrophe,   asterisk,  bar,	backslash	] };
+
+};
+// Swedish Dvorak alias
+partial alphanumeric_keys 
+xkb_symbols "sv" {
+    include "pc/dvorak(se)"
+};
+
+// Dvorak (UK) keymap (by odaen) allowing the usage of
+// the � and ? key and swapping the @ and " keys.
+
+partial alphanumeric_keys
+xkb_symbols "gb" {
+    include "pc/dvorak(basic)"
+
+    key <BKSL> { [ numbersign,	asciitilde	] };
+    key <AE02> { [	    2,	quotedbl,  twosuperior,   NoSymbol	] };
+    key <AE03> { [	    3,	sterling,  threesuperior, NoSymbol	] };
+    key <AE04> { [	    4,	dollar,    EuroSign,      NoSymbol	] };
+    key <LSGT> { [  backslash,	bar		] };
+    key <AD01> { [ apostrophe,	at		] };
+};
+
+// Keymap Dvorak pour le Fran�ais
+// par Josselin Mouette <josselin.mouette@ens-lyon.org>.
+
+partial alphanumeric_keys
+xkb_symbols "fr" {
+
+    name[Group1]= "French dvorak";
+
+    key <TLDE>  { [         oe,       OE,              ae,             AE ] };
+
+    key <AE01>  { [      slash,        1,       ampersand,    onesuperior ] };
+    key <AE02>  { [       plus,        2,      asciitilde,    twosuperior ] };
+    key <AE03>  { [      minus,        3,      numbersign,  threesuperior ] };
+    key <AE04>  { [   asterisk,        4,            less,  guillemotleft ] };
+    key <AE05>  { [      equal,        5,         greater, guillemotright ] };
+    key <AE06>  { [  backslash,        6,              at,        notsign ] };
+    key <AE07>  { [  parenleft,        7, dead_circumflex,       multiply ] };
+    key <AE08>  { [      grave,        8,      dead_grave,       division ] };
+    key <AE09>  { [ parenright,        9,     asciicircum,      plusminus ] };
+    key <AE10>  { [   quotedbl,        0,  dead_diaeresis, dead_diaeresis ] };
+    key <AE11>  { [bracketleft,   braceleft,          bar,         degree ] };
+    key <AE12>  { [bracketright, braceright,      percent,        percent ] };
+
+    key <AD01>  { [      colon, question,        question,   questiondown ] };
+    key <AD02>  { [     agrave,   Agrave,           aring,          Aring ] };
+    key <AD03>  { [     eacute,   Eacute,        EuroSign,           cent ] };
+    key <AD04>  { [          g,        G,          oslash,       Ooblique ] };
+    key <AD05>  { [     period,   exclam,  periodcentered,     exclamdown ] };
+    key <AD06>  { [          h,        H,             eth,            ETH ] };
+    key <AD07>  { [          v,        V              ] };
+    key <AD08>  { [          c,        C,       copyright,     registered ] };
+    key <AD09>  { [          m,        M,              mu,             mu ] };
+    key <AD10>  { [          k,        K,          dollar,         dollar ] };
+    key <AD11>  { [     egrave,   Egrave,        sterling,       sterling ] };
+    key <AD12>  { [          z,        Z,             yen,            yen ] };
+
+    key <AC01>  { [          o,        O,     ocircumflex,    Ocircumflex ] };
+    key <AC02>  { [          a,        A,     acircumflex,    Acircumflex ] };
+    key <AC03>  { [          u,        U,     ucircumflex,    Ucircumflex ] };
+    key <AC04>  { [          e,        E,     ecircumflex,    Ecircumflex ] };
+    key <AC05>  { [          b,        B,          ssharp,         ssharp ] };
+    key <AC06>  { [          f,        F      ] };
+    key <AC07>  { [          s,        S      ] };
+    key <AC08>  { [          t,        T,           thorn,          THORN ] };
+    key <AC09>  { [          n,        N,          ntilde,         Ntilde ] };
+    key <AC10>  { [          d,        D,         section,        section ] };
+    key <AC11>  { [          w,        W,       paragraph,      paragraph ] };
+    key <BKSL>  { [     ugrave,   Ugrave,       masculine,    ordfeminine ] };
+
+    key <AB01>  { [ apostrophe, underscore,    dead_acute,         macron ] };
+    key <AB02>  { [          q,        Q,   guillemotleft,  guillemotleft ] };
+    key <AB03>  { [     comma, semicolon,  guillemotright, guillemotright ] };
+    key <AB04>  { [          i,        I,     icircumflex,    Icircumflex ] };
+    key <AB05>  { [          y,        Y,      ydiaeresis,     Ydiaeresis ] };
+    key <AB06>  { [          x,        X,      ediaeresis,     Ediaeresis ] };
+    key <AB07>  { [          r,        R,      udiaeresis,     Udiaeresis ] };
+    key <AB08>  { [          l,        L,      adiaeresis,     Adiaeresis ] };
+    key <AB09>  { [          p,        P,      odiaeresis,     Odiaeresis ] };
+    key <AB10>  { [          j,        J,      idiaeresis,     Idiaeresis ] };
+
+    key <SPCE>  { [      space,    space,    nobreakspace,   nobreakspace ] };
+    key <LSGT>  { [   ccedilla, Ccedilla      ] };
+
+    include "level3(ralt_switch_multikey)"
+};
+
+
+// Polish Dvorak keymaps
+// by Rafal Rzepecki <divide@users.sf.net>
+
+// The default keymap "pl" places Polish quotes on quotemark key and 
+// moves the dead symbols from there to "1/!" key. If you are used to default 
+// dead keys placement, you could use "pl_altquotes"; in this layout 
+// dead keys remain in the old place, whereas Polish quotes are placed on the
+// "1/!" key. If you do not use Polish quotes at all, you can use "pl_basic" map.
+
+// Basic Polish keymap (without Polish quotes)
+partial alphanumeric_keys 
+xkb_symbols "pl_basic" {
+    include "pc/dvorak(basic)"
+    
+    name[Group1] = "Polish Dvorak";
+
+    key <AD08> { [	    c,	C,	cacute,	Cacute		]	};
+    key <AD10> { [	    l,	L,     lstroke, Lstroke		]	};
+    key <AC01> { [	    a,	A,     aogonek, Aogonek		]	};
+    key <AC02> { [	    o,	O,      oacute, Oacute		]	};
+    key <AC03> { [	    e,	E,     eogonek, Eogonek		]	};
+    key <AC09> { [	    n,	N,      nacute, Nacute		]	};
+    key <AC10> { [	    s,	S,      sacute, Sacute		]	};
+    key <AB09> { [	    v,	V,      zacute, Zacute		]	};
+    key <AB10> { [	    z,	Z,   zabovedot, Zabovedot	]	};
+    
+    // this to allow writing ALL CAPS with a Shift key
+    include "level3(ralt_switch)"
+
+    // use one of compose:* options to choose Multi_key, if you will,
+    // or layout +level3(ralt_switch_multikey) to revert standard behaviour
+};
+
+// Default Polish keymap with Polish quotes on quotemark key
+partial alphanumeric_keys
+xkb_symbols "pl" {
+    include "pc/dvorak(pl_basic)"
+    
+    key <AD01> { [  apostrophe,	quotedbl, doublelowquotemark, rightdoublequotemark	] };
+
+    // Dead symbols moved to this key
+    key <AE01> { [	    1,	exclam, dead_acute, dead_diaeresis 		]	};
+};
+
+// Polish keymap with Polish quotes on key "1/!"
+partial alphanumeric_keys
+xkb_symbols "pl_altquotes" {
+    include "pc/dvorak(pl_basic)"
+
+    key <AE01> { [	    1,	exclam, doublelowquotemark, rightdoublequotemark	]	};
+};
diff --git a/symbols/dz b/symbols/dz
new file mode 100644
index 00000000..42972aa1
--- /dev/null
+++ b/symbols/dz
@@ -0,0 +1,87 @@
+//
+// Dzongkha / Tibetan layout for Bhutanese keyboard
+//
+/////////////////////////////////////////////////////////////////
+//
+//   Based on the official layout for Dzongkha
+//   approved by the Department of Information Technology &
+//   Dzongkha Development Authority of the Government of Bhutan
+//
+//   Copyright (C) 2004, Gregory Mokhin <mokhin@bog.msu.ru>
+//   Layout map provided by Chris Fynn
+///////////////////////////////////////////////////////////////// 
+//   Version 0.97.     Last modified: 09 Jan 2004
+/////////////////////////////////////////////////////////////////
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+      name[Group1]= "Dzongkha";
+
+      key <TLDE> { [      U0F09, U0F0A, U0F6C, U0F6B ]	};
+      
+// numbers e.a.
+      key <AE01> { [      U0F21, U0F04, 1, exclam ]	};
+      key <AE02> { [      U0F22, U0F05, 2, at     ]	};
+      key <AE03> { [      U0F23, U0F06, 3, numbersign ]	};
+      key <AE04> { [      U0F24, U0F24, 4, dollar  ]	};
+      key <AE05> { [      U0F25, U0F25, 5, percent ]	};
+      key <AE06> { [      U0F26, U0F08, 6, U0F01 ]	};
+      key <AE07> { [      U0F27, U0F38, 7, ampersand ]	};
+      key <AE08> { [      U0F28, U0F34, 8, asterisk ]	};
+      key <AE09> { [      U0F29, U0F3C, 9, parenleft ]	};
+      key <AE10> { [      U0F20, U0F3D, 0, parenright ]	};
+      key <AE11> { [      U0F14, U0F7F, minus, underscore ]	};
+      key <AE12> { [      U0F0D, U0F11, equal, plus ]	};
+
+// consonants ( ka kha ga nga )
+      key <AD01> { [      U0F40, U0F90, U0F88  ]	};
+      key <AD02> { [      U0F41, U0F91, U0F89  ]	};
+      key <AD03> { [      U0F42, U0F92 ]	};
+      key <AD04> { [      U0F44, U0F94, U0F83, U0F82  ]	};
+
+// vowels ( i u e o )
+      key <AD05> { [      U0F72, U0F80, U0F1A  ]	};
+      key <AD06> { [      U0F74, U0F84, U0F1B  ]	};
+      key <AD07> { [      U0F7A, U0F7B, U0F1C  ]	};
+      key <AD08> { [      U0F7C, U0F7D, U0F1D, U0F17  ]	};
+
+// consonants ( ca cha ja nya )
+      key <AD09> { [      U0F45, U0F95, U0F1E, U0F18   ]	};
+      key <AD10> { [      U0F46, U0F96, U0F1F, U0F19   ]	};
+      key <AD11> { [      U0F47, U0F97, bracketleft, U0F3E ]	};
+      key <AD12> { [      U0F49, U0F99, bracketright, U0F3F  ]	};
+
+// consonants ( ta tha da na pa pha ba ma tsa tsha dza wa )
+      key <AC01> { [      U0F4F, U0F9F, U0F4A, U0F9A ]	};
+      key <AC02> { [      U0F50, U0FA0, U0F4B, U0F9B ]	};
+      key <AC03> { [      U0F51, U0FA1, U0F4C, U0F9C ]	};
+      key <AC04> { [      U0F53, U0FA3, U0F4E, U0F9E ]	};
+      key <AC05> { [      U0F54, U0FA4, U2039, U00AB ]	};
+      key <AC06> { [      U0F55, U0FA5, U203A, U00BB ]	};
+      key <AC07> { [      U0F56, U0FA6, U0F37, U0F35 ]	};
+      key <AC08> { [      U0F58, U0FA8, U0F7E ]	};
+      key <AC09> { [      U0F59, U0FA9, U0F39 ]	};
+      key <AC10> { [      U0F5A, U0FAA, colon, semicolon ]	};
+      key <AC11> { [      U0F5B, U0FAB, apostrophe, quotedbl ]	};
+      
+// TODO: BKSL and LSGT are from gb layout, are there any variants?
+      key <BKSL> { [      U0F5D, U0FAD, backslash, U0FBA ]	};
+      key <LSGT> { [      U0F0D, U0F11, U0F10, U0F0F ]	};
+
+// consonants ( zha za 'a ya ra la sha sa ha a )
+      key <AB01> { [      U0F5E, U0FAE, U0F13, U0F36 ]	};
+      key <AB02> { [      U0F5F, U0FAF, U0FBE, U0FBF ]	};
+      key <AB03> { [      U0F60, U0F71, U0F03, U0FB0 ]	};
+      key <AB04> { [      U0F61, U0FB1, U0F12, U0FBB ]	};
+      key <AB05> { [      U0F62, U0FB2, U0F6A, U0FBC ]	};
+      key <AB06> { [      U0F63, U0FB3, U0F8A, U0F88 ]	};
+      key <AB07> { [      U0F64, U0FB4, U0F65, U0FB5 ]	};
+      key <AB08> { [      U0F66, U0FB6, comma, less ]	};
+      key <AB09> { [      U0F67, U0FB7, period, greater ]	};
+      key <AB10> { [      U0F68, U0FB8, slash, question ]	};
+
+// space
+      key <SPCE> { [ U0F0B, space, U0F0C, U00A0 ] };
+
+    include "level3(ralt_switch_multikey)"
+};
diff --git a/symbols/ee b/symbols/ee
new file mode 100644
index 00000000..43daf5c9
--- /dev/null
+++ b/symbols/ee
@@ -0,0 +1,55 @@
+
+// based on
+// Estonian XKB-keymap by Ville Hallik <ville@linux.ee>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/ee,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Estonian keyboard
+    // This layout conforms to both EVS8:1993 and EVS8:2000 standards
+
+    include "pc/latin(type4)"
+
+    name[Group1]="Estonian";
+
+    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
+    key <AE04>	{ [         4,   currency,       dollar,       dollar ]	};
+    key <AE11>	{ [      plus,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [dead_acute, dead_grave,        grave,   apostrophe ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [    otilde,     Otilde,      section,  dead_macron ]	};
+
+    key <AC02>	{ [         s,          S,       scaron,       Scaron ]	};
+    key <AC10>	{ [odiaeresis, Odiaeresis,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,   dead_caron ]	};
+    key <TLDE>	{ [dead_caron, dead_tilde,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [apostrophe,   asterisk,      onehalf,   dead_breve ]	};
+    key <AB01>	{ [         z,          Z,       zcaron,       Zcaron ]	};
+    key <AB08>	{ [     comma,  semicolon,         less,     multiply ]	};
+    key <AB09>	{ [    period,      colon,      greater,     division ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Estonian layout to eliminate all dead keys
+
+    include "pc/ee(basic)"
+
+    key <TLDE>	{ [asciicircum,asciitilde ]	};
+    key <AE12>	{ [apostrophe,      grave ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,       degree ]	};
+    key <AD12>	{ [    otilde,     Otilde,      section,       macron ]	};
+    key <AC10>	{ [odiaeresis, Odiaeresis,        acute,  doubleacute ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,        caron ]	};
+    key <BKSL>	{ [apostrophe,   asterisk,      onehalf,        breve ]	};
+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+};
diff --git a/symbols/el b/symbols/el
new file mode 100644
index 00000000..920019d0
--- /dev/null
+++ b/symbols/el
@@ -0,0 +1,122 @@
+// $XFree86: xc/programs/xkbcomp/symbols/pc/el,v 1.2 2002/11/15 02:26:41 dawes Exp $
+//
+// Hellenic keyboard map for XFree86
+// Original version:
+//	Kostas Gewrgiou <gewrgiou@imbc.gr>
+// Heavily modified and maintained by:
+//	Vasilis Vasaitis <vvas@hal.csd.auth.gr>
+// Originally converted to single group form by:
+//	Ivan Pascal <pascal@info.tsu.ru>
+
+default partial alphanumeric_keys alternate_group
+xkb_symbols "basic" {
+
+    include "pc/el(bare)"
+
+    key <TLDE> {	[     grave,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[     minus,	underscore	]	};
+    key <AE12> {	[     equal,	plus		]	};
+
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+
+    key <AC11> {	[ apostrophe,	quotedbl	]	};
+
+    key <AB08> {	[     comma,	less		]	};
+    key <AB09> {	[    period,	greater		]	};
+    key <AB10> {	[     slash,	question	]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+
+};
+
+hidden partial alphanumeric_keys alternate_group
+xkb_symbols "bare" {
+
+    name[Group1] = "ISO8859-7";
+
+    key <AD01> { [	semicolon,		colon		] };
+    key <AD02> { [	Greek_finalsmallsigma,	Greek_SIGMA	] };
+    key <AD03> { [	Greek_epsilon,		Greek_EPSILON	] };
+    key <AD04> { [	Greek_rho,		Greek_RHO	] };
+    key <AD05> { [	Greek_tau,		Greek_TAU	] };
+    key <AD06> { [	Greek_upsilon,		Greek_UPSILON	] };
+    key <AD07> { [	Greek_theta,		Greek_THETA	] };
+    key <AD08> { [	Greek_iota,		Greek_IOTA	] };
+    key <AD09> { [	Greek_omicron,		Greek_OMICRON	] };
+    key <AD10> { [	Greek_pi,		Greek_PI	] };
+
+    key <AC01> { [	Greek_alpha,		Greek_ALPHA	] };
+    key <AC02> { [	Greek_sigma,		Greek_SIGMA	] };
+    key <AC03> { [	Greek_delta,		Greek_DELTA	] };
+    key <AC04> { [	Greek_phi,		Greek_PHI	] };
+    key <AC05> { [	Greek_gamma,		Greek_GAMMA	] };
+    key <AC06> { [	Greek_eta,		Greek_ETA	] };
+    key <AC07> { [	Greek_xi,		Greek_XI	] };
+    key <AC08> { [	Greek_kappa,		Greek_KAPPA	] };
+    key <AC09> { [	Greek_lamda,		Greek_LAMDA	] };
+    key <AC10> { [	dead_acute,		dead_diaeresis	] };
+
+    key <AB01> { [	Greek_zeta,		Greek_ZETA	] };
+    key <AB02> { [	Greek_chi,		Greek_CHI	] };
+    key <AB03> { [	Greek_psi,		Greek_PSI	] };
+    key <AB04> { [	Greek_omega,		Greek_OMEGA	] };
+    key <AB05> { [	Greek_beta,		Greek_BETA	] };
+    key <AB06> { [	Greek_nu,		Greek_NU	] };
+    key <AB07> { [	Greek_mu,		Greek_MU	] };
+
+    key <LSGT> { [	guillemotleft,		guillemotright	] };
+
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "extended" {
+
+    include "pc/el(basic)"
+
+    key.type = "THREE_LEVEL";
+
+    key <AE05> { [	5,		percent,	EuroSign	] };
+
+    key <AD01> { [	semicolon,	colon,		periodcentered	] };
+    key <AD03> { [	Greek_epsilon,	Greek_EPSILON,	EuroSign	] };
+
+    key <AB08> { [	comma,		less,		guillemotleft	] };
+    key <AB09> { [	period,		greater,	guillemotright	] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "polytonic" {
+
+    include "pc/el(extended)"
+
+    key.type = "THREE_LEVEL";
+
+    key <AD11> { [ 	dead_tilde,	dead_diaeresis,	dead_macron	] };
+    key <AD12> { [	dead_iota,	VoidSymbol,	dead_breve	] };
+
+    key <AC10> { [	dead_acute,		dead_horn	] };
+    key <AC11> { [	dead_grave,		dead_ogonek	] };
+
+};
+
+partial alphanumeric_keys alternate_group
+xkb_symbols "nodeadkeys" {
+
+    include "pc/el(basic)"
+
+    key <AC10> { [	semicolon,		colon		] };
+
+};
+
diff --git a/symbols/en_US b/symbols/en_US
new file mode 100644
index 00000000..d8a34e08
--- /dev/null
+++ b/symbols/en_US
@@ -0,0 +1,22 @@
+
+// based on a keyboard map from an 'xkb/symbols/iso3335-3' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/en_US,v 1.3 2003/01/26 02:01:48 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin"
+    name[Group1]="en_US";
+
+    include "level3(ralt_switch_multikey)"
+};
+
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic iso9995-3 layout to eliminate all dead keys
+
+    include "pc/en_US(basic)"
+    include "pc/latin(nodeadkeys)"
+
+};
diff --git a/symbols/es b/symbols/es
new file mode 100644
index 00000000..38c10175
--- /dev/null
+++ b/symbols/es
@@ -0,0 +1,59 @@
+
+// based on a keyboard
+// Modified for a real Spanish Keyboard by Jon Tombs
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/es,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin(type4)"
+
+    name[Group1]="Spanish";
+
+    key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};
+    key <AE03>	{ [         3, periodcentered, numbersign,   sterling ]	};
+    key <AE04>	{ [         4,     dollar,   asciitilde,       dollar ]	};
+    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};
+    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [exclamdown, questiondown, asciitilde,   asciitilde ]	};
+
+    key <AD11>	{ [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };
+    key <AD12>	{ [      plus,   asterisk, bracketright,  dead_macron ]	};
+
+    key <AC10>	{ [    ntilde, Ntilde,   asciitilde, dead_doubleacute ]	};
+    key <AC11>	{ [dead_acute, dead_diaeresis, braceleft,   braceleft ]	};
+    key <TLDE>	{ [ masculine, ordfeminine,    backslash,   backslash ]	};
+
+    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,   dead_breve ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    include "pc/es(basic)"
+
+    key <AC11>	{ [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ]	};
+    key <AD11>	{ [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    include "pc/es(Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "pc/es(basic)"
+
+    key <AD11>	{ [     grave, asciicircum,  bracketleft,      degree ]	};
+    key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};
+    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde,  doubleacute ]	};
+    key <AC11>	{ [     acute,  diaeresis,    braceleft,    braceleft ]	};
+    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,        breve ]	};
+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+};
diff --git a/symbols/fi b/symbols/fi
new file mode 100644
index 00000000..11e096d4
--- /dev/null
+++ b/symbols/fi
@@ -0,0 +1,73 @@
+// based on a keyboard map from an 'xkb/symbols/fi' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $
+
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    include "pc/latin(type2)"
+    include "pc/fi(fi)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "fi" {
+
+    // a Finnish keyboard with dead key support and all of
+    // ISO-8859-1 and ISO-8859-15 characters available.
+
+    name[Group1]="Finnish";
+
+    key <TLDE> { [ section,    onehalf,     onequarter,   threequarters	] };
+    key <LSGT> { [    less,    greater,            bar,       brokenbar	] };
+    // AltGr+<SPCE> is pressed accidentally too often after AltGr+<LSGT>,
+    // hence AltGr+<SPCE> produces now space, not nobreakspace.
+    key <SPCE> { [   space,      space,          space,    nobreakspace	] };
+    key <AE01> { [       1,     exclam,     exclamdown,     onesuperior	] };
+    key <AE02> { [       2,   quotedbl,             at,     twosuperior	] };
+    key <AE03> { [     	 3, numbersign,       sterling,   threesuperior	] };
+    key <AE04> { [       4,   currency,         dollar,	           cent	] };
+    key <AE05> { [       5,    percent,       EuroSign,	      masculine	] };
+    key <AE06> { [       6,  ampersand,            yen,     ordfeminine	] };
+    key <AE07> { [       7,      slash,      braceleft,       plusminus	] };
+    key <AE08> { [       8,  parenleft,    bracketleft,   guillemotleft	] };
+    key <AE09> { [       9, parenright,   bracketright,  guillemotright	] };
+    key <AE10> { [       0,      equal,     braceright,          degree	] };
+    key <AB09> { [  period,      colon, periodcentered,         notsign	] };
+    key <AB01> { [       z,          Z,         zcaron,	         Zcaron	] };
+    key <AB02> { [       x,          X,       multiply,	       division	] };
+    key <AB03> { [       c,          C,      copyright,	           cent	] };
+    key <AB05> { [       b,          B,         ssharp,        NoSymbol	] };
+    key <AB06> { [       n,          N,         ntilde,	         Ntilde	] };
+    key <AB07> { [       m,          M,             mu,	       NoSymbol	] };
+    key <AB10> { [   minus, underscore,         hyphen,          macron	] };
+    key <AC02> { [       s,          S,         scaron,          Scaron	] };
+    key <AC03> { [       d,          D,            eth,             ETH	] };
+    key <AD03> { [       e,          E,       EuroSign,            cent	] };
+    key <AD04> { [       r,          R,     registered,        NoSymbol	] };
+    key <AD05> { [       t,          T,          thorn,           THORN	] };
+    key <AD10> { [       p,          P,      paragraph,        NoSymbol	] };
+    key <AC10> { [ odiaeresis, Odiaeresis,      oslash,        Ooblique	] };
+    key <AE11> { [    plus,      question,   backslash,    questiondown	] };
+    key	<AC11> { [ adiaeresis, Adiaeresis,         ae,	             AE	] };
+    key <BKSL> { [ apostrophe,   asterisk ] };
+    key <AD11> { [   aring,         Aring,         oe,		     OE	] };
+    key <AE12> { [ dead_acute, dead_grave ] };
+    key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };
+
+    // End alphanumeric section, begin "Keypad"
+    key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
+    // End "Keypad" section
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include "pc/latin(type2)"
+    include "pc/latin(type2_nodeadkeys)"
+    include "pc/fi(fi)"
+
+    key <AE12> { [ acute, grave ] };
+    key <AD12> { [ diaeresis, asciicircum, asciitilde, caron ] };
+};
+
diff --git a/symbols/fo b/symbols/fo
new file mode 100644
index 00000000..d21887ce
--- /dev/null
+++ b/symbols/fo
@@ -0,0 +1,48 @@
+// $XFree86$
+
+partial alphanumeric_keys 
+xkb_symbols "basic" {
+
+    include "pc/latin(type2)"
+
+    name[Group1]= "Faroese";
+
+    key <TLDE>	{ [   onehalf,   section, threequarters,    paragraph ]	};
+    key <LSGT>	{ [      less,    greater,    backslash,      notsign ]	};
+    key <SPCE>	{ [     space,      space, nobreakspace, nobreakspace ] };
+
+    key <AE05>	{ [         5,    percent,     NoSymbol,         cent ] };
+    key <AE06>	{ [         6,  ampersand,          yen,     NoSymbol ] };
+    key <AE11>	{ [      plus,   question,    plusminus, questiondown ] };
+    key <AE12>	{ [dead_acute, dead_grave,          bar,    brokenbar ] };
+
+    key <AB03>	{ [         c,          C,    copyright,     NoSymbol ] };
+    key <AB10>	{ [     minus, underscore,       hyphen,       macron ] };
+
+    key <AC03>	{ [         d,          D,          eth,          ETH ] };
+    key	<AC10>	{ [        ae,	       AE	] };
+    key <AC11>	{ [    oslash,   Ooblique 	] };
+
+    key <AD08>	{ [         i,          I       ] };
+    key <AD11>	{ [     aring,      Aring, dead_diaeresis, dead_circumflex ] };
+    key <AD12>	{ [       eth,        ETH,   dead_tilde,   dead_caron ] };
+
+    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+
+    include "pc/fo(basic)"
+
+    key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};
+    key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};
+    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,       macron ]	};
+    key <AC10>	{ [        ae,         AE,        acute,  doubleacute ]	};
+    key <AC11>	{ [    oslash,   Ooblique,  asciicircum,        caron ]	};
+    key <BKSL>	{ [apostrophe,   asterisk,  doubleacute,     multiply ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
+    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
+};
diff --git a/symbols/fr b/symbols/fr
new file mode 100644
index 00000000..d731f900
--- /dev/null
+++ b/symbols/fr
@@ -0,0 +1,78 @@
+
+// based on a keyboard map from an 'xkb/symbols/fr' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/fr,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin"
+
+    name[Group1]="French";
+
+    key <AE01>	{ [ ampersand,          1,  onesuperior,   exclamdown ]	};
+    key <AE02>	{ [    eacute,          2,   asciitilde,    oneeighth ]	};
+    key <AE03>	{ [  quotedbl,          3,   numbersign,     sterling ]	};
+    key <AE04>	{ [apostrophe,          4,    braceleft,       dollar ]	};
+    key <AE05>	{ [ parenleft,          5,  bracketleft, threeeighths ]	};
+    key <AE06>	{ [     minus,          6,          bar,  fiveeighths ]	};
+    key <AE07>	{ [    egrave,          7,        grave, seveneighths ]	};
+    key <AE08>	{ [underscore,          8,    backslash,    trademark ]	};
+    key <AE09>	{ [  ccedilla,          9,  asciicircum,    plusminus ]	};
+    key <AE10>	{ [    agrave,          0,           at,       degree ]	};
+    key <AE11>	{ [parenright,     degree, bracketright, questiondown ]	};
+    key <AE12>	{ [     equal,       plus,   braceright,  dead_ogonek ]	};
+
+    key <AD01>	{ [         a,          A,           ae,           AE ]	};
+    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [    dollar,   sterling,     currency,  dead_macron ]	};
+
+    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
+    key <AC10>	{ [         m,          M,           mu,    masculine ]	};
+    key <AC11>	{ [    ugrave,    percent, dead_circumflex, dead_caron]	};
+    key <TLDE>	{ [twosuperior, asciitilde,     notsign,      notsign ]	};
+
+    key <BKSL>	{ [  asterisk,         mu,   dead_grave,   dead_breve ]	};
+    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};
+    key <AB07>	{ [     comma,   question,   dead_acute, dead_doubleacute ] };
+    key <AB08>	{ [ semicolon,     period, horizconnector,   multiply ]	};
+    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
+    key <AB10>	{ [    exclam,    section, dead_belowdot, dead_abovedot ] };
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // Modifies the basic French layout to use the Sun dead keys
+
+    include "pc/fr(basic)"
+
+    key <AD11>	{ [SunFA_Circum, SunFA_Diaeresis ]	};
+    key <AB07>	{ [comma,   question,  SunFA_Acute, dead_doubleacute ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+    include "pc/fr(Sundeadkeys)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic French layout to eliminate all dead keys
+
+    include "pc/fr(basic)"
+
+    key <AE12>	{ [     equal,       plus,   braceright,       ogonek ]	};
+    key <AD11>	{ [asciicircum,  diaeresis ]	};
+    key <AD12>	{ [    dollar,   sterling,     currency,       macron ]	};
+    key <AC11>	{ [    ugrave,    percent,  asciicircum,        caron ]	};
+    key <BKSL>	{ [  asterisk,         mu,        grave,        breve ]	};
+    key <AB07>	{ [     comma,   question,        acute,  doubleacute ]	};
+    key <AB10>	{ [    exclam,    section, dead_belowdot,    abovedot ]	};
+};
diff --git a/symbols/fr-latin9 b/symbols/fr-latin9
new file mode 100644
index 00000000..f4676322
--- /dev/null
+++ b/symbols/fr-latin9
@@ -0,0 +1,167 @@
+// Historic Linux French keyboard layout (fr-latin9)
+// Copyright (c) 199x, 2002 Rene Cougnenc (original work)
+//                          Guylhem Aznar <clavier @ externe.net> (maintainer)
+//                          Nicolas Mailhot <Nicolas.Mailhot @ laposte.net>
+//                              (XFree86 submission)
+//
+//  $XFree86: xc/programs/xkbcomp/symbols/pc/fr-latin9,v 1.1 2002/12/20 02:07:11 dawes Exp $
+//
+// This layout has long been distributed and refined outside official channels.
+// To this day it remains more feature-rich and popular than the 'fr' layout.
+//
+// This file is derived from an original version by Guylhem Aznar.  The
+// original version is always available from:
+// http://en.tldp.org/HOWTO/Francophones-HOWTO.html
+// and is distributed under a GPL license.
+//
+// The author has given permission for this derived version to be distributed
+// under the standard XFree86 license. He would like all changes to this
+// version be send to him at <clavier @ externe.net> so he can sync the
+// identically named linux console map (kbd, linux-console) and this
+// fileout-of-tree GPL version.
+//
+// Now follows the keyboard design description in French.
+// (If you can't read it you probably have no business changing this file anyway:)
+//
+// Les accents circonflexes des principales voyelles sont obtenus avec
+// la touche Alt_Gr, les tr�mas sont obtenus par Alt_Gr + Shift.
+//
+//  ____                                     _________ _____________ _______
+// | S A| S = Shift,  A = AltGr + Shift     | Imprime | Arr�t d�fil | Pause |
+// | s a| s = normal, a = AltGr             |  Exec   |             | Halte |
+//  ����                                     ��������� ������������� �������
+//  ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______
+// | � "| 1 �| 2 �| 3 ,| 4 '| 5 "| 6 || 7 �| 8 �| 9 �| 0 �| � �| + �| <--   |
+// | � "| & '| � ~| " #| ' {| ( [| - || � `| _ \| � ^| � @| ) ]| = }|       |
+//  ========================================================================
+// | |<-  | A �| Z �| E �| R �| T �| Y �| U �| I �| O �| P '| " `| $ �|   , |
+// |  ->| | a �| z �| e �| r �| t �| y �| u �| i �| o �| p �| ^ ~| � �| <-' |
+//  ===================================================================�    |
+// |       | Q �| S �| D �| F �| G �| H �| J �| K �| L �| M �| % �| � �|    |
+// | MAJ   | q �| s �| d �| f �| g �| h �| j �| k �| l �| m �| � �| * �|    |
+//  ========================================================================
+// | ^   | >  | W  | X  | C  | V  | B  | N  | ?  | .  | /  | �  |     ^     |
+// | |   | < || w �| x �| c �| v �| b �| n �| , �| ; �| : �| ! �|     |     |
+//  ========================================================================
+// |      |      |      |                       |       |      |     |      |
+// | Ctrl | Meta | Alt  | Space    Nobreakspace | AltGr | Multi|Menu | Ctrl |
+//  ������ ������ ������ ����������������������� ������� ������ ����� ������
+//
+//
+//		Si les touches mortes fonctionnent, utiliser les accents dits
+//		� morts �, i.e. fonctionnant comme l'accent circonflexe & le
+//		tr�ma des machines � �crire ; sont disponibles :
+//
+// (^) : accent circonflexe,
+// Shift+(^) : tr�ma,
+// Shift+AltGr (^) : tilde,
+// AltGr (1) : accent aigu,
+// AltGr (7) : accent grave
+//
+// Pour s'en servir, proc�der comme avec l'accent circonflexe & le tr�ma
+// sur les vielles machines � �crire :
+//
+// AltGr (1) puis e : �
+// Shift+AltGr (1) puis e : � ...
+
+partial default alphanumeric_keys
+
+xkb_symbols "basic" {
+
+    include "pc/latin"
+
+    name[Group1]="fr-latin9";
+
+    key <TLDE>	{ [              oe,              OE, leftdoublequotemark, rightdoublequotemark ] };
+    key <AE01>	{ [       ampersand,               1,          dead_acute,       periodcentered ] };
+    key <AE02>	{ [          eacute,               2,          asciitilde,               Eacute ] };
+    key <AE03>	{ [        quotedbl,               3,          numbersign,              cedilla ] };
+    key <AE04>	{ [      apostrophe,               4,           braceleft,                acute ] };
+    key <AE05>	{ [       parenleft,               5,         bracketleft,            diaeresis ] };
+    key <AE06>	{ [           minus,               6,                 bar,            brokenbar ] };
+    key <AE07>	{ [          egrave,               7,          dead_grave,               Egrave ] };
+    key <AE08>	{ [      underscore,               8,           backslash,               macron ] };
+    key <AE09>	{ [        ccedilla,               9,         asciicircum,             Ccedilla ] };
+    key <AE10>	{ [          agrave,               0,                  at,               Agrave ] };
+    key <AE11>	{ [      parenright,          degree,        bracketright,           ydiaeresis ] };
+    key <AE12>	{ [           equal,            plus,          braceright,       dead_abovering ] };
+
+    key <AD01>	{ [               a,               A,         acircumflex,           adiaeresis ] };
+    key <AD02>	{ [               z,               Z,               aring,                Aring ] };
+    key <AD03>	{ [               e,               E,            EuroSign,                 cent ] };
+    key <AD04>	{ [               r,               R,            ccedilla,             Ccedilla ] };
+    key <AD05>	{ [               t,               T,               thorn,                THORN ] };
+    key <AD06>	{ [               y,               Y,              yacute,               Yacute ] };
+    key <AD07>	{ [               u,               U,         ucircumflex,           udiaeresis ] };
+    key <AD08>	{ [               i,               I,         icircumflex,           idiaeresis ] };
+    key <AD09>	{ [               o,               O,         ocircumflex,           odiaeresis ] };
+    key <AD10>	{ [               p,               P,           paragraph,            quoteleft ] };
+    key <AD11>	{ [ dead_circumflex,  dead_diaeresis,          dead_tilde,           quoteright ] };
+    key <AD12>	{ [          dollar,	    sterling,         ecircumflex,           ediaeresis ] };
+
+    key <AC01>	{ [               q,               Q,         Acircumflex,           Adiaeresis ] };
+    key <AC02>	{ [               s,               S,              oslash,             Ooblique ] };
+    key <AC03>	{ [               d,               D,         Ecircumflex,           Ediaeresis ] };
+    key <AC04>	{ [               f,               F,           plusminus,          ordfeminine ] };
+    key <AC05>	{ [               g,               G,                  ae,                   AE ] };
+    key <AC06>	{ [               h,               H,                 eth,                  ETH ] };
+    key <AC07>	{ [               j,               J,         Ucircumflex,           Udiaeresis ] };
+    key <AC08>	{ [               k,               K,         Icircumflex,           Idiaeresis ] };
+    key <AC09>	{ [               l,               L,         Ocircumflex,           Odiaeresis ] };
+    key <AC10>	{ [               m,               M,         onesuperior,            masculine ] };
+    key <AC11>	{ [          ugrave,         percent,         twosuperior,               Ugrave ] };
+    key <BKSL>  { [        asterisk,              mu,       threesuperior,                  yen ] };
+
+    key <LSGT>	{ [            less,         greater,                 bar                       ] };
+    key <AB01>	{ [               w,               W,       guillemotleft	        	] };
+    key <AB02>	{ [               x,               X,      guillemotright                       ] };
+    key <AB03>	{ [               c,               C,           copyright                       ] };
+    key <AB04>	{ [               v,               V,          registered		        ] };
+    key <AB05>	{ [               b,               B,              ssharp                       ] };
+    key <AB06>	{ [               n,               N,             notsign                       ] };
+    key <AB07>	{ [           comma,        question,        questiondown                       ] };
+    key <AB08>	{ [       semicolon,          period,            multiply		        ] };
+    key <AB09>	{ [           colon,           slash,            division                       ] };
+    key <AB10>	{ [          exclam,         section,          exclamdown                       ] };
+
+    key <SPCE>  { [           space,           space,        nobreakspace                       ] };
+
+    // French uses a comma as decimal separator, but keyboards are labeled with a period
+    // Will take effect when KP_Decimal is mapped to the locale decimal separator
+    key <KPDL>  { [       KP_Delete,          period,           KP_Delete,           KP_Decimal ] };
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // Modifies the basic fr-latin9 layout to use the Sun dead keys
+
+    include "pc/fr-latin9(basic)"
+
+    key <AE01>	{ [       ampersand,               1,         SunFA_Acute,       periodcentered ] };
+    key <AE07>	{ [          egrave,               7,         SunFA_Grave,               Egrave ] };
+    key <AD11>	{ [    SunFA_Circum, SunFA_Diaeresis,         SunFA_Tilde,           quoteright ] };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+
+    include "pc/fr-latin9(Sundeadkeys)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic fr-latin9 layout to eliminate all dead keys
+
+    include "pc/fr-latin9(basic)"
+
+    key <AE01>	{ [       ampersand,               1,          apostrophe,       periodcentered ] };
+    key <AE07>	{ [          egrave,               7,               grave,               Egrave ] };
+    key <AE12>	{ [           equal,            plus,          braceright         	        ] };
+    key <AD11>	{ [	asciicircum,  	   diaeresis,          asciitilde,           quoteright ] };
+};
diff --git a/symbols/fujitsu.vndr/jp b/symbols/fujitsu.vndr/jp
new file mode 100644
index 00000000..bc578ae7
--- /dev/null
+++ b/symbols/fujitsu.vndr/jp
@@ -0,0 +1,88 @@
+// $Xorg: jp,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// Japanese layout for a Fujitsu 140 key keyboard
+
+xkb_symbols {
+    override "fujitsu/us"
+    augment key <AE01> { [],			[ kana_NU	] 	};
+	    key <AE02> { [ 2, quotedbl	],	[ kana_FU	]	};
+	    key <AE03> { [ 3, numbersign ],	[ kana_A, kana_a ]	};
+	    key <AE04> { [ 4, dollar	],	[ kana_U, kana_u ]	};
+    augment key <AE05> { [],		[ kana_E, kana_e ]	};
+	    key <AE06> { [ 6, ampersand	],	[ kana_O, kana_o ]	};
+	    key <AE07> { [ 7, apostrophe ],	[ kana_YA, kana_ya ]	};
+	    key <AE08> { [ 8, parenleft	],	[ kana_YU, kana_yu ]	};
+	    key <AE09> { [ 9, parenright ],	[ kana_YO, kana_yo ]	};
+    replace key <AE10> { [ 0	],		[ kana_WA, kana_WO ]	};
+	    key <AE11> { [ minus, equal	],	[ kana_HO	]	};
+	    key <AE12> { [ asciicircum, asciitilde ], [ kana_HE ]	};
+	    key <BKSL> { [ backslash, bar ],	[ prolongedsound]	};
+    augment key <AD01> { [],			[ kana_TA	]	};
+    augment key <AD02> { [],			[ kana_TE	]	};
+    augment key <AD03> { [],			[ kana_I, kana_i ]	};
+    augment key <AD04> { [],			[ kana_SU	]	};
+    augment key <AD05> { [],			[ kana_KA	]	};
+    augment key <AD06> { [],			[ kana_N	]	};
+    augment key <AD07> { [],			[ kana_NA	]	};
+    augment key <AD08> { [],			[ kana_NI	]	};
+    augment key <AD09> { [],			[ kana_RA	]	};
+    augment key <AD10> { [],			[ kana_SE	]	};
+	    key <AD11> { [ at, grave	],	[ voicedsound	]	};
+	    key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ]	};
+    augment key <AC01> { [],			[ kana_CHI	]	};
+    augment key <AC02> { [],			[ kana_TO	]	};
+    augment key <AC03> { [],			[ kana_SHI	]	};
+    augment key <AC04> { [],			[ kana_HA	]	};
+    augment key <AC05> { [],			[ kana_KI	]	};
+    augment key <AC06> { [],			[ kana_KU	]	};
+    augment key <AC07> { [],			[ kana_MA	]	};
+    augment key <AC08> { [],			[ kana_NO	]	};
+    augment key <AC09> { [],			[ kana_RI	]	};
+	    key <AC10> { [ semicolon, plus ],	[ kana_RE	]	};
+	    key <AC11> { [ colon, asterisk ],	[ kana_KE	]	};
+	    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+    augment key <AB01> { [],			[ kana_TSU, kana_tsu ]	};
+    augment key <AB02> { [],			[ kana_SA	]	};
+    augment key <AB03> { [],			[ kana_SO	]	};
+    augment key <AB04> { [],			[ kana_HI	]	};
+    augment key <AB05> { [],			[ kana_KO	]	};
+    augment key <AB06> { [],			[ kana_MI	]	};
+    augment key <AB07> { [],			[ kana_MO	]	};
+    augment key <AB08> { [],			[ kana_NE, kana_comma ]	};
+    augment key <AB09> { [],			[ kana_RU, kana_fullstop ] };
+    augment key <AB10> { [],			[ kana_ME, kana_conjunctive ] };
+	    key <AB11> { [ underscore	],	[ kana_RO	]	};
+	    key <UNK0> { [ Select	]	}; 
+	    key <UNK1> { [ Massyo	]	}; 
+	    key <UNK2> { [ Touroku	]	}; 
+	    key <UNK3> { [ Zenkaku_Hankaku ]	}; 
+	    key <UNK4> { [ Eisu_Shift	]	};
+	    key <UNK5> { [ Mode_switch	]	};
+	    key <UNK6> { [ Cancel	]	};
+	    key <UNK7> { [ Muhenkan	]	};
+	    key <UNK8> { [ Henkan	]	};
+};
diff --git a/symbols/fujitsu.vndr/us b/symbols/fujitsu.vndr/us
new file mode 100644
index 00000000..e81be028
--- /dev/null
+++ b/symbols/fujitsu.vndr/us
@@ -0,0 +1,145 @@
+// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a Fujitsu 138 key keyboard
+xkb_symbols {
+    include "us(basic)"
+
+    // A few alphanumeric keys are different
+    key <TLDE> { [ grave, asciitilde ]	};
+    key <BKSP> { [ BackSpace	]	};
+    key <BKSL> { [ backslash, bar ]	};
+    key <AB11> { [		]	};
+
+    key <RTSH> { [ Shift_R	]	};
+
+    key <LALT> { [ Alt_L	]	};
+    key <RALT> { [ Alt_R	]	};
+    key <LMTA> { [ Meta_L	]	};
+    key <RMTA> { [ Meta_R	]	};
+    key <LNFD> { [ Linefeed	]	};
+    key <COMP> { [ Multi_key	]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BREA> { [ Break	]	};
+    key <PRSC> { [ Print	]	};
+    key <KNJI> { [ Kanji	]	};
+    key <PAUS> { [ Pause	]	};
+
+    key <FK01> { [ F1		]	};
+    key <FK02> { [ F2		]	};
+    key <FK03> { [ F3		]	};
+    key <FK04> { [ F4		]	};
+    key <FK05> { [ F5		]	};
+    key <FK06> { [ F6		]	};
+    key <FK07> { [ F7		]	};
+    key <FK08> { [ F8		]	};
+    key <FK09> { [ F9		]	};
+    key <FK10> { [ F10		]	};
+    key <FK11> { [ F11		]	};
+    key <FK12> { [ F12		]	};
+    key <FK13> { [ F13		]	};
+    key <FK14> { [ F14		]	};
+    key <FK15> { [ F15		]	};
+    key <FK16> { [ F16		]	};
+    key <FK17> { [ F17		]	};
+    key <FK18> { [ F18		]	};
+    key <FK19> { [ F19		]	};
+    key <FK20> { [ F20		]	};
+    key <FK21> { [ F21		]	};
+    key <FK22> { [ F22		]	};
+    key <FK23> { [ F23		]	};
+    key <FK24> { [ F24		]	};
+    key <FK25> { [ F25		]	};
+    key <FK26> { [ F26		]	};
+    key <FK27> { [ F27		]	};
+    key <FK28> { [ F28		]	};
+    key <FK29> { [ F29		]	};
+    key <FK30> { [ F30		]	};
+    key <FK31> { [ F31		]	};
+    key <FK32> { [ F32		]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <UNDO> { [ Undo		]	};
+    key <COPY> { [ F33		]	};
+    key <PAST> { [ F34		]	};
+    key <CUT>  { [ F35		]	};
+    key <HELP> { [ Help		]	};
+    // End "Editing" section
+
+    // Begin "Cursor" section
+    key <UNK0> { [ 		]	}; 
+    key <UNK1> { [ 		]	}; 
+    key <UNK2> { [ 		]	}; 
+    key <PGUP> { [ Prior	]	}; 
+    key <HOME> { [ Home		]	};
+    key <PGDN> { [ Next		]	}; 
+    key <UNK3> { [ 		]	}; 
+    key <DEL>  { [ Delete	]	}; 
+    key <INS>  { [ Insert	]	}; 
+    key <LEFT> { [ Left		]	};
+    key <RGHT> { [ Right	]	};
+    key <UP>   { [ Up		]	};
+    key <DOWN> { [ Down		]	};
+    key <EXEC> { [ Execute	]	};
+    // End "Cursor" section
+
+    // Begin "Keypad" section
+    key <KPMU> { [ KP_Multiply	]	};
+    key <KPDV> { [ KP_Divide	]	};
+    key <KPAD> { [ KP_Add	]	};
+    key <KPSU> { [ KP_Subtract	]	};
+
+    key  <KP7> { [  KP_7	]	};
+    key  <KP8> { [  KP_8	]	};
+    key  <KP9> { [  KP_9	]	};
+    key <KPEQ> { [ KP_Equal 	]	};
+
+    key  <KP4> { [  KP_4	]	};
+    key  <KP5> { [  KP_5	]	};
+    key  <KP6> { [  KP_6	]	};
+    key <KPDC> { [  KP_Decimal	]	};
+
+    key  <KP1> { [  KP_1	]	};
+    key  <KP2> { [  KP_2	]	};
+    key  <KP3> { [  KP_3	]	};
+    key <KPEN> { [  KP_Enter	]	}; 
+
+    key  <KP0> { [  KP_0	]	};
+    key <KP00> { [  KP_0	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Mode_switch };
+    modifier_map Mod3   	{ Alt_L };
+    modifier_map Mod4   	{ Num_Lock };
+    modifier_map Mod5   	{ F13, F18, F20 };
+};
+
diff --git a/symbols/gb b/symbols/gb
new file mode 100644
index 00000000..d2ec15bc
--- /dev/null
+++ b/symbols/gb
@@ -0,0 +1,61 @@
+
+// based on a keyboard map from an 'xkb/symbols/gb' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/gb,v 1.6 2003/10/04 10:25:14 pascal 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 defined by
+    // the SVR4 European Language Supplement and sometimes also
+    // known as the IBM 166 layout.
+
+    include "pc/latin"
+
+    name[Group1]="Great Britain";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE03>	{ [         3,   sterling, threesuperior,    sterling ]	};
+    key <AE04>	{ [         4,     dollar,     EuroSign,   onequarter ]	};
+
+    key <AC11>	{ [apostrophe,         at, dead_circumflex, dead_caron]	};
+    key <TLDE>	{ [     grave,    notsign,          bar,          bar ]	};
+
+    key <BKSL>	{ [numbersign, asciitilde,   dead_grave,   dead_breve ]	};
+    key <LSGT>	{ [ backslash,        bar,          bar,    brokenbar ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial default alphanumeric_keys 
+xkb_symbols "intl" { 
+
+    // Describes the differences between a very simple en_US 
+    // keyboard and a very simple U.K. keyboard layout with 
+    // dead keys. By Phil Jones (philjones1@blueyonder.co.uk) 
+
+    // Includes the following keys: 
+    // dead_grave 
+    // dead_acute 
+    // dead_circumflex 
+    // dead_tilde 
+    // dead_diaeresis 
+
+    include "pc/latin" 
+
+    name[Group1]="Great Britain"; 
+
+    key <AE02>  { [   2,  dead_diaeresis,      twosuperior,     onehalf ] };
+    key <AE03>  { [   3,        sterling,    threesuperior,    onethird ] };
+    key <AE04>  { [   4,          dollar,         EuroSign,  onequarter ] };
+    key <AE06>  { [   6, dead_circumflex,         NoSymbol,    onesixth ] };
+
+    key <AC11>  { [ dead_acute,         at,     apostrophe,         bar ] };
+    key <TLDE>  { [ dead_grave,    notsign,            bar,         bar ] };
+
+    key <BKSL>  { [ numbersign, dead_tilde,            bar,         bar ] };
+    key <LSGT>  { [  backslash,        bar,            bar,         bar ] };
+
+    include "level3(ralt_switch_multikey)"
+};
diff --git a/symbols/ge_la b/symbols/ge_la
new file mode 100644
index 00000000..62a782d3
--- /dev/null
+++ b/symbols/ge_la
@@ -0,0 +1,52 @@
+
+//  based on
+//  Georgian keyboard map, in the so called "latin" layout.
+//  1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch>
+//
+// $XdotOrg: xc/programs/xkbcomp/symbols/pc/ge_la,v 1.1.4.2 2004/03/05 13:41:33 eich Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/pc/ge_la,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Georgian";
+
+    key <AD01> { [ 0x010010e5,	q		]	};
+    key <AD02> { [ 0x010010ec,	0x010010ed	]	};
+    key <AD03> { [ 0x010010d4,	e		]       };
+    key <AD04> { [ 0x010010e0,	0x010010e6	]	};
+    key <AD05> { [ 0x010010e2,	0x010010d7	]       };
+    key <AD06> { [ 0x010010e7,	y		]       };
+    key <AD07> { [ 0x010010e3,	u		]       };
+    key <AD08> { [ 0x010010d8,	i		]       };
+    key <AD09> { [ 0x010010dd,	o		]       };
+    key <AD10> { [ 0x010010de,	p		]	};
+    key <AD11> { [ bracketleft,	braceleft	]	};
+    key <AD12> { [ bracketright,braceright	]	};
+
+    key <AC01> { [ 0x010010d0,	a		]	};
+    key <AC02> { [ 0x010010e1,	0x010010e8	]       };
+    key <AC03> { [ 0x010010d3,	d		]       };
+    key <AC04> { [ 0x010010e4,	f		]	};
+    key <AC05> { [ 0x010010d2,	g		]       };
+    key <AC06> { [ 0x010010f0,	h		]       };
+    key <AC07> { [ 0x010010ef,	0x010010df	]	};
+    key <AC08> { [ 0x010010d9,	k		]	};
+    key <AC09> { [ 0x010010da,	l		]       };
+    key <AC10> { [ semicolon, colon		]       };
+    key <AC11> { [ apostrophe, quotedbl		]	};
+    key <BKSL> { [ backslash,    bar     	]	};
+
+    key <LSGT> { [ guillemotleft,guillemotright	]       };
+    key <AB01> { [ 0x010010d6,	0x010010eb	]       };
+    key <AB02> { [ 0x010010ee,	x		]       };
+    key <AB03> { [ 0x010010ea,	0x010010e9	]       };
+    key <AB04> { [ 0x010010d5,	v		]       };
+    key <AB05> { [ 0x010010d1,	b		]       };
+    key <AB06> { [ 0x010010dc,	n		]	};
+    key <AB07> { [ 0x010010db,	m		]	};
+    key <AB08> { [ comma,	less		]	};
+    key <AB09> { [ period,	greater		]	};
+    key <AB10> { [ slash,	question	]	};
+
+};
diff --git a/symbols/ge_ru b/symbols/ge_ru
new file mode 100644
index 00000000..4fd347b4
--- /dev/null
+++ b/symbols/ge_ru
@@ -0,0 +1,65 @@
+
+//  based on
+//  Georgian keyboard map, in the so called "russian" layout.
+//  1999, Pablo Saratxaga <srtxg@chanae.alphanet.ch>
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Georgian";
+
+    key <TLDE> { [ asciicircum,	asciitilde	]	};
+    key <AE01> { [         1,    exclam         ]       };
+    key <AE02> { [         2,    at             ]       }; // 2 0xeb 
+    key <AE03> { [         3,    numbersign     ]       }; // 3 0xec
+    key <AE04> { [         4,    semicolon      ]       };
+    key <AE05> { [         5,    colon          ]       };
+    key <AE06> { [         6,    comma          ]       };
+    key <AE07> { [         7,    period         ]       };
+    key <AE08> { [         8,    asterisk       ]       };
+    key <AE09> { [         9,    parenleft      ]       };
+    key <AE10> { [         0,    parenright     ]       };
+    key <AE11> { [     minus,    underscore     ]       };
+    key <AE12> { [ numbersign,   bar            ]       };
+
+    key <AD01> { [ 0x010010e6,	q		]	};
+    key <AD02> { [ 0x010010ea,	w		]	};
+    key <AD03> { [ 0x010010e3,	e		]       };
+    key <AD04> { [ 0x010010d9,	r		]	};
+    key <AD05> { [ 0x010010d4,	t		]       };
+    key <AD06> { [ 0x010010dc,	y		]       };
+    key <AD07> { [ 0x010010d2,	u		]       };
+    key <AD08> { [ 0x010010e8,	i		]       };
+    key <AD09> { [ 0x010010ec,	o		]       };
+    key <AD10> { [ 0x010010d6,	p		]	};
+    key <AD11> { [ 0x010010ee,	bracketleft	]	};
+    key <AD12> { [ 0x010010ef,	bracketright	]	};
+
+    key <AC01> { [ 0x010010e4,	a		]	};
+    key <AC02> { [ 0x010010d7,	s		]       };
+    key <AC03> { [ 0x010010d5,	d		]       };
+    key <AC04> { [ 0x010010d0,	f		]	};
+    key <AC05> { [ 0x010010de,	g		]       };
+    key <AC06> { [ 0x010010e0,	h		]       };
+    key <AC07> { [ 0x010010dd,	j		]	};
+    key <AC08> { [ 0x010010da,	k		]	};
+    key <AC09> { [ 0x010010d3,	l		]       };
+    key <AC10> { [ 0x010010df,	semicolon	]       };
+    key <AC11> { [ 0x010010eb,	percent		]	};
+    key <BKSL> { [ backslash,    bar     	]	}; // 0xe9 0xea
+
+    key <LSGT> { [ guillemotleft,guillemotright	]       }; // 0xab 0xbb 0xe7 0xe8
+    key <AB01> { [ 0x010010ed,	z		]       };
+    key <AB02> { [ 0x010010e9,	x		]       };
+    key <AB03> { [ 0x010010e1,	c		]       };
+    key <AB04> { [ 0x010010db,	v		]       };
+    key <AB05> { [ 0x010010d8,	b		]       };
+    key <AB06> { [ 0x010010e2,	n		]	};
+    key <AB07> { [ 0x010010e5,	m		]	};
+    key <AB08> { [ 0x010010d1,	less		]	};
+    key <AB09> { [ 0x010010e7,	greater		]	};
+    key <AB10> { [ 0x010010f0,	question	]	};
+
+};
diff --git a/symbols/guj b/symbols/guj
new file mode 100644
index 00000000..ca2b1f7a
--- /dev/null
+++ b/symbols/guj
@@ -0,0 +1,69 @@
+
+// based on a keyboard map from an 'xkb/symbols/guj' file
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+      name[Group1]= "Gujarati";
+
+      // Mainly numbers.
+      key <AE01> { [      0x1000AE7, 0x1000A8D 	]	};
+      key <AE02> { [      0x1000AE8, 0x1000AC5 	]	};
+      key <AE03> { [      0x1000AE9 	 	]	};
+      key <AE04> { [      0x1000AEA  	 	]	};
+      key <AE05> { [      0x1000AEB  	 	]	};
+      key <AE06> { [      0x1000AEC  	 	]	};
+      key <AE07> { [      0x1000AED 		]	};
+      key <AE08> { [      0x1000AEE  	 	]	};
+      key <AE09> { [      0x1000AEF, parenleft 	]	};
+      key <AE10> { [      0x1000AE6, parenright ]	};
+      key <AE11> { [      minus,     0x1000A83  ]	};
+      key <AE12> { [      0x1000A8B, 0x1000AC3 	]	};
+
+// Mainly long vowels
+
+      key <AD01> { [      0x1000ACC, 0x1000A94  ]	};
+      key <AD02> { [      0x1000AC8, 0x1000A90  ]	};
+      key <AD03> { [      0x1000ABE, 0x1000A86  ]	};
+      key <AD04> { [      0x1000AC0, 0x1000A88  ]	};
+      key <AD05> { [      0x1000AC2, 0x1000A8A  ]	};
+
+// Mainly voiced consonants
+
+      key <AD06> { [      0x1000AAC, 0x1000AAD 	]	};
+      key <AD07> { [      0x1000AB9, 0x1000A99 	]	};
+      key <AD08> { [      0x1000A97, 0x1000A98 	]	};
+      key <AD09> { [      0x1000AA6, 0x1000AA7 	]	};
+      key <AD10> { [      0x1000A9C, 0x1000A9D 	]	};
+      key <AD11> { [      0x1000AA1, 0x1000AA2 	]	};
+      key <AD12> { [      0x1000ABC, 0x1000A9E 	]	};
+
+// Mainly short vowels
+      key <AC01> { [      0x1000ACB, 0x1000A93	]	};
+      key <AC02> { [      0x1000AC7, 0x1000A8F	]	};
+      key <AC03> { [      0x1000ACD, 0x1000A85  ]	};
+      key <AC04> { [      0x1000ABF, 0x1000A87  ]	};
+      key <AC05> { [      0x1000AC1, 0x1000A89  ]	};
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      0x1000AAA, 0x1000AAB 	]	};
+      key <AC07> { [      0x1000AB0, guj_rra 	]	};
+      key <AC08> { [      0x1000A95, 0x1000A96 	]	};
+      key <AC09> { [      0x1000AA4, 0x1000AA5 	]	};
+      key <AC10> { [      0x1000A9A, 0x1000A9B 	]	};
+      key <AC11> { [      0x1000A9F, 0x1000AA0 	]	};
+      key <BKSL> { [      0x1000AC9, 0x1000A91 	]	};
+
+      key <AB01> { [      z        , Z		]       };
+      key <AB02> { [      0x1000A82, 0x1000A81	]       };
+      key <AB03> { [      0x1000AAE, 0x1000AA3  ]       };
+      key <AB04> { [      0x1000AA8, guj_nnna   ]       };
+      key <AB05> { [      0x1000AB5, guj_llla   ]       };
+      key <AB06> { [      0x1000AB2, 0x1000AB3  ]       };
+      key <AB07> { [      0x1000AB8, 0x1000AB6  ]       };
+      key <AB08> { [      comma,     0x1000AB7  ]       };
+      key <AB09> { [      period,    0x1000964  ]       };
+      key <AB10> { [      0x1000AAF, question   ]       };
+};
diff --git a/symbols/gur b/symbols/gur
new file mode 100644
index 00000000..12a00054
--- /dev/null
+++ b/symbols/gur
@@ -0,0 +1,69 @@
+
+// based on a keyboard map from an 'xkb/symbols/gur' file
+//
+// $XFree86$
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+      name[Group1]= "Gurmukhi";
+
+      // Mainly numbers.
+      key <AE01> { [      0x1000A67 		]	};
+      key <AE02> { [      0x1000A68		]	};
+      key <AE03> { [      0x1000A69 	 	]	};
+      key <AE04> { [      0x1000A6A  	 	]	};
+      key <AE05> { [      0x1000A6B  	 	]	};
+      key <AE06> { [      0x1000A6C  	 	]	};
+      key <AE07> { [      0x1000A6D 		]	};
+      key <AE08> { [      0x1000A6e  	 	]	};
+      key <AE09> { [      0x1000A6F, parenleft 	]	};
+      key <AE10> { [      0x1000A66, parenright ]	};
+      key <AE11> { [      gur_visarga 	 	]	};
+      key <AE12> { [      gur_v_r, gur_v_r_s 	]	};
+
+// Mainly long vowels
+
+      key <AD01> { [      0x1000A4C, 0x1000A14  ]	};
+      key <AD02> { [      0x1000A48, 0x1000A10  ]	};
+      key <AD03> { [      0x1000A3E, 0x1000A06  ]	};
+      key <AD04> { [      0x1000A40, 0x1000A08  ]	};
+      key <AD05> { [      0x1000A42, 0x1000A0A  ]	};
+
+// Mainly voiced consonants
+
+      key <AD06> { [      0x1000A2C, 0x1000A2D 	]	};
+      key <AD07> { [      0x1000A39, 0x1000A19 	]	};
+      key <AD08> { [      0x1000A17, 0x1000A18 	]	};
+      key <AD09> { [      0x1000A26, 0x1000A27 	]	};
+      key <AD10> { [      0x1000A1C, 0x1000A1D 	]	};
+      key <AD11> { [      0x1000A21, 0x1000A22 	]	};
+      key <AD12> { [      0x1000A3C, 0x1000A1E 	]	};
+
+// Mainly short vowels
+      key <AC01> { [      0x1000A4B, 0x1000A13  ]	};
+      key <AC02> { [      0x1000A47, 0x1000A0F  ]	};
+      key <AC03> { [      0x1000A4D, 0x1000A05  ]	};
+      key <AC04> { [      0x1000A3F, 0x1000A07  ]	};
+      key <AC05> { [      0x1000A41, 0x1000A09  ]	};
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      0x1000A2A, 0x1000A2B 	]	};
+      key <AC07> { [      0x1000A30, 0x1000A30 	]	};
+      key <AC08> { [      0x1000A15, 0x1000A16 	]	};
+      key <AC09> { [      0x1000A24, 0x1000A25 	]	};
+      key <AC10> { [      0x1000A1A, 0x1000A1B 	]	};
+      key <AC11> { [      0x1000A1F, 0x1000A20 	]	};
+      key <BKSL> { [      backslash, bar	]	};
+
+      key <AB01> { [		  z, Z		]       };
+      key <AB02> { [      0x1000A02, 0x1000A70  ]       };
+      key <AB03> { [      0x1000A2E, 0x1000A23  ]       };
+      key <AB04> { [      0x1000A28, 0x1000A28  ]       };
+      key <AB05> { [      0x1000A35, 0x1000A35  ]       };
+      key <AB06> { [      0x1000A32, 0x1000A33  ]       };
+      key <AB07> { [      0x1000A38, 0x1000A36  ]       };
+      key <AB08> { [      comma,     less       ]       };
+      key <AB09> { [      period,    0x1000964  ]       };
+      key <AB10> { [      0x1000A2F, question   ]       };
+};
diff --git a/symbols/hp.vndr/us b/symbols/hp.vndr/us
new file mode 100644
index 00000000..18ce8aea
--- /dev/null
+++ b/symbols/hp.vndr/us
@@ -0,0 +1,106 @@
+// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a HP non-PC keyboard
+xkb_symbols "hil" {
+    include "us(basic)"
+
+    // A few alphanumeric keys are different
+    key <TLDE> { [ grave,	asciitilde	]};
+    key <RTSH> { [ Shift_R	]};
+    key <LALT> { [ Meta_L	]};
+    key <RALT> { [ Meta_R	]};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BRK>  { [ Break	]};
+    key <STOP> { [ Cancel	]};
+    key <FK01> { [ F1	]	};
+    key <FK02> { [ F2	]	};
+    key <FK03> { [ F3	]	};
+    key <FK04> { [ F4	]	};
+    key <MENU> { [ Menu	]	};
+    key <SYST> { [ hpSystem	]};
+    key <FK05> { [ F5	]	};
+    key <FK06> { [ F6	]	};
+    key <FK07> { [ F7	]	};
+    key <FK08> { [ F8	]	};
+    key <CLRL> { [ hpClearLine	]};
+    key <CLR>  { [ Clear	]};
+    key <FK09> { [ F9	]	};
+    key <FK10> { [ F10	]	};
+    key <FK11> { [ F11	]	};
+    key <FK12> { [ F12	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Execute, Print	]};
+    key <INSL> { [ hpInsertLine	]};
+    key <DELL> { [ hpDeleteLine	]};
+    key <INSC> { [ hpInsertChar	]};
+    key <DELC> { [ hpDeleteChar	]};
+    key <HOME> { [ Home	]	};
+    key <PGUP> { [ Prior ]	};
+    key <PGDN> { [ Next ]	};
+    key <SELE> { [ Select ]	};
+    key <LEFT> { [ Left	]	};
+    key <DOWN> { [ Down	]	};
+    key <UP>   { [ Up	]	};
+    key <RGHT> { [ Right	]};
+
+    // End "Editing" section, begin "Keypad"
+    key <KPMU> { [ KP_Multiply	]};
+    key <KPDV> { [ KP_Divide	]};
+    key <KPAD> { [ KP_Add	]};
+    key <KPSU> { [ KP_Subtract	]};
+
+    key  <KP7> { [ KP_7	]	};
+    key  <KP8> { [ KP_8	]	};
+    key  <KP9> { [ KP_9	]	};
+    key <KPEN> { [ KP_Enter	]}; 
+
+    key  <KP4> { [ KP_4	]	};
+    key  <KP5> { [ KP_5	]	};
+    key  <KP6> { [ KP_6	]	};
+    key <KPSP> { [ KP_Separator	]};
+
+    key  <KP1> { [ KP_1	]	};
+    key  <KP2> { [ KP_2	]	};
+    key  <KP3> { [ KP_3	]	};
+    key <KPTB> { [ KP_Tab	]}; 
+
+    key  <KP0> { [ KP_0	]	};
+    key <KPDL> { [ KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod1   	{ Meta_L, Meta_R };
+    modifier_map Mod2   	{ Alt_L };
+    modifier_map Mod3   	{ Mode_switch };
+};
+
diff --git a/symbols/hr b/symbols/hr
new file mode 100644
index 00000000..388cb94e
--- /dev/null
+++ b/symbols/hr
@@ -0,0 +1,50 @@
+
+// based on
+// Croatian keyboards
+// by Vlatko Kosturjak (kost at linux.hr)
+// Taken from Slovenian keyboards
+// by Marko Samastur (markos@elite.org) and
+// Primoz Peterlin (primoz.peterlin@biofiz.mf.uni-lj.si)
+//
+// Changelog
+// =========
+// 2003-04-03 Added <KPDL> (Delete/Separator)
+// 2000-02-06 Initial version
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/hr,v 1.3 2003/04/13 18:22:21 dawes Exp $
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin(type3)"
+
+    name[Group1]="Croatian";
+
+    key <AE01>	{ [         1,     exclam,   asciitilde,   dead_tilde ]	};
+    key <AE02>	{ [         2,   quotedbl,   dead_caron,        caron ]	};
+    key <AE03>	{ [         3, numbersign,  asciicircum, dead_circumflex ] };
+    key <AE04>	{ [         4,     dollar,   dead_breve,        breve ]	};
+    key <AE05>	{ [         5,    percent,       degree, dead_abovering ] };
+    key <AE06>	{ [         6,  ampersand,  dead_ogonek,       ogonek ]	};
+    key <AE07>	{ [         7,      slash,        grave,   dead_grave ]	};
+    key <AE08>	{ [         8,  parenleft, dead_abovedot,    abovedot ]	};
+    key <AE09>	{ [         9, parenright,   dead_acute,   apostrophe ]	};
+    key <AE10>	{ [         0,      equal, dead_doubleacute, doubleacute ] };
+    key <AE11>	{ [apostrophe,   question, dead_diaeresis,  diaeresis ]	};
+    key <AE12>	{ [      plus,   asterisk, dead_cedilla,      cedilla ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD11>	{ [    scaron,     Scaron,     division, dead_abovering ] };
+    key <AD12>	{ [   dstroke,    Dstroke,     multiply,  dead_macron ]	};
+
+    key <AC10>	{ [    ccaron,     Ccaron,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [    cacute,     Cacute,       ssharp,   dead_caron ]	};
+    key <TLDE>	{ [dead_cedilla, dead_diaeresis, notsign,     notsign ]	};
+
+    key <BKSL>	{ [    zcaron,     Zcaron,     currency,   dead_breve ]	};
+
+    key <KPDL>	{ [ KP_Delete,  KP_Seprator                           ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
diff --git a/symbols/ie b/symbols/ie
new file mode 100644
index 00000000..09c2c135
--- /dev/null
+++ b/symbols/ie
@@ -0,0 +1,253 @@
+// $XFree86: xc/programs/xkbcomp/symbols/pc/ie,v 1.3 2002/12/31 02:07:04 dawes Exp $
+
+// Irish keyboard map
+
+// Support for Irish (old and new orthography) and English
+// Seamus O Ciardhuain <seoc@cnds.ucd.ie>  (19 December 2002)
+
+// The general idea is to provide the characters in ISO 8859-1,
+// ISO 8859-15, ISO 8859-14, CP1252 and "Extended Latin-8".
+// However, not all are accessible directly because there aren't
+// enough keys; some need deadkeys to access them, others the 
+// "Multi_key" compose sequences.
+
+// Designed to be similar to the layouts used on Windows
+// and the Macintosh.
+
+// Everything is in Group 1 to be compatible with the
+// multi-layout keyboard support in XFree86 4.3.
+
+// The basic layout is a modern keyboard, but dotted consonants are
+// accessible using a deadkey (AltGr+H or AltGr+W).
+// If a proper Clo Gaelach keyboard is needed, then use the layout
+// defined below as ie(CloGaelach), which gives dotted consonants
+// without use of a deadkey.
+
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Modern keyboard for Irish and English
+    //  - acute-accented vowels as AltGr+vowel and AltGr+Shift+vowel
+    //  - euro currency sign as AltGr+4
+    //  - Comhartha Agus (Tironian Sign Et) as AltGr+Shift+7
+    //  - non-breaking space as AltGr+Space and AltGr+Shift+Space
+    //  - matches hardware (keys and engraved symbols) for Irish keyboards
+
+    name[Group1] = "Irish";
+
+    //
+    // Numeric row `1234567890-=
+    //
+    key <TLDE> { [        grave,     notsign,            brokenbar,             NoSymbol ] };
+    key <AE01> { [            1,      exclam,           exclamdown,          onesuperior ] };
+    key <AE02> { [            2,    quotedbl,            trademark,          twosuperior ] };
+    key <AE03> { [            3,    sterling,            copyright,        threesuperior ] };
+    key <AE04> { [            4,      dollar,             EuroSign,                 cent ] };
+    key <AE05> { [            5,     percent,              section,               dagger ] };
+    key <AE06> { [            6, asciicircum,      dead_circumflex,            0x1002030 ] };
+                                                                         // per thousand
+    key <AE07> { [            7,   ampersand,            paragraph,            0x100204A ] };
+                                                                          // Tironian Et
+    key <AE08> { [            8,    asterisk,       dead_diaeresis,   enfilledcircbullet ] };
+    key <AE09> { [            9,   parenleft,          ordfeminine,       periodcentered ] };
+    key <AE10> { [            0,  parenright,            masculine,               degree ] };
+    key <AE11> { [        minus,  underscore,               endash,               emdash ] };
+    key <AE12> { [        equal,        plus,             notequal,            plusminus ] };
+
+    //
+    // QWERTYUIOP[]
+    //
+    key <AD01> { [            q,           Q,                   oe,                   OE ] };
+    key <AD02> { [            w,           W,        dead_abovedot,        dead_abovedot ] };
+    key <AD03> { [            e,           E,               eacute,               Eacute ] };
+    key <AD04> { [            r,           R,           registered,            0x1002030 ] };
+                                                                         // per thousand
+    key <AD05> { [            t,           T,                thorn,                THORN ] };
+    key <AD06> { [            y,           Y,                  yen,                   mu ] };
+    key <AD07> { [            u,           U,               uacute,               Uacute ] };
+    key <AD08> { [            i,           I,               iacute,               Iacute ] };
+    key <AD09> { [            o,           O,               oacute,               Oacute ] };
+    key <AD10> { [            p,           P,   singlelowquotemark,             NoSymbol ] };
+    key <AD11> { [  bracketleft,   braceleft,  leftdoublequotemark, rightdoublequotemark ] };
+    key <AD12> { [ bracketright,  braceright,  leftsinglequotemark, rightsinglequotemark ] };
+
+    //
+    // ASDFGHJKL;'#
+    //
+    key <AC01> { [          a,             A,               aacute,               Aacute ] };
+    key <AC02> { [          s,             S,               ssharp,             NoSymbol ] };
+    key <AC03> { [          d,             D,                  eth,                  ETH ] };
+    key <AC04> { [          f,             F,            0x1000192,             NoSymbol ] };
+                                                    // f with hook
+    key <AC05> { [          g,             G,            copyright,             NoSymbol ] };
+    key <AC06> { [          h,             H,        dead_abovedot,        dead_abovedot ] };
+    key <AC07> { [          j,             J,             idotless,           onequarter ] };
+    key <AC08> { [          k,             K,       dead_abovering,              onehalf ] };
+    key <AC09> { [          l,             L,                acute,        threequarters ] };
+    key <AC10> { [  semicolon,         colon,             ellipsis,         doubledagger ] };
+    key <AC11> { [ apostrophe,            at,                   ae,                   AE ] };
+    key <BKSL> { [ numbersign,    asciitilde,        guillemotleft,       guillemotright ] };
+                                                                  
+
+    //
+    // \ZXCVBNM,./
+    //
+    key <LSGT> { [  backslash,           bar,           dead_grave,           dead_acute ] };
+    key <AB01> { [          z,             Z,     leftanglebracket,    rightanglebracket ] };
+    key <AB02> { [          x,             X,             multiply,          approximate ] };
+    key <AB03> { [          c,             C,         dead_cedilla,              cedilla ] };
+    key <AB04> { [          v,             V,           dead_caron,             NoSymbol ] };
+    key <AB05> { [          b,             B,            diaeresis,             NoSymbol ] };
+    key <AB06> { [          n,             N,           dead_tilde,             NoSymbol ] };
+    key <AB07> { [          m,             M,               macron,             NoSymbol ] };
+    key <AB08> { [      comma,          less,        lessthanequal,   doublelowquotemark ] };
+    key <AB09> { [     period,       greater,     greaterthanequal,   singlelowquotemark ] };
+    key <AB10> { [      slash,      question,             division,         questiondown ] };
+
+
+    key <SPCE> { [      space,         space,         nobreakspace,         nobreakspace ] };
+
+    include "level3(ralt_switch)"
+
+    // NB: putting Shift+<RALT> as Multi_key gives odd behaviour since the
+    // order of pressing keys affects the result.
+
+    key <RWIN> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "laptop" {
+    // For laptops which don't have the RWIN key but are otherwise
+    // the same as 105-key layouts.
+    include "ie(basic)"
+    key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "CloGaelach" {
+
+    // Adds support for Clo Gaelach (old orthography for Irish).
+    // Changes from "basic":
+    //  - dotted consonants as AltGr+consonant or AltGr+Shift+consonant (TPSDFGCBM)
+    //  - long lowercase r as AltGr+R
+    //  - long lowercase s as AltGr+Z
+    //  - long lowercase s dotted as AltGr+Shift+Z
+    //  - some symbols moved around to retain them
+    //  - several characters unlikely to be used are lost
+    // The long letters are needed only where the font provides
+    // both the long and short forms as different glyphs.
+
+    include "ie(basic)"
+
+    name[Group1] = "Irish (Clo Gaelach)";
+
+    key <TLDE> { [     grave, notsign,  brokenbar,       ssharp ] };
+    key <AD04> { [         r,       R,  0x100027C,   registered ] };
+                                        // long r
+    key <AD05> { [         t,       T,  tabovedot,    Tabovedot ] };
+    key <AD10> { [         p,       P,  pabovedot,    Pabovedot ] };
+
+    key <AC02> { [         s,       S,  sabovedot,    Sabovedot ] };
+    key <AC03> { [         d,       D,  dabovedot,    Dabovedot ] };
+    key <AC04> { [         f,       F,  fabovedot,    Fabovedot ] };
+    key <AC05> { [         g,       G,  gabovedot,    Gabovedot ] };
+
+    key <AB01> { [         z,       Z,  0x100017F,    0x1001E9B ] };
+                                        // long s,   long s dot
+    key <AB03> { [         c,       C,  cabovedot,    Cabovedot ] };
+    key <AB05> { [         b,       B,  babovedot,    Babovedot ] };
+    key <AB07> { [         m,       M,  mabovedot,    Mabovedot ] };
+
+    key <LSGT> { [ backslash,     bar, dead_grave, dead_cedilla ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "CloGaelachLaptop" {
+    // For laptops which don't have the RWIN key but are otherwise
+    // the same as 105-key layouts.
+    include "ie(CloGaelach)"
+    key <MENU> { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "UnicodeExpert" {
+
+// This should eventually be a "Unicode Expert" layout like the Mac one.
+
+    name[Group1] = "Irish (Unicode Expert)";
+
+    //
+    // Numeric row `1234567890-=
+    //
+    key <TLDE> { [        grave,     notsign,        0x10000A6,        0x10000A6 ] };
+                                                 // broken bar
+    key <AE01> { [            1,      exclam,         NoSymbol,         NoSymbol ] };
+    key <AE02> { [            2,    quotedbl, dead_doubleacute, dead_doubleacute ] };
+    key <AE03> { [            3,    sterling,         NoSymbol,         NoSymbol ] };
+    key <AE04> { [            4,      dollar,         EuroSign,         EuroSign ] };
+    key <AE05> { [            5,     percent,         NoSymbol,         NoSymbol ] };
+    key <AE06> { [            6, asciicircum,  dead_circumflex,  dead_circumflex ] };
+    key <AE07> { [            7,   ampersand,        0x100204A,        0x100204A ] };
+                                                // Tironian Et
+    key <AE08> { [            8,    asterisk,   dead_abovering,   dead_abovering ] };
+    key <AE09> { [            9,   parenleft,       dead_breve,       dead_breve ] };
+    key <AE10> { [            0,  parenright,      dead_ogonek,      dead_ogonek ] };
+    key <AE11> { [        minus,  underscore,      dead_macron,      dead_macron ] };
+    key <AE12> { [        equal,        plus,         NoSymbol,         NoSymbol ] };
+
+    //
+    // QWERTYUIOP[]
+    //
+    key <AD01> { [            q,           Q,        NoSymbol,       NoSymbol ] };
+    key <AD02> { [            w,           W,        NoSymbol,       NoSymbol ] };
+    key <AD03> { [            e,           E,          eacute,         Eacute ] };
+    key <AD04> { [            r,           R,       0x100027C,      0x100027C ] };
+                                                    // long r
+    key <AD05> { [            t,           T,        NoSymbol,       NoSymbol ] };
+    key <AD06> { [            y,           Y,        NoSymbol,       NoSymbol ] };
+    key <AD07> { [            u,           U,          uacute,         Uacute ] };
+    key <AD08> { [            i,           I,          iacute,         Iacute ] };
+    key <AD09> { [            o,           O,          oacute,         Oacute ] };
+    key <AD10> { [            p,           P,        NoSymbol,       NoSymbol ] };
+    key <AD11> { [  bracketleft,   braceleft,       dead_hook,      dead_hook ] };
+    key <AD12> { [ bracketright,  braceright,       dead_horn,      dead_horn ] };
+
+    //
+    // ASDFGHJKL;'#
+    //
+    key <AC01> { [          a,             A,          aacute,         Aacute ] };
+    key <AC02> { [          s,             S,        NoSymbol,       NoSymbol ] };
+    key <AC03> { [          d,             D,        NoSymbol,       NoSymbol ] };
+    key <AC04> { [          f,             F,        NoSymbol,       NoSymbol ] };
+    key <AC05> { [          g,             G,        NoSymbol,       NoSymbol ] };
+    key <AC06> { [          h,             H,   dead_abovedot,  dead_abovedot ] };
+    key <AC07> { [          j,             J,        NoSymbol,       NoSymbol ] };
+    key <AC08> { [          k,             K,        NoSymbol,       NoSymbol ] };
+    key <AC09> { [          l,             L,        NoSymbol,       NoSymbol ] };
+    key <AC10> { [  semicolon,         colon,  dead_diaeresis, dead_diaeresis ] };
+    key <AC11> { [ apostrophe,            at,      dead_acute,     dead_acute ] };
+    key <BKSL> { [ numbersign,    asciitilde,      dead_tilde,     dead_tilde ] };
+
+    //
+    // \ZXCVBNM,./
+    //
+    key <LSGT> { [  backslash,           bar,      dead_grave,     dead_grave ] };
+    key <AB01> { [          z,             Z,       0x100017F,      0x1001E9B ] };
+                                                    // long s,     long s dot
+    key <AB02> { [          x,             X,        NoSymbol,       NoSymbol ] };
+    key <AB03> { [          c,             C,        NoSymbol,       NoSymbol ] };
+    key <AB04> { [          v,             V,      dead_caron,     dead_caron ] };
+    key <AB05> { [          b,             B,        NoSymbol,       NoSymbol ] };
+    key <AB06> { [          n,             N,        NoSymbol,       NoSymbol ] };
+    key <AB07> { [          m,             M,        NoSymbol,       NoSymbol ] };
+    key <AB08> { [      comma,          less,    dead_cedilla,   dead_cedilla ] };
+    key <AB09> { [     period,       greater,   dead_abovedot,  dead_abovedot ] };
+    key <AB10> { [      slash,      question,   dead_belowdot,  dead_belowdot ] };
+
+    key <SPCE> { [      space,         space,           space,   nobreakspace ] };
+
+    include "level3(ralt_switch)"
+
+    key <RWIN>  { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ]  };
+};
diff --git a/symbols/il b/symbols/il
new file mode 100644
index 00000000..0a3386b5
--- /dev/null
+++ b/symbols/il
@@ -0,0 +1,154 @@
+
+// based on a keyboard map from an 'xkb/symbols/il' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/il,v 1.3 2003/01/07 02:03:44 dawes Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // uses the kbd layout in use in Israel.
+
+    name[Group1]= "Israelian";
+
+    key <TLDE> { [ semicolon,	asciitilde	]	};
+
+    key <AD01> { [ slash,	Q		]	};
+    key <AD02> { [ apostrophe,	W		]	};
+    key <AD03> { [ hebrew_qoph,	E		]       };
+    key <AD04> { [ hebrew_resh,	R		]	};
+    key <AD05> { [ hebrew_aleph,T		]       };
+    key <AD06> { [ hebrew_tet,	Y		]       };
+    key <AD07> { [ hebrew_waw,	U		]       };
+    key <AD08> { [ hebrew_finalnun,	I	]       };
+    key <AD09> { [ hebrew_finalmem,	O	]       };
+    key <AD10> { [ hebrew_pe,	P		]	};
+
+    key <AC01> { [ hebrew_shin,	A		]	};
+    key <AC02> { [ hebrew_dalet,S		]       };
+    key <AC03> { [ hebrew_gimel,D		]       };
+    key <AC04> { [ hebrew_kaph,	F		]	};
+    key <AC05> { [ hebrew_ayin,	G		]       };
+    key <AC06> { [ hebrew_yod,	H		]       };
+    key <AC07> { [ hebrew_chet,	J		]	};
+    key <AC08> { [ hebrew_lamed, K		]	};
+    key <AC09> { [ hebrew_finalkaph,	L	]       };
+    key <AC10> { [ hebrew_finalpe,	colon	]       };
+    key <AC11> { [ comma,	quotedbl	]	};
+
+    key <AB01> { [ hebrew_zain,	Z		]       };
+    key <AB02> { [ hebrew_samech, X		]       };
+    key <AB03> { [ hebrew_bet,	C		]       };
+    key <AB04> { [ hebrew_he,	V		]       };
+    key <AB05> { [ hebrew_nun,	B		]       };
+    key <AB06> { [ hebrew_mem,	N		]	};
+    key <AB07> { [ hebrew_zade,	M		]	};
+    // Mirrored:
+    key <AB08> { [ hebrew_taw,	greater		]	};
+    key <AB09> { [ hebrew_finalzade,	less	]	};
+    key <AB10> { [ period,	question	]	};
+
+    // Note the parens mirroring below:
+    key <AD11> { [ bracketright,	braceright	]       };
+    key <AD12> { [ bracketleft,	braceleft	]       };
+    key <AE09> { [ 9         ,	parenright	]       };
+    key <AE10> { [ 0         ,	parenleft	]       };
+    key <BKSL> { [ backslash,    bar             ]       };
+};
+
+
+// nikud patter based on Dekel Tsur's Hebrew mapping for LyX
+partial alphanumeric_keys 
+xkb_symbols "lyx" {
+    name[Group1]= "Israelian";
+
+    key <TLDE> { [ semicolon,	asciitilde	]	};
+    // On some key (e.g. AD01, right below) there is not yet mapping for the
+    // second shift level. Since I could not figure a simple way to map this
+    // to "emit nothing", it is currently mapped to the same letter of the
+    // first shift level (avoiding mapping may risk it be used by a character
+    // from a different group).
+    key <AD01> { [ slash,	slash		]       };
+    key <AD02> { [ apostrophe,	apostrophe	]       };
+    key <AD03> { [ hebrew_qoph,	0x10005b8	]	}; // Qamats
+    key <AD04> { [ hebrew_resh,	0x10005bc	]       }; // Dagesh/Shuruq
+    key <AD05> { [ hebrew_aleph,	0x100200e	]       }; // LRM
+    key <AD06> { [ hebrew_tet,	0x100200f	]       }; // RLM
+    key <AD07> { [ hebrew_waw,	0x10005b9	]       }; // Holam
+    key <AD08> { [ hebrew_finalnun,hebrew_finalnun]      };
+    key <AD09> { [ hebrew_finalmem,hebrew_finalmem]      };
+    key <AD10> { [ hebrew_pe,	0x10005b7	]	}; // Patah
+
+    key <AC01> { [ hebrew_shin,	0x10005b0	]	}; // Sheva
+    key <AC02> { [ hebrew_dalet,	0x10005bc	]       }; // Dagesh/Shuruq
+    key <AC03> { [ hebrew_gimel,	hebrew_gimel	]       };
+    key <AC04> { [ hebrew_kaph,	hebrew_kaph	]	}; 
+    key <AC05> { [ hebrew_ayin,	0x10005c2	]       }; // Sin dot
+    key <AC06> { [ hebrew_yod,	0x10005c1	]       }; // Shin dot
+    key <AC07> { [ hebrew_chet,	0x10005b4	]	}; // Hiriq
+    key <AC08> { [ hebrew_lamed, 0x10020aa	]	}; // NIS
+    key <AC09> { [ hebrew_finalkaph,hebrew_finalkaph]    };
+    key <AC10> { [ hebrew_finalpe,	colon	]       };
+    key <AC11> { [ comma,	quotedbl	]	};
+
+    key <AB01> { [ hebrew_zain,	hebrew_zain	]       };
+    key <AB02> { [ hebrew_samech,0x10005b6	]       }; // Segol
+    key <AB03> { [ hebrew_bet,	0x10005bb	]       }; // Qubuts
+    key <AB04> { [ hebrew_he,	0x10005b1	]       }; // H. Segol
+    key <AB05> { [ hebrew_nun,	0x10005b2	]	}; // H. Patah
+    key <AB06> { [ hebrew_mem,	0x10005b3	]       }; // H.  Qamats
+    key <AB07> { [ hebrew_zade,	0x10005b5	]	}; // Tsere
+    key <AB08> { [ hebrew_taw,	greater		]	};
+    key <AB09> { [ hebrew_finalzade,	less	]	};
+    key <AB10> { [ period,	question	]	};
+
+    // Note the parens mirroring below:
+    key <AD11> { [ bracketright,	braceright	]       };
+    key <AD12> { [ bracketleft,	braceleft	]       };
+    key <AE09> { [ 9         ,	parenright	]       };
+    key <AE10> { [ 0         ,	parenleft	]       };
+    
+    key <AE11> { [     minus,	0x10005be	]	}; // H. Hiphen
+};
+
+
+
+// This is a partial implemetation of the Israeli standard SI-1452
+// It does not implement changes to the English layout ("Alt-English"), 
+// as I believe that it is not the job of this layout to modify the English
+// layout. 
+partial alphanumeric_keys 
+xkb_symbols "si1452" {
+    name[Group1]= "Israelian";
+
+    include "pc/il(basic)"
+    
+    key.type = "THREE_LEVEL";
+    
+    key <TLDE> { [ semicolon,	asciitilde,0x10005b0	]}; // Sheva
+    key <AB10> { [ period,	question,  0x10005c3	]}; // Sof Pasuq
+  
+    // The following may get overriden by the iso9995-3(basic101) symbols.
+    // therefore they are included here. 
+    // Including them isn't a great idea (for instance: what if group 1 uses
+    // UK keyboard mapping, and maps shift-3 to sterling? This mapping won't
+    // preserve that, and I'm not sure that this is a good feature.
+    key <AE01> { [     1, exclam      , 0x10005b1	]}; // H. Segol
+    key <AE02> { [     2, at          , 0x10005b2	]}; // H. Patah
+    key <AE03> { [     3, numbersign  , 0x10005b3	]}; // H.  Qamats
+    key <AE04> { [     4, dollar      , 0x10005b4	]}; // Hiriq
+    key <AE05> { [     5, percent     , 0x10005b5	]}; // Tsere
+    key <AE06> { [     6, asciicircum , 0x10005b6	]}; // Segol
+    key <AE07> { [     7, ampersand   , 0x10005b7	]}; // Patah
+    key <AE08> { [     8, asterisk    , 0x10005b8	]}; // Qamats
+    // Mirrored!: 
+    key <AE09> { [     9, parenright   , 0x10005c2	]}; // Sin dot
+    key <AE10> { [     0, parenleft  , 0x10005c1	]}; // Shin dot
+    key <AE11> { [ minus, underscore  , 0x10005b9	]}; // Holam
+    key <AE12> { [ equal, plus        , 0x10005bc	]}; // Dagesh/Shuruq
+  
+    // Mirrored!: 
+    key <AD11> { [ bracketright, braceright, 0x10005bf	]}; // Rafe
+    key <AD12> { [ bracketleft,  braceleft,  0x10005bd	]}; // Meteg
+                                      
+    key <BKSL> { [ backslash,    backslash,  0x10005bb	]}; // Qubuts
+};
diff --git a/symbols/il_phonetic b/symbols/il_phonetic
new file mode 100644
index 00000000..b16c9354
--- /dev/null
+++ b/symbols/il_phonetic
@@ -0,0 +1,46 @@
+
+// based on a keyboard map from an 'xkb/symbols/il_phonetic' file
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // uses the phonetic layout from old Slackware 'il.map' file
+
+    name[Group1]= "Israelian(phonetic)";
+
+    key <AE12> {        [     equal,    plus            ],
+			[ hebrew_doublelowline, hebrew_doublelowline ]};
+
+    key <LatQ> {	[ hebrew_qoph, hebrew_qoph	]	};
+    key <LatW> {	[ hebrew_waw, hebrew_waw	]	};
+    key <LatE> {	[ hebrew_aleph, hebrew_aleph	]       };
+    key <LatR> {	[ hebrew_resh, hebrew_resh	]	};
+    key <LatT> {	[ hebrew_taw, hebrew_tet	]       };
+    key <LatY> {	[ hebrew_ayin, hebrew_ayin	]       };
+    key <LatU> {	[ hebrew_waw, hebrew_waw	]       };
+    key <LatI> {	[ hebrew_yod, hebrew_yod	]       };
+    key <LatO> {	[ hebrew_samech, hebrew_samech	]       };
+    key <LatP> {	[ hebrew_pe, hebrew_finalpe	]	};
+
+    key <LatA> {	[ hebrew_aleph, hebrew_aleph	]	};
+    key <LatS> {	[ hebrew_shin, hebrew_shin	]       };
+    key <LatD> {	[ hebrew_dalet, hebrew_dalet	]       };
+    key <LatF> {	[ hebrew_pe, hebrew_finalpe	]	};
+    key <LatG> {	[ hebrew_gimel, hebrew_gimel	]       };
+    key <LatH> {	[ hebrew_he, hebrew_he		]       };
+    key <LatJ> {	[ hebrew_yod, hebrew_yod	]	};
+    key <LatK> {	[ hebrew_kaph, hebrew_finalkaph	]	};
+    key <LatL> {	[ hebrew_lamed, hebrew_lamed	]       };
+
+    key <LatZ> {	[ hebrew_zain, hebrew_zain	]       };
+    key <LatX> {	[ hebrew_chet, hebrew_chet	]       };
+    key <LatC> {	[ hebrew_zade, hebrew_finalzade	]       };
+    key <LatV> {	[ hebrew_waw, hebrew_waw	]       };
+    key <LatB> {	[ hebrew_bet, hebrew_bet	]       };
+    key <LatN> {	[ hebrew_nun, hebrew_finalnun	]	};
+    key <LatM> {	[ hebrew_mem, hebrew_finalmem	]	};
+};
+
+
diff --git a/symbols/ir b/symbols/ir
new file mode 100644
index 00000000..b92a9c95
--- /dev/null
+++ b/symbols/ir
@@ -0,0 +1,69 @@
+
+// based on
+// Iranian keymap, by Robert Brady <robert@suse.co.uk>
+// Data supplied by Roozbeh Pournader <roozbeh@sharif.edu>
+// Minor changes made by Arash Zeini <a.zeini@farsikde.com>,
+//   and Roozbeh Pournader.
+// Last update: 2002-06-19
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+      name[Group1]= "Iranian";
+
+      key <TLDE> { [	0x100200d	]	};
+
+      // Mainly numbers.
+      key <AE01> { [ 0x10006f1, exclam		]	};
+      key <AE02> { [ 0x10006f2, 0x100066c	]	};
+      key <AE03> { [ 0x10006f3, 0x100066b	]	};
+      key <AE04> { [ 0x10006f4, 0x100fdfc	]	};
+      key <AE05> { [ 0x10006f5, 0x100066a	]	};
+      key <AE06> { [ 0x10006f6, multiply	]	};
+      key <AE07> { [ 0x10006f7, Arabic_comma	]	};
+      key <AE08> { [ 0x10006f8, asterisk	]	};
+      key <AE09> { [ 0x10006f9, parenright	]	};
+      key <AE10> { [ 0x10006f0, parenleft	]	};
+      key <AE11> { [ minus, Arabic_tatweel	]	};
+      key <AE12> { [ equal, plus  		]	};
+
+      key <AD01> { [  Arabic_dad, Arabic_sukun   	]	};
+      key <AD02> { [  Arabic_sad, Arabic_dammatan 	]	};
+      key <AD03> { [  Arabic_theh, Arabic_kasratan 	]	};
+      key <AD04> { [  Arabic_qaf, Arabic_fathatan 	]	};
+      key <AD05> { [  Arabic_feh, Arabic_damma 		]	};
+      key <AD06> { [  Arabic_ghain, Arabic_kasra 	]	};
+      key <AD07> { [  Arabic_ain, Arabic_fatha		]	};
+      key <AD08> { [  Arabic_heh, Arabic_shadda 	]	};
+      key <AD09> { [  Arabic_khah, bracketright 	]	};
+      key <AD10> { [  Arabic_hah, bracketleft		]	};
+      key <AD11> { [  Arabic_jeem, braceright		]	};
+      key <AD12> { [  0x1000686, braceleft  		]	};
+
+      key <AC01> { [  Arabic_sheen, Arabic_hamzaonwaw	]	};
+      key <AC02> { [  Arabic_seen,  Arabic_hamzaonyeh	]	};
+      key <AC03> { [  0x10006cc, Arabic_yeh 		]	};
+      key <AC04> { [  Arabic_beh,  Arabic_hamzaunderalef]	};
+      key <AC05> { [  Arabic_lam, Arabic_hamzaonalef 	]	};
+      key <AC06> { [  Arabic_alef, Arabic_maddaonalef	]	};
+      key <AC07> { [  Arabic_teh,  Arabic_tehmarbuta	]	};
+      key <AC08> { [  Arabic_noon, guillemotright	]	};
+      key <AC09> { [  Arabic_meem,  guillemotleft 	]	};
+      key <AC10> { [  0x10006a9, colon			]	};
+      key <AC11> { [  0x10006af, Arabic_semicolon	]	};
+
+      key <BKSL> { [  backslash, bar    	]	};
+      key <SPCE> { [  space, 0x100200c		]	};
+
+      key <AB01> { [  Arabic_zah, Arabic_kaf   	]	};
+      key <AB02> { [  Arabic_tah 		]	};
+      key <AB03> { [  Arabic_zain, 0x1000698	]	};
+      key <AB04> { [  Arabic_ra 		]	};
+      key <AB05> { [  Arabic_thal, 0x100200c 	]	};
+      key <AB06> { [  Arabic_dal 		]	};
+      key <AB07> { [  0x100067e, Arabic_hamza	]	};
+      key <AB08> { [  Arabic_waw, greater	]	};
+      key <AB09> { [  period, less		]	};
+      key <AB10> { [  slash, Arabic_question_mark ]	};
+};
diff --git a/symbols/is b/symbols/is
new file mode 100644
index 00000000..a04ad183
--- /dev/null
+++ b/symbols/is
@@ -0,0 +1,64 @@
+
+// based on
+// XKB keyboard by Hrafnkell Eiriksson - hkelle@rhi.hi.is
+//     fixes by Olafur Osvaldsson - oli@isnic.is
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/is,v 1.3 2002/11/26 01:57:25 dawes Exp $
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin(type4)"
+
+    name[Group1]="Icelandic";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
+    key <AE11>	{ [odiaeresis, Odiaeresis,    backslash, questiondown ]	};
+    key <AE12>	{ [     minus, underscore,     ccedilla,  dead_ogonek ]	};
+
+    key <AD11>	{ [       eth,        ETH, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};
+
+    key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };
+    key <AC11>	{ [dead_acute, Adiaeresis, dead_circumflex, dead_caron]	};
+    key <TLDE>	{ [    degree,  diaeresis,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [      plus,   asterisk,        grave,   dead_breve ]	};
+    key <AB10>	{ [     thorn,      THORN, dead_belowdot, dead_abovedot ] };
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    // modify the default Icelandic layout to use Sun dead keys
+
+    include "pc/is(basic)"
+
+    key <TLDE>	{ [SunFA_Circum,     degree,      notsign,    notsign ]	};
+    key <AE12>	{ [SunFA_Acute, SunFA_Grave, SunFA_Cedilla, SunFA_Cedilla ] };
+    key <AD11>	{ [udiaeresis, Udiaeresis, SunFA_Diaeresis, SunFA_Diaeresis ] };
+    key <AD12>	{ [      plus,   asterisk,  SunFA_Tilde,  dead_macron ]	};
+    key <AC10>	{ [odiaeresis, Odiaeresis,  SunFA_Acute,  SunFA_Acute ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis, SunFA_Circum, SunFA_Circum ]	};
+    key <BKSL>	{ [numbersign,      acute,  SunFA_Grave,  SunFA_Grave ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // modify the default Icelandic layout to not have any dead keys
+
+    include "pc/is(basic)"
+
+    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
+    key <AE12>	{ [apostrophe,      grave,      cedilla,      cedilla ]	};
+    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};
+    key <AC10>	{ [odiaeresis, Odiaeresis,        acute,        acute ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};
+    key <BKSL>	{ [numbersign,      acute,        grave,        grave ]	};
+    key <AB10>	{ [     thorn,      THORN, dead_belowdot,    abovedot ]	};
+};
diff --git a/symbols/it b/symbols/it
new file mode 100644
index 00000000..e09ecca2
--- /dev/null
+++ b/symbols/it
@@ -0,0 +1,63 @@
+
+// based on a keyboard map from an 'xkb/symbols/it' file
+// 17 May 2003 Modified by Sebastiano Vigna (vigna@dsi.unimi.it)
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/it,v 1.4 2003/04/19 12:22:12 pascal Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin(type4)"
+
+    name[Group1]="Italian";
+
+    key <TLDE>	{ [ backslash,        bar,      notsign,    brokenbar ]	};
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior, dead_doubleacute ] };
+    key <AE03>	{ [         3,   sterling,threesuperior,   dead_tilde ]	};
+    key <AE04>	{ [         4,     dollar,   onequarter,    oneeighth ] };
+
+    key <AE10>	{ [         0,      equal,   braceright,  dead_ogonek ] };
+    key <AE11>	{ [apostrophe,   question,        grave, questiondown ]	};
+    key <AE12>	{ [    igrave, asciicircum,  asciitilde, dead_circumflex ] };
+
+    key <AD11>	{ [    egrave,     eacute,  bracketleft,    braceleft ]	};
+    key <AD12>	{ [      plus,   asterisk, bracketright,   braceright ]	};
+
+    key <AC10>	{ [    ograve,   ccedilla,           at, dead_cedilla ] };
+    key <AC11>	{ [    agrave,     degree,   numbersign, dead_abovering ] };
+
+    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};
+    key <AB08>	{ [     comma,  semicolon,   dead_acute,     multiply ]	};
+    key <AB09>	{ [    period,      colon,periodcentered, dead_diaeresis ] };
+    key <AB10>	{ [     minus, underscore,  dead_macron,     division ] };
+
+    key <BKSL>	{ [    ugrave,    section,   dead_grave,   dead_breve ]	};
+
+    key <LSGT>	{ [      less,    greater,guillemotleft,guillemotright] };
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic italian layout to eliminate all dead keys
+
+    include "pc/it(basic)"
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,  doubleacute ] };
+    key <AE03>	{ [         3,   sterling,threesuperior,   asciitilde ]	};
+
+    key <AE10>	{ [         0,       equal,  braceright,       ogonek ]	};
+    key <AE12>	{ [    igrave, asciicircum,  asciitilde,  asciicircum ] };
+
+    key <AC10>	{ [    ograve,   ccedilla,           at,      cedilla ] };
+    key <AC11>	{ [    agrave,     degree,   numbersign,       degree ] };
+
+    key <AB08>	{ [     comma,  semicolon,        acute,     multiply ]	};
+    key <AB09>	{ [    period,      colon,periodcentered,   diaeresis ] };
+    key <AB10>	{ [     minus, underscore,       macron,     division ] };
+
+    key <BKSL>	{ [    ugrave,    section,        grave,        breve ]	};
+};
diff --git a/symbols/iu b/symbols/iu
new file mode 100644
index 00000000..c7e3ba39
--- /dev/null
+++ b/symbols/iu
@@ -0,0 +1,67 @@
+
+// based on
+// Inuktitut keyboard for X11
+// written by Pablo Saratxaga <pablo@mandrakesoft.com>
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Inuktitut";
+
+    key	<AE01> { [ 0x01001595, 1		]	};
+    key	<AE02> { [ 0x01001449, 2		]	};
+    key	<AE03> { [ 0x01001550, 3		]	};
+    key	<AE04> { [ 0x01001483, 4		]	};
+    key	<AE05> { [ 0x01001466, 5		]	};
+    key	<AE06> { [ 0x01001585, 6		]	};
+    key	<AE07> { [ 0x010014bb, 7		]	};
+    key	<AE08> { [ 0x010014d0, 8		]	};
+    key	<AE09> { [ 0x010014ea, 9		]	};
+    key	<AE10> { [ 0x0100153e, 0		]	};
+    key	<AE11> { [ minus,	  underscore	]	};
+    key	<AE12> { [ 0x0100155d, equal		]	};
+
+	key <AD01> { [ 0x0100158f, 0x0100148b	]	};
+	key <AD02> { [ 0x01001403, 0x01001431	]	};
+	key <AD03> { [ 0x0100157f, 0x01001546	]	};
+	key <AD04> { [ 0x0100146d, 0x01001596	]	};
+	key <AD05> { [ 0x0100144e, 0x01001671	]	};
+	key <AD06> { [ 0x010014ef, 0x01001673	]	};
+	key <AD07> { [ 0x010014a5, 0x01001675	]	};
+	key <AD08> { [ 0x010014c2, 0x010015a4	]	};
+	key <AD09> { [ 0x010014d5, 0x010015a0	]	};
+	key <AD10> { [ 0x01001528, 0x010015a6	]	};
+	key <AD11> { [ 0x010014a1, 0x01001505	]	};
+	key <AD12> { [ dead_abovedot, 0x0100141e]	};
+
+	key <AC01> { [ 0x01001591, 0x0100148d	]	};
+	key <AC02> { [ 0x01001405, 0x01001433	]	};
+	key <AC03> { [ 0x01001581, 0x01001548	]	};
+	key <AC04> { [ 0x0100146f, 0x01001555	]	};
+	key <AC05> { [ 0x01001450, parenleft 	]	};
+	key <AC06> { [ 0x010014f1, parenright	]	};
+	key <AC07> { [ 0x010014a7, 0x0100152a	]	};
+	key <AC08> { [ 0x010014c4, 0x01001557	]	};
+	key <AC09> { [ 0x010014d7, 0x010015a2	]	};
+	key <AC10> { [ semicolon,  colon     	]	};
+	key <AC11> { [ apostrophe, quotedbl     ]	};
+
+	key <AB01> { [ 0x01001593, 0x01001490	]	};
+	key <AB02> { [ 0x0100140a, 0x01001438	]	};
+	key <AB03> { [ 0x01001583, 0x0100154b	]	};
+	key <AB04> { [ 0x01001472, question  	]	};
+	key <AB05> { [ 0x01001455, 0x0100157c	]	};
+	key <AB06> { [ 0x010014f4, 0x010014c7	]	};
+	key <AB07> { [ 0x010014aa, 0x010014da	]	};
+	key <AB08> { [ comma,      less      	]	};
+	key <AB09> { [ period,     greater   	]	};
+	key <AB10> { [ 0x0100152d, 0x01001559	]	};
+
+    key	<TLDE> { [ 0x0100157b, 0x01001575	]	};
+    key	<LSGT> { [ 0x01001579, 0x01001577	]	};
+    key	<BKSL> { [ backslash,  bar		]	};
+
+// End alphanumeric section
+};
diff --git a/symbols/kan b/symbols/kan
new file mode 100644
index 00000000..43944c96
--- /dev/null
+++ b/symbols/kan
@@ -0,0 +1,69 @@
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Inscript layout for Kannada  
+    // Author : G Karunakar <karunakar@freedomink.org>
+    // Date   : Wed Nov 13 17:22:58 IST 2002
+    // Kannada digits mapped in basic only
+
+    name[Group1]= "Kannada";
+
+    key <TLDE> { [  0x01000cca, 0x01000c92	] };
+    key <AE01> { [  0x01000ce7, 0x01000c8d	] };
+    key <AE02> { [  0x01000ce8, 0x01000cc5	] };
+    key <AE03> { [  0x01000ce9			] };
+    key <AE04> { [  0x01000cea			] };
+    key <AE05> { [  0x01000ceb			] };
+    key <AE06> { [  0x01000cec			] };
+    key <AE07> { [  0x01000ced			] };
+    key <AE08> { [  0x01000cee			] };
+    key <AE09> { [  0x01000cef			] };
+    key <AE10> { [  0x01000ce6			] };
+    key <AE11> { [  0x01000c83			] };
+    key <AE12> { [  0x01000cc3, 0x01000c8b	] };
+
+    key <AD01> { [  0x01000ccc, 0x01000c94	] };
+    key <AD02> { [  0x01000cc8, 0x01000c90	] };
+    key <AD03> { [  0x01000cbe, 0x01000c86	] };
+    key <AD04> { [  0x01000cc0, 0x01000c88	] };
+    key <AD05> { [  0x01000cc2, 0x01000c8a	] };
+    key <AD06> { [  0x01000cac, 0x01000cad	] };
+    key <AD07> { [  0x01000cb9, 0x01000c99	] };
+    key <AD08> { [  0x01000c97, 0x01000c98	] };
+    key <AD09> { [  0x01000ca6, 0x01000ca7	] };
+    key <AD10> { [  0x01000c9c, 0x01000c9d	] };
+    key <AD11> { [  0x01000ca1, 0x01000ca2	] };
+    key <AD12> { [  0x01000cbc, 0x01000c9e	] };
+ 
+    key <AC01> { [  0x01000ccb, 0x01000c93	] };
+    key <AC02> { [  0x01000cc7, 0x01000c8f	] };
+    key <AC03> { [  0x01000ccd, 0x01000c85	] };
+    key <AC04> { [  0x01000cbf, 0x01000c87	] };
+    key <AC05> { [  0x01000cc1, 0x01000c89	] };
+    key <AC06> { [  0x01000caa, 0x01000cab	] };
+    key <AC07> { [  0x01000cb0, 0x01000cb1	] };
+    key <AC08> { [  0x01000c95, 0x01000c96	] };
+    key <AC09> { [  0x01000ca4, 0x01000ca5	] };
+    key <AC10> { [  0x01000c9a, 0x01000c9b	] };
+    key <AC11> { [  0x01000c9f, 0x01000ca0	] };
+
+    key <AB01> { [  0x01000cc6, 0x01000c8e	] };
+    key <AB02> { [  0x01000c82, 0x01000c81	] };
+    key <AB03> { [  0x01000cae, 0x01000ca3	] };
+    key <AB04> { [  0x01000ca8, 0x01000ca9	] };
+    key <AB05> { [  0x01000cb5, 0x01000cb4	] };
+    key <AB06> { [  0x01000cb2, 0x01000cb3	] };
+    key <AB07> { [  0x01000cb8, 0x01000cb6	] };
+    key <AB08> { [  comma     , 0x01000cb7	] };
+    key <AB09> { [  period    , 0x01000ce4	] };
+    key <AB10> { [  0x01000caf, 0x01000040	] };
+    key <BKSL> { [  0x01000cc9, 0x01000c91	] };
+
+    key <RALT> {
+	symbols[Group1] = [ Mode_switch , Multi_key ],
+	virtualMods = AltGr
+    };
+
+};
diff --git a/symbols/la b/symbols/la
new file mode 100644
index 00000000..81dc2e6b
--- /dev/null
+++ b/symbols/la
@@ -0,0 +1,60 @@
+
+// based on a keyboard
+// Modified for a real Latin American Keyboard by Fabian Mandelbaum
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/la,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin(type4)"
+
+    name[Group1]="Latin American";
+
+    key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};
+    key <AE03>	{ [         3, numbersign, periodcentered,   sterling ]	};
+    key <AE04>	{ [         4,     dollar,   asciitilde,       dollar ]	};
+    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};
+    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [questiondown, exclamdown, dead_cedilla, dead_ogonek]	};
+
+    key <AD11>	{ [dead_acute, dead_diaeresis, dead_diaeresis, dead_abovering ]	};
+    key <AD12>	{ [      plus,   asterisk,   asciitilde,  dead_macron ]	};
+
+    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde, dead_doubleacute ] };
+    key <AC11>	{ [ braceleft, bracketleft, dead_circumflex, braceleft]	};
+    key <TLDE>	{ [       bar,     degree,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [braceright, bracketright, dead_grave,   braceright ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+    include "pc/la(basic)"
+
+    key <AC11>	{ [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ]	};
+    key <AD11>	{ [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+    include "pc/la(Sundeadkeys)"
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "pc/la(basic)"
+
+    key <AE12>	{ [questiondown, exclamdown,    cedilla,       ogonek ]	};
+    key <AD11>	{ [     grave, asciicircum, bracketleft,       degree ]	};
+    key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};
+    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde,  doubleacute ]	};
+    key <AC11>	{ [     acute,  diaeresis,    braceleft,    braceleft ]	};
+    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,        breve ]	};
+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+};
+
diff --git a/symbols/latin b/symbols/latin
new file mode 100644
index 00000000..0f979002
--- /dev/null
+++ b/symbols/latin
@@ -0,0 +1,179 @@
+
+// Common Latin alphabet layout
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/latin,v 1.3 2002/12/20 20:18:34 paulo Exp $
+
+default partial
+xkb_symbols "basic" {
+
+    key <AE01>	{ [         1,     exclam,  onesuperior,   exclamdown ]	};
+    key <AE02>	{ [         2,         at,  twosuperior,    oneeighth ]	};
+    key <AE03>	{ [         3, numbersign, threesuperior,    sterling ]	};
+    key <AE04>	{ [         4,     dollar,   onequarter,       dollar ]	};
+    key <AE05>	{ [         5,    percent,      onehalf, threeeighths ]	};
+    key <AE06>	{ [         6, asciicircum, threequarters, fiveeighths ] };
+    key <AE07>	{ [         7,  ampersand,    braceleft, seveneighths ]	};
+    key <AE08>	{ [         8,   asterisk,  bracketleft,    trademark ]	};
+    key <AE09>	{ [         9,  parenleft, bracketright,    plusminus ]	};
+    key <AE10>	{ [         0, parenright,   braceright,       degree ]	};
+    key <AE11>	{ [     minus, underscore,    backslash, questiondown ]	};
+    key <AE12>	{ [     equal,       plus, dead_cedilla,  dead_ogonek ]	};
+
+    key <AD01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
+    key <AD02>	{ [         w,          W,      lstroke,      Lstroke ]	};
+    key <AD03>	{ [         e,          E ]	};
+    key <AD04>	{ [         r,          R,    paragraph,   registered ]	};
+    key <AD05>	{ [         t,          T,       tslash,       Tslash ]	};
+    key <AD06>	{ [         y,          Y,    leftarrow,          yen ]	};
+    key <AD07>	{ [         u,          U,    downarrow,      uparrow ]	};
+    key <AD08>	{ [         i,          I,   rightarrow,     idotless ]	};
+    key <AD09>	{ [         o,          O,       oslash,     Ooblique ]	};
+    key <AD10>	{ [         p,          P,        thorn,        THORN ]	};
+    key <AD11>	{ [bracketleft,  braceleft, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [bracketright, braceright, dead_tilde,  dead_macron ]	};
+
+    key <AC01>	{ [         a,          A,           ae,           AE ]	};
+    key <AC02>	{ [         s,          S,       ssharp,      section ]	};
+    key <AC03>	{ [         d,          D,          eth,          ETH ]	};
+    key <AC04>	{ [         f,          F,      dstroke,  ordfeminine ]	};
+    key <AC05>	{ [         g,          G,          eng,          ENG ]	};
+    key <AC06>	{ [         h,          H,      hstroke,      Hstroke ]	};
+    key <AC07>	{ [         j,          J ]	};
+    key <AC08>	{ [         k,          K,          kra,    ampersand ]	};
+    key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]	};
+    key <AC10>	{ [ semicolon,    colon, dead_acute, dead_doubleacute ]	};
+    key <AC11>	{ [apostrophe, quotedbl, dead_circumflex,  dead_caron ]	};
+    key <TLDE>	{ [     grave, asciitilde,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};
+    key <AB01>	{ [         z,          Z, guillemotleft,        less ]	};
+    key <AB02>	{ [         x,          X, guillemotright,    greater ]	};
+    key <AB03>	{ [         c,          C,         cent,    copyright ]	};
+    key <AB04>	{ [         v,          V, leftdoublequotemark, grave ]	};
+    key <AB05>	{ [         b,          B, rightdoublequotemark, apostrophe ] };
+    key <AB06>	{ [         n,          N ]	};
+    key <AB07>	{ [         m,          M,           mu,    masculine ]	};
+    key <AB08>	{ [     comma,       less, horizconnector,   multiply ]	};
+    key <AB09>	{ [    period,    greater, periodcentered,   division ]	};
+    key <AB10>	{ [     slash,   question, dead_belowdot, dead_abovedot ] };
+
+};
+
+// Northern Europe ( Danish, Finnish, Norwegian, Swedish) common layout
+
+partial
+xkb_symbols "type2" {
+
+    include "pc/latin"
+
+    key <AE01>	{ [         1,     exclam,   exclamdown,  onesuperior ]	};
+    key <AE02>	{ [         2,   quotedbl,           at,  twosuperior ]	};
+    key <AE03>	{ [         3, numbersign,     sterling, threesuperior]	};
+    key <AE04>	{ [         4,   currency,       dollar,   onequarter ]	};
+    key <AE05>	{ [         5,    percent,      onehalf,         cent ]	};
+    key <AE06>	{ [         6,  ampersand,          yen,  fiveeighths ]	};
+    key <AE07>	{ [         7,      slash,    braceleft,     division ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft, guillemotleft]	};
+    key <AE09>	{ [         9, parenright, bracketright, guillemotright] };
+    key <AE10>	{ [         0,      equal,   braceright,       degree ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+    key <AD04>	{ [         r,          R,   registered,   registered ]	};
+    key <AD05>	{ [         t,          T,        thorn,        THORN ]	};
+    key <AD09>	{ [         o,          O,           oe,           OE ]	};
+    key <AD11>	{ [     aring,  Aring, dead_diaeresis, dead_abovering ]	};
+    key <AD12>	{ [dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };
+
+    key <AC01>	{ [         a,          A,  ordfeminine,    masculine ]	};
+
+    key <AB03>	{ [         c,          C,    copyright,    copyright ]	};
+    key <AB08>	{ [     comma,  semicolon, dead_cedilla,  dead_ogonek ]	};
+    key <AB09>	{ [    period,   colon, periodcentered, dead_abovedot ]	};
+    key <AB10>	{ [     minus, underscore, dead_belowdot, dead_abovedot ] };
+};
+
+// Slavic Latin ( Albanian, Croatian, Polish, Slovene, Yugoslav)
+// common layout
+
+partial
+xkb_symbols "type3" {
+
+    include "pc/latin"
+
+    key <AD01>	{ [         q,          Q,    backslash,  Greek_OMEGA ]	};
+    key <AD02>	{ [         w,          W,          bar,      Lstroke ]	};
+    key <AD06>	{ [         z,          Z,    leftarrow,          yen ]	};
+
+    key <AC04>	{ [         f,          F,  bracketleft,  ordfeminine ]	};
+    key <AC05>	{ [         g,          G, bracketright,          ENG ]	};
+    key <AC08>	{ [         k,          K,      lstroke,    ampersand ]	};
+
+    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 ]	};
+};
+
+// Another one Latin common layout
+// (German, Estonian, Spanish, Icelandic, Italian, Latin American, Portuguese)
+ 
+partial
+xkb_symbols "type4" {
+
+    include "pc/latin"
+
+    key <AE02>	{ [         2,   quotedbl,           at,    oneeighth ]	};
+    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};
+    key <AE07>	{ [         7,      slash,    braceleft, seveneighths ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft,    trademark ]	};
+    key <AE09>	{ [         9, parenright, bracketright,    plusminus ]	};
+    key <AE10>	{ [         0,      equal,   braceright,       degree ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
+
+    key <AB08>	{ [   comma,  semicolon, horizconnector,     multiply ]	};
+    key <AB09>	{ [  period,      colon, periodcentered,     division ]	};
+    key <AB10>	{ [   minus, underscore, dead_belowdot, dead_abovedot ]	};
+};
+
+partial
+xkb_symbols "nodeadkeys" {
+
+    key <AE12>	{ [     equal,       plus,     cedilla,        ogonek ]	};
+    key <AD11>	{ [bracketleft,  braceleft,  diaeresis,        degree ]	};
+    key <AD12>	{ [bracketright, braceright, asciitilde,       macron ]	};
+    key <AC10>	{ [ semicolon,      colon,       acute,   doubleacute ]	};
+    key <AC11>	{ [apostrophe,   quotedbl, asciicircum,         caron ]	};
+    key <BKSL>	{ [ backslash,        bar,       grave,         breve ]	};
+    key <AB10>	{ [     slash,   question, dead_belowdot,    abovedot ]	};
+};
+
+partial
+xkb_symbols "type2_nodeadkeys" {
+ 
+    include "pc/latin(nodeadkeys)"
+
+    key <AD11>	{ [     aring,      Aring,   diaeresis,        degree ]	};
+    key <AD12>	{ [ diaeresis, asciicircum, asciitilde,         caron ]	};
+    key <AB08>	{ [     comma,  semicolon,     cedilla,        ogonek ]	};
+    key <AB09>	{ [    period,   colon, periodcentered,      abovedot ]	};
+    key <AB10>	{ [   minus, underscore, dead_belowdot,      abovedot ]	};
+};
+
+partial
+xkb_symbols "type3_nodeadkeys" {
+ 
+    include "pc/latin(nodeadkeys)"
+};
+
+partial
+xkb_symbols "type4_nodeadkeys" {
+ 
+    include "pc/latin(nodeadkeys)"
+
+    key <AB10>	{ [   minus, underscore, dead_belowdot,      abovedot ]	};
+};
+
diff --git a/symbols/lo b/symbols/lo
new file mode 100644
index 00000000..ad1fb1e0
--- /dev/null
+++ b/symbols/lo
@@ -0,0 +1,80 @@
+// $XConsortium: lo 2002/11/28 $
+//
+// $XFree86$
+//
+// Lao keymap, by Anousak Souphavanh <anousak@muanglao.com>
+//
+//
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a Lao keyboard
+    // This keymap uses the Lao keyboard standard [kind of] widely used inLaos
+
+    name[Group1]= "Lao";
+
+    // Alphanumeric section
+    key <TLDE> { [ 0x100200D			]};
+    key <AE01> { [ 0x1000ea2,       0x1000ed1	]};
+    key <AE01> { [ 0x1000ea2,       0x1000ed1	]};
+    key <AE02> { [ 0x1000e9f,       0x1000ed2	]};
+    key <AE03> { [ 0x1000ec2,       0x1000ed3	]};
+    key <AE04> { [ 0x1000e96,       0x1000ed4	]};
+    key <AE05> { [ 0x1000eb8,       0x1000ecc	]};
+    key <AE06> { [ 0x1000eb9,       0x1000ebc	]};
+    key <AE07> { [ 0x1000e84,       0x1000ed5	]};
+    key <AE08> { [ 0x1000e95,       0x1000ed6	]};
+    key <AE09> { [ 0x1000e88,       0x1000ed7	]};
+    key <AE10> { [ 0x1000e82,       0x1000ed8	]};
+    key <AE11> { [ 0x1000e8a,       0x1000ed9	]};
+    key <AE12> { [ 0x1000ecd			]};
+
+    key <AD01> { [ 0x1000ebb			]};
+    key <AD02> { [ 0x1000ec4,       0x1000ed0	]};
+    key <AD03> { [ 0x1000eb3			]};
+    key <AD04> { [ 0x1000e9e,       underscore	]};
+    key <AD05> { [ 0x1000eb0,       plus	]};
+    key <AD06> { [ 0x1000eb4			]};
+    key <AD07> { [ 0x1000eb5			]};
+    key <AD08> { [ 0x1000ea3,       0x1000eae	]};
+    key <AD09> { [ 0x1000e99			]};
+    key <AD10> { [ 0x1000e8d,       0x1000ebd	]};
+    key <AD11> { [ 0x1000e9a,       minus	]};
+    key <AD12> { [ 0x1000ea5,       braceright	]};
+    key <BKSL> { [ 0x1000edc,      0x1000edd	]};
+
+    key <AC01> { [ 0x1000eb1			]};
+    key <AC02> { [ 0x1000eab,       semicolon	]};
+    key <AC03> { [ 0x1000e81,       period	]};
+    key <AC04> { [ 0x1000e94,       comma	]};
+    key <AC05> { [ 0x1000ec0,       colon	]};
+    key <AC06> { [ 0x1000ec9,       0x1000eca	]};
+    key <AC07> { [ 0x1000ec8,       0x1000ecb	]};
+    key <AC08> { [ 0x1000eb2,       exclam	]};
+    key <AC09> { [ 0x1000eaa,       question	]};
+    key <AC10> { [ 0x1000ea7,       percent	]};
+    key <AC11> { [ 0x1000e87,       equal	]};
+
+    key <AB01> { [ 0x1000e9c,       0x10020ad	]};
+    key <AB02> { [ 0x1000e9b,       parenleft	]};
+    key <AB03> { [ 0x1000ec1,       0x1000eaf	]};
+    key <AB04> { [ 0x1000ead			]};
+    key <AB05> { [ 0x1000eb6			]};
+    key <AB06> { [ 0x1000eb7			]};
+    key <AB07> { [ 0x1000e97,       0x1000ec6	]};
+    key <AB08> { [ 0x1000ea1,       quoteleft	]};
+    key <AB09> { [ 0x1000ec3,       dollar	]};
+    key <AB10> { [ 0x1000e9d,       parenright	]};
+
+override key <LFSH> {
+	type="PC_SYSRQ",
+	[ 	 Shift_L,		ISO_First_Group		]
+    };
+override key <RTSH> {
+	type="PC_SYSRQ",
+	[ 	Shift_R,		ISO_Last_Group 		]
+    };
+};
diff --git a/symbols/lt b/symbols/lt
new file mode 100644
index 00000000..6c2f1b23
--- /dev/null
+++ b/symbols/lt
@@ -0,0 +1,111 @@
+
+// based on
+// Lithuanian keyboard map by Ri�ardas �epas <rch@richard.eu.org>
+// merged into one file by Nerijus Bali�nas
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/lt,v 1.3 2002/12/14 22:26:11 dawes Exp $
+
+// If you want to have 2 layouts, use
+// Option "XkbLayout" "lt,lt(lt_us)"
+
+// Lithuanian Baltic layout - Lithuanian letters on the numeric row
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+
+    include "pc/latin"
+
+    name[Group1]="Lithuanian";
+
+    key <AE01>	{ [   aogonek,      Aogonek ]	};
+    key <AE02>	{ [    ccaron,       Ccaron ]	};
+    key <AE03>	{ [   eogonek,      Eogonek ]	};
+    key <AE04>	{ [ eabovedot,    Eabovedot ]	};
+    key <AE05>	{ [   iogonek,      Iogonek ]	};
+    key <AE06>	{ [    scaron,       Scaron ]	};
+    key <AE07>	{ [   uogonek,      Uogonek ]	};
+    key <AE08>	{ [   umacron,      Umacron ]	};
+    key <AE09>	{ [doublelowquotemark,  parenleft ] };
+    key <AE10>	{ [leftdoublequotemark,parenright ] };
+    key <AE12>	{ [    zcaron,       Zcaron ]	};
+
+    key <LSGT>	{ [    endash,   EuroSign   ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+// Similar to the above, but you should use Right Alt + numeric row
+// for Lithuanian letters
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "lt_us" {
+
+    include "pc/latin"
+
+    name[Group1]="Lithuanian";
+
+    key <AE01>	{ [         1,     exclam,      aogonek,      Aogonek ]	};
+    key <AE02>	{ [         2,         at,       ccaron,       Ccaron ]	};
+    key <AE03>	{ [         3, numbersign,      eogonek,      Eogonek ]	};
+    key <AE04>	{ [         4,     dollar,    eabovedot,    Eabovedot ]	};
+    key <AE05>	{ [         5,    percent,      iogonek,      Iogonek ]	};
+    key <AE06>	{ [         6, asciicircum,      scaron,       Scaron ]	};
+    key <AE07>	{ [         7,  ampersand,      uogonek,      Uogonek ]	};
+    key <AE08>	{ [         8,   asterisk,      umacron,      Umacron ]	};
+    key <AE09>	{ [         9,  parenleft, doublelowquotemark,  parenleft ] };
+    key <AE10>	{ [         0, parenright, leftdoublequotemark,parenright ] };
+    key <AE12>	{ [     equal,       plus,       zcaron,       Zcaron ]	};
+
+    key <AD03>	{ [         e,          E,       endash,     EuroSign ]	};
+    key <LSGT>	{ [    endash,   EuroSign ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+// Lithuanian keyboard map by Gediminas Paulauskas <menesis@delfi.lt>
+// Minor modification by Ri�ardas �epas according to http://sun3.mif.vu.lt/cs/TK4/lithkeyb.html
+
+// Describes Lithuanian keymap LST 1582:2000
+// Extensions:  B01 L3 is "<" , B02 L3 is ">" and B03 L3 is endash to make this
+// layout usable with pc101 and pc104 keyboards.
+ 
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "lt_std" {
+
+    include "pc/latin"
+
+    name[Group1]= "Lithuanian";
+
+    key <TLDE> {[	grave,		asciitilde,	acute		]};
+    key <AE01> {[	exclam,		1,		at		]};
+    key <AE02> {[	minus,		2,		underscore	]};
+    key <AE03> {[	slash,		3,		numbersign	]};
+    key <AE04> {[	semicolon,	4,		dollar		]};
+    key <AE05> {[	colon,		5,		section		]};
+    key <AE06> {[	comma,		6,		asciicircum	]};
+    key <AE07> {[	period,		7,		ampersand	]};
+    key <AE08> {[	equal,		8,		asterisk	]};
+    key <AE09> {[	parenleft,	9,		bracketleft	]};
+    key <AE10> {[	parenright,	0,		bracketright	]};
+    key <AE11> {[	question,	plus,		apostrophe	]};
+    key <AE12> {[	x,		X,		percent		]};
+    key	<AD01> {[	aogonek,	Aogonek		]};
+    key	<AD02> {[	zcaron,		Zcaron		]};
+    key	<AD03> {[	e,		E,		EuroSign	]};
+    key	<AD11> {[	iogonek,	Iogonek,	braceleft	]};
+    key	<AD12> {[	w,		W,		braceright	]};
+    key	<AC04> {[	scaron,		Scaron		]};
+    key <AC10> {[	uogonek,	Uogonek		]};
+    key <AC11> {[	eabovedot,	Eabovedot,	quotedbl	]};
+    key	<AB01> {[	z,		Z,		less		]};
+    key	<AB02> {[	umacron,	Umacron,	greater		]};
+    key	<AB03> {[	c,		C,		endash		]};
+    key	<AB08> {[	ccaron,		Ccaron,		doublelowquotemark  ]};
+    key	<AB09> {[	f,		F,		leftdoublequotemark ]};
+// this is actually right quote for Lithuanian
+    key	<AB10> {[	eogonek,	Eogonek,	backslash	]};
+    key <BKSL> {[	q,		Q,		bar		]};
+    key <SPCE> {[	space,		space,		nobreakspace,	nobreakspace	]};
+
+    key	<LSGT> {[	less,		greater,	endash		]};
+
+    include "level3(ralt_switch_multikey)"
+};
diff --git a/symbols/lv b/symbols/lv
new file mode 100644
index 00000000..850d8397
--- /dev/null
+++ b/symbols/lv
@@ -0,0 +1,34 @@
+
+// based on
+// Latvian keyboard map by Ilya Ketris <Ilya.Ketris@ipro.lv>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/lv,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+
+    include "pc/latin"
+
+    name[Group1]="Latvian";
+
+    key <AE04>	{ [         4,     dollar,     EuroSign,         cent ]	};
+
+    key <AD03>	{ [         e,          E,      emacron,      Emacron ]	};
+    key <AD04>	{ [         r,          R,     rcedilla,     Rcedilla ]	};
+    key <AD07>	{ [         u,          U,      umacron,      Umacron ]	};
+    key <AD08>	{ [         i,          I,      imacron,      Imacron ]	};
+    key <AD09>	{ [         o,          O,      omacron,      Omacron ]	};
+
+    key <AC01>	{ [         a,          A,      amacron,      Amacron ]	};
+    key <AC02>	{ [         s,          S,       scaron,       Scaron ]	};
+    key <AC05>	{ [         g,          G,     gcedilla,     Gcedilla ]	};
+    key <AC08>	{ [         k,          K,     kcedilla,     Kcedilla ]	};
+    key <AC09>	{ [         l,          L,     lcedilla,     Lcedilla ]	};
+    key <AC11>	{ [apostrophe, quotedbl, leftdoublequotemark, doublelowquotemark ] };
+
+    key <AB01>	{ [         z,          Z,       zcaron,       Zcaron ]	};
+    key <AB03>	{ [         c,          C,       ccaron,       Ccaron ]	};
+    key <AB06>	{ [         n,          N,     ncedilla,     Ncedilla ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
diff --git a/symbols/macintosh.vndr/de b/symbols/macintosh.vndr/de
new file mode 100644
index 00000000..b4bf6aa5
--- /dev/null
+++ b/symbols/macintosh.vndr/de
@@ -0,0 +1,144 @@
+// $XConsortium: de /main/4 1996/08/31 12:19:20 kaleb $
+// $XFree86: xc/programs/xkbcomp/symbols/de,v 3.7.2.2 1999/07/13 07:09:56 hohndel Exp $
+
+// olh@suse.de   very close to MacOS map
+
+default partial alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple German keybaord
+
+    // Alphanumeric section
+    name[Group1]= "German";
+    key <TLDE> {	[ dead_circumflex,	degree	],
+			[   notsign 			]	};
+    key <AE01> {	[         1,    exclam		],
+			[ exclamdown,   at		]	};
+    key <AE02> {	[	  2,	quotedbl	],
+			[ twosuperior			]	};
+    key <AE03> {	[	  3,	section		],
+			[ threesuperior,sterling	]	};
+    key <AE04> {	[	  4,	dollar		],
+			[ onequarter,	currency	]	};
+    key <AE05> {	[	  5,	percent		],
+			[ bracketleft			]	};
+    key <AE06> {	[	  6,	ampersand	],
+			[ bracketright			]	};
+    key <AE07> {	[	  7,	slash		],
+			[       bar,    backslash	]	};
+    key <AE08> {	[	  8,	parenleft	],
+			[ braceleft,    asciitilde	]	};
+    key <AE09> {	[	  9,	parenright	],
+			[braceright			]	};
+    key <AE10> {	[	  0,	equal		],
+			[ braceright,	degree		]	};
+    key <AE11> {	[    ssharp,	question	],
+			[ backslash,	questiondown	]	};
+    key <AE12> {	[ dead_acute,	dead_grave	],
+			[ dead_cedilla			]	};
+
+    key <AD01> {	[	  q,	Q 		],
+			[guillemotleft,guillemotright	]	};
+    key <AD03> {	[	  e,	E		],
+			[  EuroSign			]	};
+    key <AD04> {	[         r,    R		],
+			[ registered			]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  z,	Z		]	};
+    key <AD07> {	[	  u,	U		],
+			[diaeresis,    Aacute		]	};
+    key <AD08> {	[	  i,	I		],
+			[     slash,    Ucircumflex	]	};
+    key <AD09> {	[         o,    O		],
+			[     oslash,   Ooblique	]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis	],
+			[ periodcentered, degree	]	};
+    key <AD12> {	[      plus,	asterisk	],
+			[ asciitilde			]	}; 
+    key <AC01> {	[         a,    A		],
+			[     aring,    Aring		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		],
+			[ copyright			]	};
+    key <AC06> {	[         h,    H		],
+			[ ordfeminine			]	};
+    key <AC09> {	[	  l,    L		],
+			[	at			]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis	],
+			[ dead_acute			]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis	],
+			[ dead_circumflex		]	};
+
+    key <LSGT> {	[      less,	greater		],
+			[       bar			]	};
+    key <AB01> {	[	  y,	Y 		],
+			[ guillemotleft,less		]	};
+    key <AB06> {	[         n,    N		],
+			[asciitilde			]	};
+    key <AB07> {	[	  m,	M		],
+			[	 mu			]	};
+    key <AB08> {	[     comma,	semicolon	]	};
+    key <AB09> {	[    period,	colon		],
+			[ periodcentered, division	]	};
+    key <AB10> {	[     minus,	underscore	]	};
+    key <BKSL> {	[ numbersign,	apostrophe	],
+			[ dead_grave			]	};
+
+    // End alphanumeric section, begin "Keypad"
+    key <KPDL> {	[  KP_Delete,	KP_Separator	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+//    modifier_map Shift  { Shift_L };
+//    modifier_map Lock   { Caps_Lock };
+//    modifier_map Control{ Control_L };
+//    modifier_map Mod3	{ Mode_switch };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "Sundeadkeys" {
+    // modify the default German layout to use Sun dead keys
+    include "macintosh/de(basic)"
+    key <TLDE> {	[ SunFA_Circum,	degree		],
+			[   notsign 			]	};
+    key <AE12> {	[ SunFA_Acute,	SunFA_Grave	],
+			[ SunFA_Cedilla			]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis	],
+			[ SunFA_Diaeresis		]	};
+    key <AD12> {	[      plus,	asterisk	],
+			[ SunFA_Tilde,	dead_macron	]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis	],
+			[ SunFA_Acute			]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis	],
+			[ SunFA_Circum			]	};
+
+    key <BKSL> {	[ numbersign,	acute		],
+			[ SunFA_Grave			]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "sundeadkeys" {
+    include "macintosh/de(Sundeadkeys)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    // modify the default German layout to not have any dead keys
+    include "macintosh/de(basic)"
+    key <TLDE> {	[ asciicircum,	degree		],
+			[   notsign 			]	};
+    key <AE12> {	[ acute,	grave		],
+			[ cedilla			]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis	],
+			[ diaeresis 			]	};
+    key <AD12> {	[      plus,	asterisk	],
+			[ asciitilde,	macron		]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis	],
+			[ acute				]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis	],
+			[ asciicircum			]	};
+
+    key <BKSL> {	[ numbersign,	apostrophe	],
+			[ grave				]	};
+};
diff --git a/symbols/macintosh.vndr/de_CH b/symbols/macintosh.vndr/de_CH
new file mode 100644
index 00000000..75eb9479
--- /dev/null
+++ b/symbols/macintosh.vndr/de_CH
@@ -0,0 +1,150 @@
+// $XFree86$
+//
+// 06.07.2000
+// Andreas Tobler a.tobler@schweiz.ch
+// modified for Swiss German Apple Extended Keyboard II
+
+xkb_symbols "extended" {
+
+    
+    name[Group1]= "Swiss German Apple Extended Keyboard II";
+    // Alphanumeric section
+    key <TLDE> {	[      less, greater		],
+			[ lessthanequal, greaterthanequal ]	};
+	key <COIN> {	[ section, degree		]	};
+    key <AE01> {	[	  1,	plus 		],
+			[ plusminus,	onesuperior	]	};
+    key <AE02> {	[	  2,	quotedbl	],
+			[ twosuperior,	oneeighth	    ]	};
+    key <AE03> {	[	  3,	asterisk	],
+			[ numbersign, threesuperior	]	};
+    key <AE04> {	[	  4,	ccedilla	],
+    				[	Ccedilla	]	};
+    key <AE05> {	[	  5,	percent		],
+    				[	bracketleft		]	};
+    key <AE06> {	[	  6,	ampersand	],
+					[	bracketright		]	};
+    key <AE07> {	[	  7,	slash		],
+			[ bar, backslash				]	};
+    key <AE08> {	[	  8,	parenleft	],
+			[	braceleft, Ograve			]	};
+    key <AE09> {	[	  9,	parenright	],
+    		[	braceright, Ocircumflex		]	};
+    key <AE10> {	[	  0,	equal		],
+    				[  notequal,	Uacute	]	};
+    key <AE11> {	[ apostrophe,	question	],
+			[         questiondown		]	};
+    key <AE12> {	[ asciicircum,	grave		],
+			[ dead_acute,asciitilde			]	};
+			
+
+    key <AD01> {	[	  q,	Q 		]	};
+
+    key <AD02> {	[	  w,	W		],
+			[    Greek_SIGMA, Aacute	]	};
+
+    key <AD03> {	[	  e,	E		],
+			[    trademark, Ediaeresis	]	};
+
+    key <AD04> {	[	  r,	R		],
+			[ registered, Egrave		]	};
+
+    key <AD05> {	[	  t,	T		],
+			[    dagger, Icircumflex	]	}; 
+
+    key <AD06> {	[	  z,	Z		],
+			[  Greek_OMEGA, Iacute		]	};
+
+    key <AD07> {	[	  u,	U		],
+			[    degree, Ugrave		]	};
+
+    key <AD08> {	[	  i,	I		],
+			[         exclamdown		]	};
+
+    key <AD09> {	[	  o,	O		],
+			[    oslash	]	};
+
+    key <AD10> {	[	  p,	P		],
+			[  Greek_pi,  Greek_PI		]	};
+
+    key <AD11> {	[ udiaeresis, egrave		],
+			[ section, ydiaeresis		]	};
+			
+
+    key <AD12> {	[ dead_diaeresis, exclam	],
+			[      quoteleft, quoteright	]	};
+			
+	key <BKSL> {	[  dollar,   sterling		],
+			[ paragraph, enfilledcircbullet	]	};
+
+
+    key <AC01> {	[	  a,	A 		],
+			[     aring, Aring		]	};
+
+    key <AC02> {	[	  s,	S		],
+			[         ssharp		]	}; 
+
+    key <AC03> {	[	  d,	D		],
+			[	Greek_delta		]	};
+
+    key <AC04> {	[	  f,	F		],
+			[   section, doubledagger	]	};
+
+    key <AC05> {	[	  g,	G		],
+			[        at, comma		]	};
+
+    key <AC06> {	[	  h,	H		],
+			[  ordfeminine, periodcentered	]	};
+
+    key <AC07> {	[	  j,	J		],
+			[	masculine]		};
+
+    key <AC08> {	[	  k,	K		]	};
+
+    key <AC09> {	[	  l,	L		],
+    			[	notsign	]	};
+
+    key <AC10> {	[ odiaeresis,   eacute		],
+    			[	cent	]	};
+
+    key <AC11> {	[ adiaeresis,   agrave		],
+			[         ae, AE		]	};
+
+    
+    
+    key <AB01> {	[	  y,	Y 		],
+			[	yen, Ydiaeresis		]	};
+
+    key <AB02> {	[	  x,	X		],
+			[similarequal,	ydiaeresis	]	};
+
+    key <AB03> {	[	  c,	C		],
+			[ copyright, diamond		]	};
+
+    key <AB04> {	[	  v,	V		]	};
+
+    key <AB05> {	[	  b,	B		],
+			[    ssharp			]	};  
+
+    key <AB06> {	[	  n,	N		],
+			[       dead_tilde		]       };
+
+    key <AB07> {	[	  m,	M		],
+			[        mu			]       };
+
+    key <AB08> {	[     comma,	semicolon	],
+			[ guillemotleft, guillemotright ]	};
+
+    key <AB09> {	[    period, colon		],
+			[    Nosymbol, division		]	};
+
+    key <AB10> {        [     minus, underscore		],
+			[    emdash, endash		]	};
+
+    key <SPCE> {	[  space			],
+			[nobreakspace,	nobreakspace	]	};
+    // End alphanumeric section
+    
+    key <KPDL> {	[  KP_Separator , KP_Delete	]	};
+
+};
diff --git a/symbols/macintosh.vndr/dk b/symbols/macintosh.vndr/dk
new file mode 100644
index 00000000..c5879763
--- /dev/null
+++ b/symbols/macintosh.vndr/dk
@@ -0,0 +1,92 @@
+// $XConsortium: dk /main/3 1996/08/31 12:19:29 kaleb $
+// $XFree86: xc/programs/xkbcomp/symbols/dk,v 3.3.2.1 1999/12/20 12:56:01 hohndel Exp $
+partial alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a Danish keyboard with dead key support
+    // and all of ISO-8859-1 characters available.
+
+    name[Group1]= "Danish";
+
+    key <TLDE> {	[         onehalf,         section      ],
+			[   threequarters,       paragraph	]};
+    key <LSGT> {	[	     less,	   greater	],
+			[	backslash,         notsign	]};
+    key <SPCE> {	[	    space,	     space	],
+			[    nobreakspace,    nobreakspace	]};
+    key <AE01> {	[               1,          exclam  	],
+			[      exclamdown,     onesuperior	]};
+    key <AE02> {	[               2,        quotedbl  	],
+			[	       at,     twosuperior	]};
+    key <AE03> {	[              	3,	numbersign	],
+			[	 sterling,   threesuperior	]};
+    key <AE04> {	[               4,        currency     	],
+			[	   dollar,	onequarter	]};
+    key <AE05> {	[               5,         percent     	],
+			[        NoSymbol,	      cent	]};
+    key <AE06> {	[               6,       ampersand     	],
+			[	      yen,	  NoSymbol	]};
+    key <AE07> {	[               7,           slash     	],
+			[       braceleft,        division	]};
+    key <AE08> {	[               8,       parenleft     	],
+			[     bracketleft,   guillemotleft	]};
+    key <AE09> {	[               9,      parenright     	],
+			[    bracketright,  guillemotright	]};
+    key <AE10> {	[               0,           equal     	],
+                        [      braceright,          degree      ]};
+    key <AB08> {	[           comma,       semicolon     	],
+			[    dead_cedilla,     dead_ogonek	]};
+    key <AB09> {	[          period,           colon     	],
+			[  periodcentered,   dead_abovedot	]};
+    key <AB03> {        [               c,               C      ],
+                        [       copyright,        NoSymbol      ]};
+    key <AB10> {	[           minus,      underscore     	],
+			[	   hyphen,          macron	]};
+    key <AC01> {        [               a,               A      ],
+                        [     ordfeminine,       masculine      ]};
+    key <AC03> {        [               d,               D      ],
+                        [             eth,             ETH      ]};
+    key <AD03> {        [               e,               E      ],
+                        [        NoSymbol,            cent      ]};
+    key <AD04> {        [               r,               R      ],
+                        [      registered,        NoSymbol      ]};
+    key <AD05> {        [               t,               T      ],
+                        [           thorn,           THORN      ]};
+    key <AD08> {        [               i,               I      ],
+                        [        NoSymbol,        NoSymbol      ]};
+    key <AD09> {        [               o,               O      ],
+                        [              oe,              OE      ]};
+    key	<AC10> {	[	       ae,	        AE	]};
+    key <AE11> {	[            plus,        question      ],
+			[       plusminus,    questiondown	]};
+    key <AC11> {	[	   oslash,        Ooblique 	]};
+    key <BKSL> {	[      apostrophe,        asterisk	],
+                 	[dead_doubleacute,        multiply      ]};
+    key <AD11> {	[	    aring,           Aring 	]};
+    key <AE12> {   	[      dead_acute,      dead_grave      ],
+                 	[             bar,       brokenbar      ]};
+    key <AD12> {   	[  dead_diaeresis, dead_circumflex      ],
+                 	[      dead_tilde,      dead_caron      ]};
+
+
+    // End alphanumeric section
+
+};
+
+
+partial default alphanumeric_keys 
+xkb_symbols "full" {
+    include "iso9995-3(full)"
+    include "dk(basic)"
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh/dk(basic)"
+    key <AE12> {	[	    acute,	     grave	],	
+			[	      bar,	    ogonek	]	};
+    key <AD12> {	[       diaeresis,     asciicircum     	],	
+			[      asciitilde,     dead_macron     	]      	};
+};
diff --git a/symbols/macintosh.vndr/es b/symbols/macintosh.vndr/es
new file mode 100644
index 00000000..ad217b36
--- /dev/null
+++ b/symbols/macintosh.vndr/es
@@ -0,0 +1,50 @@
+// $XFree86$
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Spanish keybaord
+
+    name[Group1]= "Spanish";
+
+    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
+
+};
diff --git a/symbols/macintosh.vndr/fi b/symbols/macintosh.vndr/fi
new file mode 100644
index 00000000..6f08ddbf
--- /dev/null
+++ b/symbols/macintosh.vndr/fi
@@ -0,0 +1,19 @@
+// $XFree86$
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple Swedish(Finland) keybaord
+
+    name[Group1]= "Finnish";
+    include "macintosh/se(basic)" // for consistent naming
+
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh/se(basic)"	// for consistent naming
+};
diff --git a/symbols/macintosh.vndr/fr b/symbols/macintosh.vndr/fr
new file mode 100644
index 00000000..149df3b7
--- /dev/null
+++ b/symbols/macintosh.vndr/fr
@@ -0,0 +1,101 @@
+// $XConsortium: macintosh /main/10 1996/01/29 19:54:54 kaleb $
+// $XFree86$
+//
+
+xkb_symbols "extended" {
+
+    name[Group1]= "FR-1";
+
+    // Alphanumeric section
+    key <LSGT> {	[        less,	  greater   	]	};
+    key <TLDE> {        [        at,    numbersign      ],
+                        [   periodcentered              ]	};
+    key <AE01> {	[   ampersand,	  1    		],
+	 					[   dead_acute,   dead_acute] };
+    key <AE02> {	[      eacute,	  2 		]	};
+    key <AE03> {	[    quotedbl,	  3         	]	};
+    key <AE04> {	[  quoteright,	  4    		],
+                        [   quoteleft                   ]	};
+    key <AE05> {	[   parenleft,	  5    		],
+              	        [   braceleft,    bracketleft 	]	};
+    key <AE06> {	[     section,	  6          	],
+                        [   paragraph                   ]	};
+    key <AE07> {	[      egrave,	  7        	],
+                        [ guillemotleft, guillemotright ]	};
+    key <AE08> {	[      exclam,	  8       	],
+                        [  exclamdown,    Ucircumflex   ]	};
+    key <AE09> {	[    ccedilla,    9        	],
+                        [    Ccedilla,    Aacute        ]	};
+    key <AE10> {	[      agrave,	  0         	],
+                        [      oslash,    Ooblique      ]	};
+    key <AE11> {	[  parenright,	  degree       	],
+                	[  braceright,	  bracketright  ] 	};
+    key <AE12> {	[       minus, 	  underscore	]	};
+
+    key <AD01> {	[	    a,	A 		],
+                	[          ae,	AE              ] 	};
+    key <AD02> {	[	    z,	Z		],
+                	[ Acircumflex,	Aring           ] 	};
+    key <AD03> {	[	    e,	E		],
+                	[ ecircumflex,	Ecircumflex     ] 	};
+    key <AD04> {	[	    r,	R		],
+                	[  registered,	currency        ] 	};
+    key <AD05> {	[	    t,	T		]	};
+    key <AD06> {	[	    y,	Y		],
+                	[      Uacute,	ydiaeresis      ] 	};
+    key <AD07> {	[	    u,	U		]	};
+    key <AD08> {	[	    i,	I		],
+                	[ icircumflex,	idiaeresis      ] 	};
+    key <AD09> {	[	    o,	O		]	};
+    key <AD10> {	[	    p,	P		]	};
+    key <AD11> {	[ dead_circumflex,  dead_diaeresis  ],
+                	[ ocircumflex,	Ocircumflex     ] 	};
+    key <AD12> {	[      dollar,	asterisk        ],
+                	[       comma,	yen             ] 	};
+    key <BKSL> {	[   	dead_grave,  sterling        ],
+			[          at,  numbersign      ]	};
+
+    key <AC01> {	[	  q,	Q 		]	,
+                	[ acircumflex,	Acircumflex     ] 	};
+    key <AC02> {	[	  s,	S		],
+			[    Ograve,    S               ]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		],
+			[         f,    periodcentered  ]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		],
+			[    Igrave,    Icircumflex     ]	};
+    key <AC07> {	[	  j,	J		],
+			[ Idiaeresis,   Iacute          ]	};
+    key <AC08> {	[	  k,	K		],
+			[    Egrave,    Ediaeresis      ]	};
+    key <AC09> {	[	  l,	L		],
+			[    ssharp,    bar		]	};
+    key <AC10> {	[         m,	M    		],
+			[        mu,    Oacute		]	};
+    key <AC11> {	[    ugrave,	percent 	],
+			[    Ugrave,    ucircumflex	]	};
+    key <RTRN> {	[    Return,	Return		],
+			[    hyphen,    hyphen		]	};
+
+    key <AB01> {	[	  w,	W 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		],
+			[ copyright,    copyright	]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		],
+                        [ dead_tilde                    ]       };
+    key <AB07> {	[     comma,	question	],
+			[        at,    questiondown	]	};
+    key <AB08> {	[ semicolon,	period          ]	};
+    key <AB09> {	[     colon,	slash  		],
+			[  division,    backslash	]	};
+    key <AB10> {	[     equal,	plus    	],
+			[    macron,    plusminus	]	};
+
+    // End alphanumeric section
+    key <KPDL> {        [ KP_Separator , KP_Delete      ]       };
+
+};
+
diff --git a/symbols/macintosh.vndr/fr_CH b/symbols/macintosh.vndr/fr_CH
new file mode 100644
index 00000000..e8480c55
--- /dev/null
+++ b/symbols/macintosh.vndr/fr_CH
@@ -0,0 +1,28 @@
+// $XConsortium: fr_CH /main/3 1996/08/31 12:19:48 kaleb $
+// $XFree86: xc/programs/xkbcomp/symbols/macintosh/fr_CH,v 1.1 2000/09/19 12:46:25 eich Exp $
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Swiss/French keybaord
+
+    include "macintosh/de_CH"
+    name[Group1]= "Swiss French";
+
+    override key <AD11> {
+	[ egrave,	udiaeresis	],
+	[ bracketleft			]
+    };
+    override key <AC10> {
+	[ eacute,	odiaeresis	]
+    };
+    override key <AC11> {
+	[ agrave,	adiaeresis	],
+	[  braceleft			]
+    };
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+    include "macintosh/fr_CH" // for consistent naming
+};
diff --git a/symbols/macintosh.vndr/gb b/symbols/macintosh.vndr/gb
new file mode 100644
index 00000000..29a27f8b
--- /dev/null
+++ b/symbols/macintosh.vndr/gb
@@ -0,0 +1,19 @@
+// $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
+
+
+    name[Group1]= "Great Britain";
+
+    key <AE03> {	[               3,        sterling     	],
+			[      numbersign			]	};
+
+    // End alphanumeric section
+    
+};
+
+
diff --git a/symbols/macintosh.vndr/it b/symbols/macintosh.vndr/it
new file mode 100644
index 00000000..9068b4c6
--- /dev/null
+++ b/symbols/macintosh.vndr/it
@@ -0,0 +1,93 @@
+// $XFree86$
+
+xkb_symbols "extended" {
+
+    name[Group1]= "italian";
+
+    // Alphanumeric section
+    key <LSGT> {	[        less,	  greater   	]	};
+    key <TLDE> {        [        at,    numbersign      ],
+                        [   periodcentered              ]	};
+    key <AE01> {	[   ampersand,	  1    		],
+			[guillemotleft,guillemotright	]	};
+    key <AE02> {	[    quotedbl,	  2 		]	};
+    key <AE03> {	[  apostrophe,	  3         	]	};
+    key <AE04> {	[   parenleft,	  4    		],
+                        [   braceleft,    bracketleft	]	};
+    key <AE05> {	[    ccedilla,	  5    		],
+              	        [    Ccedilla,    Iacute	]	};
+    key <AE06> {	[      egrave,	  6          	],
+                        [   paragraph,    periodcentered]	};
+    key <AE07> {	[  parenright,	  7        	],
+                        [  braceright,	  bracketright	]	};
+    key <AE08> {	[    sterling,	  8       	],
+                        [  infinity			]	};
+    key <AE09> {	[      agrave,    9        	],
+                        [       acute,    Ocircumflex	]	};
+    key <AE10> {	[      eacute,	  0         	],
+                        [       grave,    Oacute	]	};
+    key <AE11> {	[       minus,	  underscore	]	};
+    key <AE12> {	[       equal, 	  plus		],
+			[    notequal,    plusminus	]	};
+
+    key <AD01> {	[           q,	Q 		]	};
+    key <AD02> {	[	    z,	Z		]	};
+    key <AD03> {	[	    e,	E		]	};
+    key <AD04> {	[	    r,	R		],
+                	[  registered			] 	};
+    key <AD05> {	[	    t,	T		]	};
+    key <AD06> {	[	    y,	Y		],
+                	[      Uacute,	ydiaeresis      ] 	};
+    key <AD07> {	[	    u,	U		]	};
+    key <AD08> {	[	    i,	I		],
+                	[ icircumflex,	idiaeresis      ] 	};
+    key <AD09> {	[	    o,	O		]	};
+    key <AD10> {	[	    p,	P		]	};
+    key <AD11> {	[      igrave,  asciicircum     ]	};
+    key <AD12> {	[      dollar,	asterisk        ]	};
+    key <BKSL> {	[     section,  degree		],
+			[          at,  numbersign      ]	};
+
+    key <AC01> {	[	  a,	A 		]	,
+                	[     aring,   Aring		] 	};
+    key <AC02> {	[	  s,	S		],
+			[    ssharp			]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		],
+			[    Igrave,    Icircumflex     ]	};
+    key <AC07> {	[	  j,	J		],
+			[ Idiaeresis,   Iacute          ]	};
+    key <AC08> {	[	  k,	K		],
+			[    Egrave,    Ediaeresis      ]	};
+    key <AC09> {	[	  l,	L		],
+			[    ssharp,    bar		]	};
+    key <AC10> {	[         m,	M    		],
+			[        mu,    Oacute		]	};
+    key <AC11> {	[    ugrave,	percent 	],
+			[        ae,    AE		]	};
+
+    key <AB01> {	[	  w,	W 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		],
+			[ copyright,    copyright	]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		],
+                        [ dead_tilde                    ]       };
+    key <AB07> {	[     comma,	question	],
+			[         questiondown		]	};
+    key <AB08> {	[ semicolon,	period          ]	};
+    key <AB09> {	[     colon,	slash  		],
+			[       bar,    backslash	]	};
+    key <AB10> {	[    ograve,	exclam    	],
+			[    exclamdown			]	};
+
+    // End alphanumeric section
+
+    key <KPDL> {	[ KP_Decimal , KP_Delete	]	};
+    // End "Keypad" section
+
+};
+
diff --git a/symbols/macintosh.vndr/nl b/symbols/macintosh.vndr/nl
new file mode 100644
index 00000000..92f8dac5
--- /dev/null
+++ b/symbols/macintosh.vndr/nl
@@ -0,0 +1,15 @@
+// $XFree86$
+//
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple mac_US
+    // keyboard and a very simple netherland keybaord
+
+    name[Group1]= "Netherland";
+
+// do just nothing
+
+};
+
diff --git a/symbols/macintosh.vndr/no b/symbols/macintosh.vndr/no
new file mode 100644
index 00000000..689da9da
--- /dev/null
+++ b/symbols/macintosh.vndr/no
@@ -0,0 +1,58 @@
+// $XConsortium: no /main/3 1996/08/31 12:20:02 kaleb $
+// $XFree86: xc/programs/xkbcomp/symbols/no,v 3.3.2.1 1997/07/26 06:31:01 dawes Exp $
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Norwegian keybaord
+
+    name[Group1]= "Norwegian";
+
+    key <TLDE> {	[             bar,         section      ]	};
+    key <AE02> {	[               2,        quotedbl     	],	
+			[	       at,	 oneeighth	]	};
+    key <AE04> {	[	        4,        currency	],
+			[	   dollar,	    dollar	]	};
+    key <AE03> {	[               3,	numbersign 	],
+			[        sterling,        sterling	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash     	],
+			[	      bar,       backslash	]  	};
+    key <AE08> {	[               8,       parenleft     	],
+			[     bracketleft,	 braceleft	]	};
+    key <AE09> {	[               9,      parenright     	],
+			[    bracketright,      braceright	]	};
+    key <AE10> {	[               0,           equal     	]	};
+
+    key <AB08> {	[           comma,       semicolon     	]	};
+    key <AB09> {	[          period,           colon     	]	};
+    key <AB10> {	[           minus,      underscore     	]	};
+    key	<AC10> {	[	   oslash,        Ooblique  	],
+			[      odiaeresis,     Odiaeresis	]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AC11> {	[              ae,              AE 	]	};
+    key <AD11> {	[	    aring,           Aring     	]	};
+    key <AE12> {	[      dead_grave,      dead_acute	],
+			[	    acute,     dead_ogonek 	]	};
+    key <AD12> {	[       diaeresis,     asciicircum     	],	
+			[      asciitilde,     dead_macron     	]      	};
+    key <BKSL> {	[              at,        asterisk	]	};
+    key <LSGT> {	[            less,         greater	]	};
+
+    // End alphanumeric section
+
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+
+    include "macintosh/no(basic)"
+    key <AE12> {	[           grave,           acute	],
+			[	    acute,          ogonek 	]	};
+    key <AD12> {	[       diaeresis,     asciicircum     	],	
+			[      asciitilde,          macron     	]      	};
+
+};
diff --git a/symbols/macintosh.vndr/pt b/symbols/macintosh.vndr/pt
new file mode 100644
index 00000000..f48b3e37
--- /dev/null
+++ b/symbols/macintosh.vndr/pt
@@ -0,0 +1,66 @@
+// $XConsortium: pt /main/3 1996/08/31 12:20:08 kaleb $
+// $XFree86: xc/programs/xkbcomp/symbols/pt,v 3.3.2.1 1999/11/18 15:37:37 hohndel Exp $
+// mac version from Ricardo Cabral <bfe00991@mail.telepac.pt>
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Portuguese keybaord
+
+    name[Group1]= "Portuguese";
+
+    key <LSGT> {	[	     less,	   greater	],
+			[	      bar,       brokenbar	]	};
+    key <AE02> {	[               2,	  quotedbl    	],	
+			[	       at,       oneeighth	]	};
+    key <AE04> {	[               4,	    dollar     	],
+			[         section,          dollar	]	};
+    key <AE03> {	[               3,	numbersign     	],
+			[        sterling,        sterling     	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash     	]	};
+    key <AE08> {	[               8,       parenleft     	],
+			[     bracketleft,       braceleft     	]	};
+    key <AE09> {	[               9,      parenright      ],
+			[    bracketright,      braceright     	]	};
+    key <AE10> {	[               0,           equal      ]	};
+    key <AE11> {	[      apostrophe,        question      ]	};
+    key <AE12> {	[	     plus,        asterisk 	],
+    			[            dead_diaeresis             ]	};
+    key <AB08> {	[           comma,       semicolon     	]	};
+    key <AB09> {	[          period,           colon      ]	};
+    key <AB10> {	[           minus,      underscore      ]	};
+    key <AC10> {	[        ccedilla,        Ccedilla      ]	};
+    key <AC11> {	[      dead_tilde, dead_circumflex	]	};
+    key <AC12> {	[       backslash,	       bar     	]	};
+    key <AD11> {	[       masculine,     ordfeminine      ]	};
+    key <AD12> {	[      dead_acute,      dead_grave 	]	};
+    // End alphanumeric section
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "Sundeadkeys" {
+    include "macintosh/pt(basic)" // for consistent naming
+    
+    key <AE12> {	[	     plus,        asterisk 	],
+			[ SunFA_Diaeresis, SunFA_Diaeresis      ]	};
+    key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};
+    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
+};
+
+partial alphanumeric_keys 
+xkb_symbols "sundeadkeys" {
+    include "macintosh/pt(Sundeadkeys)" // for consistent naming
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh/pt(basic)" // for consistent naming
+
+    key <AE12> {	[	     plus,        asterisk 	],
+			[	 quotedbl,        quotedbl      ]	};
+    key <AC11> {	[      asciitilde,     asciicircum	]	};
+    key <AD12> {	[	    acute,           grave 	]	};
+};
diff --git a/symbols/macintosh.vndr/se b/symbols/macintosh.vndr/se
new file mode 100644
index 00000000..510c5ca8
--- /dev/null
+++ b/symbols/macintosh.vndr/se
@@ -0,0 +1,56 @@
+// $XConsortium: se /main/3 1996/08/31 12:20:15 kaleb $
+// $XFree86: xc/programs/xkbcomp/symbols/macintosh/se,v 1.1 2000/09/19 12:46:26 eich Exp $
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple Swedish(Sweden) keybaord
+
+    name[Group1]= "Swedish";
+
+    key <TLDE> {	[         section,         degree	]	};
+
+    key <AE01> {	[               1,          exclam	],
+			[       copyright,      exclamdown	]	};
+    key <AE02> {	[               2,        quotedbl     	],	
+			[	       at,	 oneeighth	]	};
+    key <AE03> {	[               3,      numbersign      ],	
+			[        sterling,             yen	]	};
+    key <AE04> {	[               4,        currency     	],	
+			[	   dollar,	      cent	]	};
+    key <AE06> {	[               6,       ampersand     	]	};
+    key <AE07> {	[               7,           slash     	],
+			[	      bar,       backslash	]	};
+    key <AE08> {	[               8,       parenleft     	],
+			[     bracketleft,       braceleft	]	};
+    key <AE09> {	[               9,      parenright	],
+			[    bracketright,      braceright	]	};
+    key <AB08> {	[           comma,       semicolon     	]	};
+    key <AE10> {	[               0,           equal     	]	};
+    key <AB09> {	[          period,           colon     	]	};
+    key <AB10> {	[           minus,      underscore     	]	};
+    key	<AC10> {	[      odiaeresis,      Odiaeresis     	],
+			[	   oslash,	    Ooblique	]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AC11> {	[      adiaeresis,      Adiaeresis 	],
+			[              ae,		AE	]	};
+    key <AD11> {	[	    aring,           Aring     	]	};
+    key <AE12> {	[           acute,           grave	]	};
+    key <AD12> {	[       diaeresis,     asciicircum     	],
+    			[	asciitilde			]	};
+    key <BKSL> {	[      apostrophe,        asterisk	],
+			[              at			]	};
+    key <LSGT> {        [            less,         greater      ],
+                        [             bar,       brokenbar      ]       };
+    key <KPDL> {	[	KP_Delete,    KP_Separator	]	};
+
+
+    // End alphanumeric section
+
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh/se(basic)" // for consistent naming
+};
diff --git a/symbols/macintosh.vndr/us b/symbols/macintosh.vndr/us
new file mode 100644
index 00000000..c53a1521
--- /dev/null
+++ b/symbols/macintosh.vndr/us
@@ -0,0 +1,204 @@
+// $XConsortium: macintosh /main/10 1996/01/29 19:54:54 kaleb $
+// $XFree86: xc/programs/xkbcomp/symbols/macintosh/us,v 1.8 2003/08/04 10:32:31 eich Exp $
+
+// symbols definition for a Macintosh "Extended" keyboard
+
+xkb_symbols "extended" {
+
+    name[Group1]= "US/ASCII";
+    key <ESC>  {	[ Escape			]	};
+
+    // Alphanumeric section
+    key <TLDE> {	[ quoteleft,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[     minus,	underscore	]	};
+    key <AE12> {	[     equal,	plus		]	};
+    key <BKSP> {	[ BackSpace			]	};
+
+    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
+    key <AD01> {	[	  q,	Q 		]	};
+    key <AD02> {	[	  w,	W		]	};
+    key <AD03> {	[	  e,	E		]	};
+    key <AD04> {	[	  r,	R		]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  y,	Y		]	};
+    key <AD07> {	[	  u,	U		]	};
+    key <AD08> {	[	  i,	I		]	};
+    key <AD09> {	[	  o,	O		]	};
+    key <AD10> {	[	  p,	P		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+
+    key <CAPS> {	[	Caps_Lock		]	};
+    key <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ quoteright,	quotedbl	]	};
+    key <RTRN> {	[ Return			]	};
+
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[     comma,	less		]	};
+    key <AB09> {	[    period,	greater		]	};
+    key <AB10> {	[     slash,	question	]	};
+
+    key <SPCE> {	[  space			]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> {	[  F1		]	};
+    key <FK02> {	[  F2		]	};
+    key <FK03> {	[  F3		]	};
+    key <FK04> {	[  F4		]	};
+    key <FK05> {	[  F5		]	};
+    key <FK06> {	[  F6		]	};
+    key <FK07> {	[  F7		]	};
+    key <FK08> {	[  F8		]	};
+    key <FK09> {	[  F9		]	};
+    key <FK10> {	[  F10		]	};
+    key <FK11> {	[  F11		]	};
+    key <FK12> {	[  F12		]	};
+    key <FK13> {	[  Print	]	};
+    key <FK14> {	[  Scroll_Lock	]	};
+    key <FK15> {	[  Pause	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key  <INS> {	[  Insert	]	};
+    key <HOME> {	[  Home		]	};
+    key <PGUP> {	[  Prior	]	};
+    key <DELE> {	[  Delete	]	};
+    key  <END> {	[  End		]	};
+    key <PGDN> {	[  Next		]	};
+
+    key   <UP> {	[  Up		]	};
+    key <LEFT> {	[  Left		]	};
+    key <DOWN> {	[  Down		]	};
+    key <RGHT> {	[  Right	]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <NMLK> {	[  Num_Lock,	Pointer_EnableKeys	]	};
+    key <KPEQ> {	[  equal				]	};
+    key <KPDV> {	[  KP_Divide				]	};
+    key <KPMU> {	[  KP_Multiply				]	};
+
+    key  <KP7> {	[  KP_7,	KP_Home			]	};
+    key  <KP8> {	[  KP_8,	KP_Up			]	};
+    key  <KP9> {	[  KP_9,	KP_Prior		]	};
+    key <KPSU> {	[  KP_Subtract				]	};
+
+    key  <KP4> {	[  KP_4,	KP_Left			]	};
+    key  <KP5> {	[  KP_5,	KP_Begin		]	};
+    key  <KP6> {	[  KP_6,	KP_Right		]	};
+    key <KPAD> {	[  KP_Add				]	};
+
+    key  <KP1> {	[  KP_1,	KP_End			]	};
+    key  <KP2> {	[  KP_2,	KP_Down			]	};
+    key  <KP3> {	[  KP_3,	KP_Next			]	};
+    key <KPEN> {	[  KP_Enter				]	};
+
+    key  <KP0> {	[  KP_0,	KP_Insert		]	};
+    key <KPDL> { 	[  KP_Decimal,	KP_Delete		]	};
+    // End "Keypad" section
+
+    // Begin "Modifier" section
+    key <LFSH> {	[  Shift_L	]	};
+    key <RTSH> {	[  Shift_R	]	};
+    key <LCTL> {	[  Control_L	]	};
+    key <RCTL> {	[  Control_R	]	};
+    key <LALT> {	[  Alt_L, Meta_L ]	};
+    key <RALT> {	[  Alt_R, Meta_R ]	};
+    key <LWIN> {	[  Super_L	]	};
+    key <RWIN> {	[  Super_R	]	};
+    // End "Modifier" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L , Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod1   { Alt_L, Alt_R, Meta_L, Meta_R };
+    modifier_map Mod2   { Num_Lock };
+    modifier_map Mod4   { Super_L, Super_R };
+    modifier_map Mod5   { Scroll_Lock };
+    // end modifier mappings
+
+    include "compose(rwin)"
+    include "apple(extended)"
+
+// *** FIXME
+//    key <LSGT> {	[ quoteleft,	asciitilde	]	};
+//    key <AE01> {	[	  1,	exclam 		],
+//			[exclamdown,    slash		]	};
+//    key <AE02> {	[	  2,	at		],
+//			[ trademark,    eth		]	};
+//    key <AE03> {	[	  3,	numbersign	],
+//			[ sterling			]	};
+//    key <AE04> {	[	  4,	dollar		],
+//			[      cent			]	};
+//    key <AE05> {	[	  5,	percent		],
+//			[  infinity			]	};
+//    key <AE06> {	[	  6,	asciicircum	],
+//			[ section			]	};
+//    key <AE07> {	[	  7,	ampersand	],
+//			[ paragraph			]	};
+//    key <AE08> {	[	  8,	asterisk	],
+//			[periodcentered			]	};
+//    key <AE09> {	[	  9,	parenleft	],
+//			[ordfeminine			]	};
+//    key <AE12> {	[     equal,	plus		],
+//			[  notequal,    plusminus	]	};
+//    key <AD01> {	[	  q,	Q 		],
+//			[	oe,	OE		]	};
+//    key <AD04> {	[	  r,	R		],
+//			[registered			]	};
+//    key <AD05> {	[	  t,	T		],
+//			[    dagger			]	};
+//    key <BKSL> {	[ backslash,	bar		],
+//			[guillemotleft,guillemotright	]	};
+//    key <AC01> {	[	  a,	A 		],
+//			[     aring,    Aring		]	};
+//    key <AC02> {	[	  s,	S		],
+//			[    ssharp,    Iacute		]	};
+//    key <AC03> {	[	  d,	D		],
+//				eth,	Icircumflex	]	};
+//    key <AC04> {	[	  f,	F		],
+//			[		Idiaeresis	]	};
+//    key <AC05> {	[	  g,	G		],
+//			[ copyright			]	};
+//    key <AC09> {	[	  l,	L		],
+//			[   notsign,    Ograve		]	};
+//    key <AC11> {	[ quoteright,	quotedbl	],
+//			[        ae,	AE		]	};
+//    key <AB03> {	[	  c,	C		],
+//			[ ccedilla,	Ccedilla	]	};
+//    key <AB06> {	[	  n,	N		],
+//			[asciitilde			]	};
+//    key <AB07> {	[	  m,	M		],
+//			[	 mu,	Acircumflex	]	};
+//    key <RALT> {	[ Mode_switch,	Multi_key	]	};
+//    modifier_map Mod3   { Mode_switch };
+
+};
diff --git a/symbols/mk b/symbols/mk
new file mode 100644
index 00000000..c3c5c02d
--- /dev/null
+++ b/symbols/mk
@@ -0,0 +1,67 @@
+
+// base on keyboard map:
+// Author: Damjan Georgievski <gdamjan@freemail.org.mk>
+// Revision: 1.4
+//
+// $XFree86$
+
+partial default alphanumeric_keys
+xkb_symbols "basic" { 
+    name[Group1]= "Macedonian";
+
+    key <AB01> { [     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key <AC02> { [     Cyrillic_es,     Cyrillic_ES	]	};
+    key <AC01> { [      Cyrillic_a,      Cyrillic_A	]	};
+    key <AD01> { [    Cyrillic_lje,    Cyrillic_LJE	]	};
+    key <AD02> { [    Cyrillic_nje,    Cyrillic_NJE	]	};
+    key <AB03> { [    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key <AB02> { [   Cyrillic_dzhe,   Cyrillic_DZHE	]	};
+    key <AC03> { [     Cyrillic_de,     Cyrillic_DE	]	};
+    key <AD03> { [     Cyrillic_ie,     Cyrillic_IE	]	};
+    key <AB04> { [     Cyrillic_ve,     Cyrillic_VE	]	};
+    key <AC04> { [     Cyrillic_ef,     Cyrillic_EF	]	};
+    key <AD05> { [     Cyrillic_te,     Cyrillic_TE	]	};
+    key <AD04> { [     Cyrillic_er,     Cyrillic_ER	]	};
+    key <AB06> { [     Cyrillic_en,     Cyrillic_EN	]	};
+    key <AB05> { [     Cyrillic_be,     Cyrillic_BE	]	};
+    key <AC06> { [     Cyrillic_ha,     Cyrillic_HA	]	};
+    key <AC05> { [    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key <AD06> { [   Macedonia_dse,   Macedonia_DSE	]	};
+    key <AB07> { [     Cyrillic_em,     Cyrillic_EM	]	};
+    key <AC07> { [     Cyrillic_je,     Cyrillic_JE	]	};
+    key <AD07> { [      Cyrillic_u,      Cyrillic_U	]	};
+    key <AC08> { [     Cyrillic_ka,     Cyrillic_KA	]	};
+    key <AD08> { [      Cyrillic_i,      Cyrillic_I	]	};
+    key <AD09> { [      Cyrillic_o,      Cyrillic_O	]	};
+    key <AC09> { [     Cyrillic_el,     Cyrillic_EL	]	};
+    key <AC10> { [    Cyrillic_che,    Cyrillic_CHE	]	};
+    key <AD10> { [     Cyrillic_pe,     Cyrillic_PE	]	};
+    key <AC11> { [   Macedonia_kje,   Macedonia_KJE	]	};
+    key <AD11> { [    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key <AD12> { [   Macedonia_gje,   Macedonia_GJE	]	};
+    key <BKSL> { [    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key <AE12> { [           equal,            plus	]	};
+    key <AE11> { [           minus,      underscore	]	};
+    key <TLDE> { [           grave,      asciitilde	]	};
+    key <AE01> { [               1,          exclam	]	};
+    key <AE02> { [               2, doublelowquotemark	]	};
+    key <AE03> { [               3, leftdoublequotemark	]	};
+    key <AE04> { [               4,          dollar	]	};
+    key <AE05> { [               5,         percent	]	};
+    key <AE06> { [               6,     asciicircum	]	};
+    key <AE07> { [               7,       ampersand	]	};
+    key <AE08> { [               8,        asterisk	]	};
+    key <AE09> { [               9,       parenleft	]	};
+    key <AE10> { [               0,      parenright	]	};
+    key <AB08> { [           comma,       semicolon	]	};
+    key <AB09> { [          period,           colon	]	};
+    key <AB10> { [           slash,        question	]	};
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "pc104" {
+    include "pc/mk(basic)"
+    include "pc/mk(win)"	
+};
+
diff --git a/symbols/ml b/symbols/ml
new file mode 100644
index 00000000..ef476724
--- /dev/null
+++ b/symbols/ml
@@ -0,0 +1,91 @@
+
+// Description : A keymap for Malayalam
+// Encoding    : Unicode (http://www.unicode.org)
+// Author      : Baiju M <baiju@freeshell.org>
+// Date        : Sat Aug  17 21:10:48 IST 2002
+// Mapping:
+
+default partial alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1] = "Malayalam";
+
+    //From grave to backslash (\)
+    
+    key <TLDE> { [ 0x01000d4a , 0x01000d12           ] };
+    key <AE01> { [1           ,     exclam           ] }; 
+    key <AE02> { [2           ,         at           ] };
+    key <AE03> { [3           , numbersign           ] };
+    key <AE04> { [4           ,     dollar           ] };
+    key <AE05> { [5           ,    percent           ] };
+    key <AE06> { [6           ,asciicircum           ] };
+    key <AE07> { [7           ,  ampersand           ] };
+    key <AE08> { [8           , 0x01000d7e           ] };
+    key <AE09> { [9           ,  parenleft           ] };
+    key <AE10> { [0           , parenright           ] };
+    key <AE11> { [ minus      , 0x01000d03           ] };
+    key <AE12> { [ 0x01000d43 , 0x01000d0b           ] };
+    key <BKSL> { [ 0x01000d7c                        ] };
+
+    // From 'q' to right bracket (])
+    
+    key <AD01> { [ 0x01000d4c , 0x01000d14 ] };
+    key <AD02> { [ 0x01000d48 , 0x01000d10 ] };
+    key <AD03> { [ 0x01000d3e , 0x01000d06 ] };
+    key <AD04> { [ 0x01000d40 , 0x01000d08 ] };
+    key <AD05> { [ 0x01000d42 , 0x01000d0a ] };
+    key <AD06> { [ 0x01000d2c , 0x01000d2d ] };
+    key <AD07> { [ 0x01000d39 , 0x01000d19 ] };
+    key <AD08> { [ 0x01000d17 , 0x01000d18 ] };
+    key <AD09> { [ 0x01000d26 , 0x01000d27 ] };
+    key <AD10> { [ 0x01000d1c , 0x01000d1d ] };
+    key <AD11> { [ 0x01000d21 , 0x01000d22 ] };
+    key <AD12> { [ 0x0100200d , 0x01000d1e ] };
+
+    // From 'a' to apostrophe (')
+    
+    key <AC01> { [ 0x01000d4b , 0x01000d13 ] };
+    key <AC02> { [ 0x01000d47 , 0x01000d0f ] };
+    key <AC03> { [ 0x01000d4d , 0x01000d05 ] };
+    key <AC04> { [ 0x01000d3f , 0x01000d07 ] };
+    key <AC05> { [ 0x01000d41 , 0x01000d09 ] };
+    key <AC06> { [ 0x01000d2a , 0x01000d2b ] };
+    key <AC07> { [ 0x01000d30 , 0x01000d31 ] };
+    key <AC08> { [ 0x01000d15 , 0x01000d16 ] };
+    key <AC09> { [ 0x01000d24 , 0x01000d25 ] };
+    key <AC10> { [ 0x01000d1a , 0x01000d1b ] };
+    key <AC11> { [ 0x01000d1f , 0x01000d20 ] };
+    
+    // From 'z' to slash (/)
+    
+    key <AB01> { [ 0x01000d46 , 0x01000d0e ] };
+    key <AB02> { [ 0x01000d02 , 0x01000d7a ] };
+    key <AB03> { [ 0x01000d2e , 0x01000d23 ] };
+    key <AB04> { [ 0x01000d28 , 0x01000d7b ] };
+    key <AB05> { [ 0x01000d35 , 0x01000d34 ] };
+    key <AB06> { [ 0x01000d32 , 0x01000d33 ] };
+    key <AB07> { [ 0x01000d38 , 0x01000d36 ] };
+    key <AB08> { [ comma      , 0x01000d37 ] };
+    key <AB09> { [ period     , 0x01000d7d ] };
+    key <AB10> { [ 0x01000d2f , question   ] };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "mlplusnum" {
+
+   // Modifies the basic layout to include malayalam numbers
+
+   include "pc/ml(basic)"
+
+      key <AE01> { [ 0x01000d67 ,      exclam ] };
+      key <AE02> { [ 0x01000d68 ,          at ] };
+      key <AE03> { [ 0x01000d69 ,  numbersign ] };
+      key <AE04> { [ 0x01000d6a ,      dollar ] };
+      key <AE05> { [ 0x01000d6b ,     percent ] };
+      key <AE06> { [ 0x01000d6c , asciicircum ] };
+      key <AE07> { [ 0x01000d6d ,   ampersand ] };
+      key <AE08> { [ 0x01000d6e ,  0x01000d7e ] };
+      key <AE09> { [ 0x01000d6f ,   parenleft ] };
+      key <AE10> { [ 0x01000d66 ,  parenright ] };
+};
diff --git a/symbols/mm b/symbols/mm
new file mode 100644
index 00000000..a85704ce
--- /dev/null
+++ b/symbols/mm
@@ -0,0 +1,66 @@
+
+// based on a keyboard map from an 'xkb/symbols/mm' file
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+      name[Group1]= "Burmese";
+
+// Mainly numbers.
+      key <AE01> { [      0x1001041, exclam 	]	};
+      key <AE02> { [      0x1001042 		]	};
+      key <AE03> { [      0x1001043 	 	]	};
+      key <AE04> { [      0x1001044  	 	]	};
+      key <AE05> { [      0x1001045 		]	};
+      key <AE06> { [      0x1001046 	 	]	};
+      key <AE07> { [      0x1001047 		]	};
+      key <AE08> { [      0x1001048  	 	]	};
+      key <AE09> { [      0x1001049, parenleft 	]	};
+      key <AE10> { [      0x1001040, parenright ]	};
+      key <AE11> { [      minus, 0x1001038 	]	};
+      key <AE12> { [      0x1001052, 0x1001056 	]	};
+
+// Mainly long vowels
+      key <AD01> { [      0x100102A,  0x100102A ]	};
+      key <AD02> { [      0x1001032,  0x1001032 ]	};
+      key <AD03> { [      0x100102C,  0x1001021 ]	};
+      key <AD04> { [      0x100102E,  0x1001024 ]	};
+      key <AD05> { [      0x1001030,  0x1001026 ]	};
+
+// Mainly voiced consonants
+      key <AD06> { [      0x1001017,  0x1001018 ]	};
+      key <AD07> { [      0x100101F,  0x1001004 ]	};
+      key <AD08> { [      0x1001002,  0x1001003 ]	};
+      key <AD09> { [      0x1001012,  0x1001013 ]	};
+      key <AD10> { [      0x1001007,  0x1001008 ]	};
+      key <AD11> { [      0x100100d,  0x100100e	]	};
+      key <AD12> { [      0x100100a,  0x1001009	]	};
+
+// Mainly short vowels
+      key <AC01> { [      0x1001029,  0x1001029 ]	};
+      key <AC02> { [      0x1001027,  0x1001027 ]	};
+      key <AC03> { [      0x1001039,  0x1001021 ]	};
+      key <AC04> { [      0x100102D,  0x1001023 ]	};
+      key <AC05> { [      0x100102F,  0x1001025 ]	};
+
+// Mainly unvoiced consonants
+      key <AC06> { [      0x1001015,  0x1001016 ]	};
+      key <AC07> { [      0x100101B,  0x100101B ]	};
+      key <AC08> { [      0x1001000,  0x1001001 ]	};
+      key <AC09> { [      0x1001010,  0x1001011 ]	};
+      key <AC10> { [      0x1001005,  0x1001006 ]	};
+      key <AC11> { [      0x100100b,  0x100100c ]	};
+      key <BKSL> { [      0x100104E,  0x100104F ]	};
+
+      key <AB01> { [      0x100104C,  0x100104D ]       };
+      key <AB02> { [      0x1001037,  0x1001036 ]       };
+      key <AB03> { [      0x1001019,  0x100100f ]       };
+      key <AB04> { [      0x1001014,  0x1001014 ]       };
+      key <AB05> { [      0x1001017,  0x1001017 ]       };
+      key <AB06> { [      0x100101C,  0x100101C ]       };
+      key <AB07> { [      0x100101E,  0x1001050 ]       };
+      key <AB08> { [      comma,      0x1001051 ]       };
+      key <AB09> { [      period,     0x100104A ]       };
+      key <AB10> { [      slash,      0x100101A ]       };
+};
diff --git a/symbols/mt b/symbols/mt
new file mode 100644
index 00000000..a295be3e
--- /dev/null
+++ b/symbols/mt
@@ -0,0 +1,34 @@
+// Maltese keyboard map (based on MSA Standard DMS100)
+// by Ramon Casha (ramon.casha@linux.org.mt)
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/mt,v 1.3 2002/12/13 04:18:04 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin"
+
+    name[Group1]="Maltese";
+
+    // The following four sets are the four additional letters, with the UK
+    // equivalents
+    key <TLDE>	{ [ cabovedot,  Cabovedot,        grave,      notsign ]	};
+    key <AD11>	{ [ gabovedot,  Gabovedot,  bracketleft,    braceleft ]	};
+    key <AD12>	{ [   hstroke,    Hstroke, bracketright,   braceright ]	};
+    key <LSGT>	{ [ zabovedot,  Zabovedot,    backslash,          bar ]	};
+
+    // Euro symbol
+    key <AE03>	{ [         3,   EuroSign,     sterling               ]	};
+
+    // Long accent
+    key <AE06>	{ [         6, asciicircum, dead_circumflex, dead_circumflex ]	};
+
+    // Normal accented vowels
+    key <AD03>	{ [         e,          E,       egrave,       Egrave ]	};
+    key <AD07>	{ [         u,          U,       ugrave,       Ugrave ]	};
+    key <AD08>	{ [         i,          I,       igrave,       Igrave ]	};
+    key <AD09>	{ [         o,          O,       ograve,       Ograve ]	};
+    key <AC01>	{ [         a,          A,       agrave,       Agrave ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
diff --git a/symbols/mt_us b/symbols/mt_us
new file mode 100644
index 00000000..dfc4a4bc
--- /dev/null
+++ b/symbols/mt_us
@@ -0,0 +1,22 @@
+// Maltese keyboard map (based on MSA Standard DMS100, annex A)
+// by Ramon Casha (ramon.casha@linux.org.mt)
+//
+// $XFree86$
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/mt"
+
+    // Describes the differences between the mt
+    // keyboard and a US-based physical keyboard
+
+    name[Group1]="Maltese (US layout)";
+
+    key <BKSL>	{ [ zabovedot,  Zabovedot,    backslash,          bar ]	};
+
+    key <TLDE>	{ [ cabovedot,  Cabovedot,        grave,   asciitilde ]	};
+
+    key <AE03>	{ [         3,   EuroSign,   numbersign               ]	};
+
+};
diff --git a/symbols/nec.vndr/jp b/symbols/nec.vndr/jp
new file mode 100644
index 00000000..0439677e
--- /dev/null
+++ b/symbols/nec.vndr/jp
@@ -0,0 +1,167 @@
+// $Xorg: jp,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/symbols/nec/jp,v 3.9 2001/01/17 23:46:03 dawes Exp $ 
+//
+// symbols for a NEC PC98 keyboard
+default xkb_symbols "pc98" {
+
+    key <ESC>  { [ Escape		]	};
+
+    // Alphanumeric section
+    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
+    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
+    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
+    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
+    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
+    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
+    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
+    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
+    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
+    key <AE10> { [ 0 			], [ kana_WA, kana_WO	]	};
+    key <AE11> { [ minus, equal		], [ kana_HO		]	};
+    key <AE12> { [ asciicircum,	quoteleft ], [ kana_HE		]	};
+    key <BKSL> { [ backslash, bar 	], [ prolongedsound	]	};
+    key <BKSP> { [ BackSpace		]	};
+
+    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
+    key <AD01> { [ q, Q 		], [ kana_TA		]	};
+    key <AD02> { [ w, W			], [ kana_TE		]	};
+    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
+    key <AD04> { [ r, R			], [ kana_SU		]	};
+    key <AD05> { [ t, T			], [ kana_KA		]	};
+    key <AD06> { [ y, Y			], [ kana_N		]	};
+    key <AD07> { [ u, U			], [ kana_NA		]	};
+    key <AD08> { [ i, I			], [ kana_NI		]	};
+    key <AD09> { [ o, O			], [ kana_RA		]	};
+    key <AD10> { [ p, P			], [ kana_SE		]	};
+    key <AD11> { [ at, asciitilde	], [ voicedsound	]	};
+    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
+    key <RTRN> { [ Return		]	};
+
+    key <LCTL> { [ Control_L		]	};
+    key <CAPS> { [ Caps_Lock		]	};
+    key <AC01> { [ a, A 		], [ kana_CHI		]	};
+    key <AC02> { [ s, S			], [ kana_TO		]	};
+    key <AC03> { [ d, D			], [ kana_SHI		]	};
+    key <AC04> { [ f, F			], [ kana_HA		]	};
+    key <AC05> { [ g, G			], [ kana_KI		]	};
+    key <AC06> { [ h, H			], [ kana_KU		]	};
+    key <AC07> { [ j, J			], [ kana_MA		]	};
+    key <AC08> { [ k, K			], [ kana_NO		]	};
+    key <AC09> { [ l, L			], [ kana_RI		]	};
+    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
+    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+    key <LFSH> { [ Shift_L		]	};
+    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
+    key <AB02> { [ x, X			], [ kana_SA		]	};
+    key <AB03> { [ c, C			], [ kana_SO		]	};
+    key <AB04> { [ v, V			], [ kana_HI		]	};
+    key <AB05> { [ b, B			], [ kana_KO		]	};
+    key <AB06> { [ n, N			], [ kana_MI		]	};
+    key <AB07> { [ m, M			], [ kana_MO		]	};
+    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
+    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
+    key <AB10> { [ slash, question	], [ kana_ME, kana_middledot ]	};
+    key <AB11> { [ NoSymbol, underscore	], [ kana_RO		]	};
+//    key <RTSH> { [ Shift_R		]	};
+
+    key <ALGR> { [ Mode_switch		]	};
+    key <LALT> { [ Alt_L		]	};
+    key <NFER> { [ Muhenkan		]	};
+    key <SPCE> { [ space		]	};
+    key <XFER> { [ Henkan, Kanji	]	};
+
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <BRK>  { [ Break		]	};
+    key <PRSC> { [ Print		]	};
+    key <FK01> { [ F1			]	};
+    key <FK02> { [ F2			]	};
+    key <FK03> { [ F3			]	};
+    key <FK04> { [ F4			]	};
+    key <FK05> { [ F5			]	};
+    key <FK06> { [ F6			]	};
+    key <FK07> { [ F7			]	};
+    key <FK08> { [ F8			]	};
+    key <FK09> { [ F9			]	};
+    key <FK10> { [ F10			]	};
+    key <FK11> { [ F11			]	};
+    key <FK12> { [ F12			]	};
+    key <FK13> { [ F13			]	};
+    key <FK14> { [ F14			]	};
+    key <FK15> { [ F15			]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <INS>  { [ Insert		]	};
+    key <DELE> { [ Delete		]	};
+    key <PGUP> { [ Prior		]	};
+    key <PGDN> { [ Next			]	};
+    key <UP>   { [ Up			]	};
+    key <LEFT> { [ Left			]	};
+    key <RGHT> { [ Right		]	};
+    key <DOWN> { [ Down			]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <HOME> { [ Clear, Home		]	 };
+    key <HELP> { [ Help			]	};
+    key <KPSU> { [ KP_Subtract		]	};
+    key <KPDV> { [ KP_Divide		]	};
+
+    key  <KP7> { [ KP_7			]	};
+    key  <KP8> { [ KP_8			]	};
+    key  <KP9> { [ KP_9			]	};
+    key <KPMU> { [ KP_Multiply		]	};
+
+    key  <KP4> { [ KP_4			]	};
+    key  <KP5> { [ KP_5			]	};
+    key  <KP6> { [ KP_6			]	};
+    key <KPAD> { [ KP_Add		]	};
+
+    key  <KP1> { [ KP_1			]	};
+    key  <KP2> { [ KP_2			]	};
+    key  <KP3> { [ KP_3			]	};
+    key <KPEQ> { [ KP_Equal 		]	};
+
+    key  <KP0> { [ KP_0			]	};
+    key <KPSP> { [ KP_Separator		]	};
+    key <KPDC> { [ KP_Decimal		]	};
+//    key <KPEN> { [ KP_Enter		]	}; 
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod1   { Alt_L };
+    modifier_map Mod2   { Mode_switch };
+};
+
diff --git a/symbols/nl b/symbols/nl
new file mode 100644
index 00000000..66f2ce2f
--- /dev/null
+++ b/symbols/nl
@@ -0,0 +1,54 @@
+
+// based on
+// Converted keytable file to xkb/symbols/ file
+// with mk_xkb by root@linux.chanae.stben.be Tue Sep 30 00:53:29 MET DST 1997
+
+// converted from the nl-latin.map of the Linux kbd package by
+// Pablo Saratxaga <srtxg@f2219.n293.z2.fidonet.org>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/nl,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin"
+
+    name[Group1]="Nederland";
+
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
+    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
+    key <AE07>	{ [         7, underscore,     sterling, seveneighths ]	};
+    key <AE08>	{ [         8,  parenleft,    braceleft,    trademark ]	};
+    key <AE09>	{ [         9, parenright,   braceright,    plusminus ]	};
+    key <AE10>	{ [         0, apostrophe,   braceright,       degree ]	};
+    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [    degree, dead_tilde, dead_cedilla,  dead_ogonek ]	};
+
+    key <AD03>	{ [         e,          E,       eacute,       Eacute ]	};
+    key <AD05>	{ [         t,          T,        thorn,        THORN ]	};
+    key <AD06>	{ [         y,          Y,   ydiaeresis,          yen ]	};
+    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
+    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
+    key <AD09>	{ [         o,          O,       ograve,       Ograve ]	};
+    key <AD10>	{ [         p,          P,    paragraph,        THORN ]	};
+    key <AD11>	{ [dead_diaeresis, dead_tilde, asciitilde, asciicircum]	};
+    key <AD12>	{ [  asterisk,        bar,   dead_tilde,  dead_macron ]	};
+
+    key <AC01>	{ [         a,          A,       aacute,       Aacute ]	};
+    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};
+    key <AC10>	{ [      plus,  plusminus,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [apostrophe,      grave,   dead_acute,   dead_grave ]	};
+    key <TLDE>	{ [        at,    section,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [      less,    greater,   dead_grave,   dead_breve ]	};
+    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};
+    key <AB07>	{ [         m,          M,     Greek_mu,    masculine ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla, guillemotleft]	};
+    key <AB09>	{ [    period,      colon, periodcentered, guillemotright ] };
+    key <AB10>	{ [     minus,      equal,       hyphen, dead_abovedot]	};
+
+    key <LSGT>	{ [bracketleft, bracketright,       bar,    brokenbar ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
diff --git a/symbols/no b/symbols/no
new file mode 100644
index 00000000..76bda26f
--- /dev/null
+++ b/symbols/no
@@ -0,0 +1,46 @@
+
+// based on a keyboard map from an 'xkb/symbols/no' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/no,v 1.3 2002/12/19 01:07:56 dawes Exp $
+
+partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a Norwegian keyboard with dead key support
+    // and all of ISO-8859-1 characters available.
+
+    include "pc/latin(type2)"
+
+    name[Group1]="Norwegian";
+
+    key <AE11>	{ [      plus,   question,    plusminus, questiondown ]	};
+    key <AE12>	{ [ backslash, dead_grave,   dead_acute,      notsign ]	};
+
+
+    key <AC10>	{ [    oslash,   Ooblique,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [        ae,         AE, dead_circumflex, dead_caron]	};
+    key <TLDE>	{ [       bar,    section,    brokenbar,    paragraph ]	};
+
+    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
+    key <LSGT>	{ [      less,    greater,      onehalf, threequarters]	};
+
+    key <KPDL>  { [ KP_Delete, KP_Separator                           ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+
+    include "pc/no(basic)"
+
+    key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
+    key <AD12>	{ [ diaeresis, asciicircum,   asciitilde,      macron ]	};
+    key <AC10>	{ [    oslash,   Ooblique,        acute,  doubleacute ]	};
+    key <AC11>	{ [        ae,         AE,  asciicircum,        caron ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
+    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
+};
diff --git a/symbols/ogham b/symbols/ogham
new file mode 100644
index 00000000..fb050980
--- /dev/null
+++ b/symbols/ogham
@@ -0,0 +1,206 @@
+// $XFree86: xc/programs/xkbcomp/symbols/pc/ogham,v 1.2 2002/12/19 00:49:41 dawes Exp $
+//
+// Ogham keyboard map for XFree86
+//
+// Seamus O Ciardhuain <seoc@cnds.ucd.ie> (17 December 2002)
+//
+// Ogham keyboard layout as recommended in I.S. 434:1999.
+// Suitable for multi-layout xkbcomp.
+// Character names are given as in the Unicode standard,
+// range U+1680 to U+169F.
+
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1] = "Ogham";
+
+    key.type[Group1] = "ONE_LEVEL";
+
+    key <LSGT> { type[Group1]="TWO_LEVEL",
+                 [ 0x100169B, 0x100169C ] };
+                 // OGHAM FEATHER MARK, OGHAM REVERSED FEATHER MARK
+
+    key <BKSL> { [ 0x1001680 ] }; // OGHAM SPACE MARK
+
+    key <TLDE> { [ 0x100169C ] }; // OGHAM REVERSED FEATHER MARK
+
+    key <SPCE> { [ space ] };
+
+    //
+    // Top Row QWERTYUIOP
+    //
+    key <AD01> { [ 0x100168A ] };  // OGHAM LETTER CEIRT
+    key <AD02> { [ 0x1001695 ] };  // OGHAM LETTER EABHADH
+    key <AD03> { [ 0x1001693 ] };  // OGHAM LETTER EADHADH
+    key <AD04> { [ 0x100168F ] };  // OGHAM LETTER RUIS
+    key <AD05> { [ 0x1001688 ] };  // OGHAM LETTER TINNE
+    key <AD06> { [ 0x1001698 ] };  // OGHAM LETTER IFIN
+    key <AD07> { [ 0x1001692 ] };  // OGHAM LETTER UR
+    key <AD08> { [ 0x1001694 ] };  // OGHAM LETTER IODHADH
+    key <AD09> { [ 0x1001691 ] };  // OGHAM LETTER ONN
+    key <AD10> { [ 0x100169A ] };  // OGHAM LETTER PEITH
+
+    //
+    // Middle Row ASDFGHJKL
+    //
+    key <AC01> { [ 0x1001690 ] };  // OGHAM LETTER AILM
+    key <AC02> { [ 0x1001684 ] };  // OGHAM LETTER SAIL
+    key <AC03> { [ 0x1001687 ] };  // OGHAM LETTER DAIR
+    key <AC04> { [ 0x1001683 ] };  // OGHAM LETTER FEARN
+    key <AC05> { [ 0x100168C ] };  // OGHAM LETTER GORT
+    key <AC06> { [ 0x1001686 ] };  // OGHAM LETTER UATH
+    key <AC07> { [ 0x1001697 ] };  // OGHAM LETTER UILLEANN
+    key <AC08> { [ 0x1001696 ] };  // OGHAM LETTER OR
+    key <AC09> { [ 0x1001682 ] };  // OGHAM LETTER LUIS
+
+    //
+    // Bottom Row ZXCVBNM
+    //
+    key <AB01> { [ 0x100168E ] };  // OGHAM LETTER STRAIF
+    key <AB02> { [ 0x1001699 ] };  // OGHAM LETTER EAMHANCHOLL
+    key <AB03> { [ 0x1001689 ] };  // OGHAM LETTER COLL
+    key <AB04> { [ 0x100168D ] };  // OGHAM LETTER NGEADAL
+    key <AB05> { [ 0x1001681 ] };  // OGHAM LETTER BEITH
+    key <AB06> { [ 0x1001685 ] };  // OGHAM LETTER NION
+    key <AB07> { [ 0x100168B ] };  // OGHAM LETTER MUIN
+
+    // As an extension because <BKSL> and <LSGT> may not be
+    // available or sensible. These are also a bit more
+    // intuitive on a standard Irish keyboard.
+    key <AB08> { [ 0x100169C ] }; // OGHAM REVERSED FEATHER MARK
+    key <AB09> { [ 0x100169B ] }; // OGHAM FEATHER MARK
+    key <AB10> { [ 0x1001680 ] }; // OGHAM SPACE MARK
+
+    key <RWIN>  { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ]  };
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "laptop" {
+    // For laptops which don't have the RWIN key but are otherwise
+    // the same as 105-key layouts.
+    include "ogham(basic)"
+    key <MENU>  { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ]  };
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "is434" {
+
+    // This has the full layout of IS434 with an Irish QWERTY keyboard,
+    // and the Ogham characters accessed when CAPS LOCK is on.
+
+    name[Group1] = "Ogham (IS434)";
+
+    key.type[Group1] = "THREE_LEVEL";
+
+    key <LSGT> { type[Group1] = "FOUR_LEVEL_ALPHABETIC",
+                 [ backslash, bar, 0x100169B, 0x100169C ] };
+                 // OGHAM FEATHER MARK, OGHAM REVERSED FEATHER MARK
+
+    key <BKSL> { [ numbersign, asciitilde, 0x1001680 ] }; // OGHAM SPACE MARK
+    key <TLDE> { [      grave,    notsign, 0x100169C ] }; // OGHAM REVERSED FEATHER MARK
+    key <SPCE> { [      space,      space,     space ] };
+
+    //
+    // Numeric row
+    //
+    key <AE01> { type[Group1]="TWO_LEVEL", [     1,      exclam            ] };
+    key <AE02> { type[Group1]="TWO_LEVEL", [     2,    quotedbl            ] };
+    key <AE03> { type[Group1]="TWO_LEVEL", [     3,    sterling            ] };
+    key <AE04> {                           [     4,      dollar,  EuroSign ] };
+    key <AE05> { type[Group1]="TWO_LEVEL", [     5,     percent            ] };
+    key <AE06> { type[Group1]="TWO_LEVEL", [     6, asciicircum            ] };
+    key <AE07> {                           [     7,   ampersand, 0x100204A ] }; // Tironian Et
+    key <AE08> { type[Group1]="TWO_LEVEL", [     8,    asterisk            ] };
+    key <AE09> { type[Group1]="TWO_LEVEL", [     9,   parenleft            ] };
+    key <AE10> { type[Group1]="TWO_LEVEL", [     0,  parenright            ] };
+    key <AE11> { type[Group1]="TWO_LEVEL", [ minus,  underscore            ] };
+    key <AE12> { type[Group1]="TWO_LEVEL", [ equal,        plus            ] };
+
+    //
+    // Top Row QWERTYUIOP
+    //
+    key <AD01> { [ q, Q, 0x100168A ] };  // OGHAM LETTER CEIRT
+    key <AD02> { [ w, W, 0x1001695 ] };  // OGHAM LETTER EABHADH
+    key <AD03> { [ e, E, 0x1001693 ] };  // OGHAM LETTER EADHADH
+    key <AD04> { [ r, R, 0x100168F ] };  // OGHAM LETTER RUIS
+    key <AD05> { [ t, T, 0x1001688 ] };  // OGHAM LETTER TINNE
+    key <AD06> { [ y, Y, 0x1001698 ] };  // OGHAM LETTER IFIN
+    key <AD07> { [ u, U, 0x1001692 ] };  // OGHAM LETTER UR
+    key <AD08> { [ i, I, 0x1001694 ] };  // OGHAM LETTER IODHADH
+    key <AD09> { [ o, O, 0x1001691 ] };  // OGHAM LETTER ONN
+    key <AD10> { [ p, P, 0x100169A ] };  // OGHAM LETTER PEITH
+
+    //
+    // Middle Row ASDFGHJKL
+    //
+    key <AC01> { [ a, A, 0x1001690 ] };  // OGHAM LETTER AILM
+    key <AC02> { [ s, S, 0x1001684 ] };  // OGHAM LETTER SAIL
+    key <AC03> { [ d, D, 0x1001687 ] };  // OGHAM LETTER DAIR
+    key <AC04> { [ f, F, 0x1001683 ] };  // OGHAM LETTER FEARN
+    key <AC05> { [ g, G, 0x100168C ] };  // OGHAM LETTER GORT
+    key <AC06> { [ h, H, 0x1001686 ] };  // OGHAM LETTER UATH
+    key <AC07> { [ j, J, 0x1001697 ] };  // OGHAM LETTER UILLEANN
+    key <AC08> { [ k, K, 0x1001696 ] };  // OGHAM LETTER OR
+    key <AC09> { [ l, L, 0x1001682 ] };  // OGHAM LETTER LUIS
+
+    //
+    // Bottom Row ZXCVBNM
+    //
+    key <AB01> { [ z, Z, 0x100168E ] };  // OGHAM LETTER STRAIF
+    key <AB02> { [ x, X, 0x1001699 ] };  // OGHAM LETTER EAMHANCHOLL
+    key <AB03> { [ c, C, 0x1001689 ] };  // OGHAM LETTER COLL
+    key <AB04> { [ v, V, 0x100168D ] };  // OGHAM LETTER NGEADAL
+    key <AB05> { [ b, B, 0x1001681 ] };  // OGHAM LETTER BEITH
+    key <AB06> { [ n, N, 0x1001685 ] };  // OGHAM LETTER NION
+    key <AB07> { [ m, M, 0x100168B ] };  // OGHAM LETTER MUIN
+
+    // As an extension because <BKSL> and <LSGT> may not be
+    // available or sensible. These are also a bit more
+    // intuitive on a standard Irish keyboard.
+    key <AB08> { [  comma,     less, 0x100169C ] }; // OGHAM REVERSED FEATHER MARK
+    key <AB09> { [ period,  greater, 0x100169B ] }; // OGHAM FEATHER MARK
+    key <AB10> { [  slash, question, 0x1001680 ] }; // OGHAM SPACE MARK
+
+    // The standard says the Ogham characters should be accessed when
+    // Caps Lock is down; not clear if this means it should lock but
+    // seems logical.
+
+    key <CAPS>  { type[Group1] = "ONE_LEVEL", [ ISO_Level3_Lock ] };
+
+    // Also allow access to Ogham characters using RALT for convenience
+    key <RALT>  { type[Group1] = "ONE_LEVEL", [ ISO_Level3_Shift ] };
+
+    modifier_map Mod5  { ISO_Level3_Shift, ISO_Level3_Lock };
+
+    // Redefine Scroll Lock as locking shift in case that's needed.
+    // Also overcomes annoying use of Scroll Lock LED inherited from
+    // US symbols but not relevant here since we're not changing group.
+    key <SCLK> {type[Group1] = "ONE_LEVEL", [ Shift_Lock ] };
+    modifier_map Shift { Shift_Lock }; 
+
+    key <RWIN>  { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ]  };
+};
+
+partial alphanumeric_keys
+xkb_symbols "IS434" {
+    // just has uppercase in the name
+    include "ogham(is434)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "is434laptop" {
+    // For laptops which don't have the RWIN key but are otherwise
+    // the same as 105-key layouts.
+    include "ogham(is434)"
+    key <MENU>  { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ]  };
+};
+
+partial alphanumeric_keys
+xkb_symbols "IS434laptop" {
+    // just has uppercase in the name
+    include "ogham(is434)"
+    key <MENU>  { type[Group1]="TWO_LEVEL", [ Multi_key, ISO_Next_Group ]  };
+};
diff --git a/symbols/ori b/symbols/ori
new file mode 100644
index 00000000..39018258
--- /dev/null
+++ b/symbols/ori
@@ -0,0 +1,66 @@
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    // Inscript layout for Oriya  
+    // Author: G Karunakar <karunakar@freedomink.org>
+    // Date: Wed Nov 13 18:16:19 IST 2002
+
+    name[Group1]= "Oriya";
+    
+    key <TLDE> { [  0x01000b4a, 0x01000b12	] };
+    key <AE01> { [  0x01000b67, 0x01000b0d	] };
+    key <AE02> { [  0x01000b68, 0x01000b45	] };
+    key <AE03> { [  0x01000b69			] };
+    key <AE04> { [  0x01000b6a			] };
+    key <AE05> { [  0x01000b6b			] };
+    key <AE06> { [  0x01000b6c			] };
+    key <AE07> { [  0x01000b6d			] };
+    key <AE08> { [  0x01000b6e			] };
+    key <AE09> { [  0x01000b6f			] };
+    key <AE10> { [  0x01000b66			] };
+    key <AE11> { [  0x01000b03			] };
+    key <AE12> { [  0x01000b43, 0x01000b0b	] };
+
+    key <AD01> { [  0x01000b4c, 0x01000b14	] };
+    key <AD02> { [  0x01000b48, 0x01000b10	] };
+    key <AD03> { [  0x01000b3e, 0x01000b06	] };
+    key <AD04> { [  0x01000b40, 0x01000b08	] };
+    key <AD05> { [  0x01000b42, 0x01000b0a	] };
+    key <AD06> { [  0x01000b2c, 0x01000b2d	] };
+    key <AD07> { [  0x01000b39, 0x01000b19	] };
+    key <AD08> { [  0x01000b17, 0x01000b18	] };
+    key <AD09> { [  0x01000b26, 0x01000b27	] };
+    key <AD10> { [  0x01000b1c, 0x01000b1d	] };
+    key <AD11> { [  0x01000b21, 0x01000b22	] };
+    key <AD12> { [  0x01000b3c, 0x01000b1e	] };
+ 
+    key <AC01> { [  0x01000b4b, 0x01000b13	] };
+    key <AC02> { [  0x01000b47, 0x01000b0f	] };
+    key <AC03> { [  0x01000b4d, 0x01000b05	] };
+    key <AC04> { [  0x01000b3f, 0x01000b07	] };
+    key <AC05> { [  0x01000b41, 0x01000b09	] };
+    key <AC06> { [  0x01000b2a, 0x01000b2b	] };
+    key <AC07> { [  0x01000b30, 0x01000b31	] };
+    key <AC08> { [  0x01000b15, 0x01000b16	] };
+    key <AC09> { [  0x01000b24, 0x01000b25	] };
+    key <AC10> { [  0x01000b1a, 0x01000b1b	] };
+    key <AC11> { [  0x01000b1f, 0x01000b20	] };
+ 
+    key <AB01> { [  0x01000b46, 0x01000b0e	] };
+    key <AB02> { [  0x01000b02, 0x01000b01	] };
+    key <AB03> { [  0x01000b2e, 0x01000b23	] };
+    key <AB04> { [  0x01000b28, 0x01000b29	] };
+    key <AB05> { [  0x01000b35, 0x01000b34	] };
+    key <AB06> { [  0x01000b32, 0x01000b33	] };
+    key <AB07> { [  0x01000b38, 0x01000b36	] };
+    key <AB08> { [  comma     , 0x01000b37	] };
+    key <AB09> { [  period    , 0x01000b64	] };
+    key <AB10> { [  0x01000b2f, 0x01000040	] };
+    key <BKSL> { [  0x01000b49, 0x01000b11	] };
+
+    key <RALT> {
+	symbols[Group1] = [ Mode_switch, Multi_key ],
+	virtualMods = AltGr
+    };
+};
diff --git a/symbols/pc b/symbols/pc
new file mode 100644
index 00000000..cf2039e9
--- /dev/null
+++ b/symbols/pc
@@ -0,0 +1,262 @@
+
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/pc,v 1.9 2003/06/09 19:59:46 dawes Exp $
+
+partial hidden alphanumeric_keys modifier_keys 
+xkb_symbols "basic" {
+
+    key <ESC>  {	[ Escape			]	};
+
+    // Alphanumeric section
+    key <TLDE> {	[     grave,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[     minus,	underscore	]	};
+    key <AE12> {	[     equal,	plus		]	};
+
+    key <BKSP> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ BackSpace,   Terminate_Server ]
+    };
+
+    key  <TAB> {	[ 	Tab,	ISO_Left_Tab	]	};
+    key <RTRN> {	[ Return			]	};
+
+    key <CAPS> {	[	Caps_Lock		]	};
+
+    key <LFSH> {	[ 	 Shift_L		]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+
+    key <LCTL> {	[ 	 Control_L		]	};
+    key <SPCE> {	[ 	 space			]	};
+
+    key <RTSH> {	[ 	Shift_R		]	};
+    key <LALT> {	[ 	Alt_L	 	]	};
+    key <RCTL> {	[ 	Control_R	]	};
+    key <RALT> {	[	Alt_R		]	};
+
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F1,	XF86_Switch_VT_1 ]
+    };
+    key <FK02> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F2,	XF86_Switch_VT_2 ]
+    };
+    key <FK03> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F3,	XF86_Switch_VT_3 ]
+    };
+    key <FK04> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F4,	XF86_Switch_VT_4 ]
+    };
+    key <FK05> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F5,	XF86_Switch_VT_5 ]
+    };
+    key <FK06> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F6,	XF86_Switch_VT_6 ]
+    };
+    key <FK07> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F7,	XF86_Switch_VT_7 ]
+    };
+    key <FK08> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F8,	XF86_Switch_VT_8 ]
+    };
+    key <FK09> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F9,	XF86_Switch_VT_9 ]
+    };
+    key <FK10> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F10,	XF86_Switch_VT_10 ]
+    };
+    key <FK11> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F11,	XF86_Switch_VT_11 ]
+    };
+    key <FK12> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ F12,	XF86_Switch_VT_12 ]
+    };
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> {
+	type= "PC_SYSRQ",
+	symbols[Group1]= [ Print, Sys_Req ]
+    };
+    key <SYRQ> {
+	type= "PC_SYSRQ",
+	symbols[Group1]= [ Print, Sys_Req ]
+    };
+    key <SCLK> {  [  Scroll_Lock	]	};
+    key <PAUS> {
+	type= "PC_BREAK",
+	symbols[Group1]= [ Pause, Break ]
+    };
+    key <BRK> {
+	type= "PC_BREAK",
+	symbols[Group1]= [ Pause, Break ]
+    };
+    key  <INS> {	[  Insert		]	};
+    key <HOME> {	[  Home			]	};
+    key <PGUP> {	[  Prior		]	};
+    key <DELE> {	[  Delete		]	};
+    key  <END> {	[  End			]	};
+    key <PGDN> {	[  Next			]	};
+
+    key   <UP> {	[  Up			]	};
+    key <LEFT> {	[  Left			]	};
+    key <DOWN> {	[  Down			]	};
+    key <RGHT> {	[  Right		]	};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> {	[  Num_Lock, Pointer_EnableKeys		]	};
+
+// Ungrab cancels server/keyboard/pointer grabs
+    key <KPDV> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ KP_Divide,	XF86_Ungrab ]
+    };
+
+// ClsGrb kills whichever client has a grab in effect
+    key <KPMU> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ KP_Multiply,	XF86_ClearGrab ]
+    };
+
+// -VMode switches to the previous video mode
+    key <KPSU> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ KP_Subtract,	XF86_Prev_VMode ]
+    };
+
+    key  <KP7> {	[  KP_Home,	KP_7	]	};
+    key  <KP8> {	[  KP_Up,	KP_8	]	};
+    key  <KP9> {	[  KP_Prior,	KP_9	]	};
+
+// +VMode switches to the next video mode
+    key <KPAD> {
+        type="CTRL+ALT",
+        symbols[Group1]= [ KP_Add,	XF86_Next_VMode ]
+    };
+
+    key  <KP4> {	[  KP_Left,	KP_4	]	};
+    key  <KP5> {	[  KP_Begin,	KP_5	]	};
+    key  <KP6> {	[  KP_Right,	KP_6	]	};
+
+    key  <KP1> {	[  KP_End,	KP_1	]	};
+    key  <KP2> {	[  KP_Down,	KP_2	]	};
+    key  <KP3> {	[  KP_Next,	KP_3	]	};
+    key <KPEN> {	[  	KP_Enter	]	};
+    key <KPEQ> {	[  	KP_Equal	]	};
+
+    key  <KP0> {	[  KP_Insert,	KP_0	]	};
+    key <KPDL> {  	[  KP_Delete,	KP_Decimal ]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod2   { Num_Lock };
+
+    //  Fake keys for virtual<->real modifiers mapping 
+    key <LVL3> {	[ ISO_Level3_Shift	]	};
+    key <MDSW> {	[ Mode_switch 		]	};
+    modifier_map Mod5   { <LVL3>, <MDSW> };
+
+    key <ALT>  {	[ NoSymbol, Alt_L	]	};
+    modifier_map Mod1   { <ALT>, <LALT> };
+
+    key <META> {	[ NoSymbol, Meta_L	]	};
+    modifier_map Mod1   { <META> };
+
+    key <SUPR> {	[ NoSymbol, Super_L	]	};
+    modifier_map Mod4   { <SUPR> };
+
+    key <HYPR> {	[ NoSymbol, Hyper_L	]	};
+    modifier_map Mod4   { <HYPR> };
+};
+
+// definition for the PC-AT type 101 key keyboard
+xkb_symbols "pc101" {
+    include "pc/pc(basic)"
+    key <LALT> {	[ 	Alt_L,	Meta_L 		]	};
+    key <RALT> {	[	Alt_R,	Meta_R		]	};
+
+};
+
+// definition for the extra key on 102-key keyboards
+xkb_symbols "pc102" {
+    include "pc/pc(pc101)"
+    key <LSGT> { [      less,    greater,          bar,    brokenbar ]	};
+};
+
+// definition for the extra keys on 104-key "Windows95" keyboards
+default
+xkb_symbols "pc104" {
+    include "pc/pc(basic)"
+    key <LALT> {	[ 	Alt_L,	Meta_L		]	};
+    key <RALT> {	[	Alt_R,	Meta_R		]	};
+    key <LWIN> {	[	Super_L			]	};
+    key <RWIN> {	[	Super_R			]	};
+    key <MENU> {	[	Menu			]	};
+
+};
+
+// defintion which includes both the Windows95 keyboards _and_
+// the extra key on most European keyboards.
+xkb_symbols "pc105" {
+    include "pc/pc(pc104)"
+    key <LSGT> { [      less,    greater,          bar,    brokenbar ]	};
+};
+
+// common keys which can be overwritten in some layouts
+xkb_symbols "common" {
+
+    // Alphanumeric section
+    key <TLDE> {	[     grave,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[     minus,	underscore	]	};
+    key <AE12> {	[     equal,	plus		]	};
+
+    key <BKSL> {	[ backslash,	bar		]	};
+    key <SPCE> {	[ 	 space			]	};
+
+    // "Keypad" section
+    key <KPDL> {  	[  KP_Delete,	KP_Decimal	]	};
+
+    // extra keys on 104-key "Windows95" keyboards
+    key <LWIN> {	[	Super_L			]	};
+    key <RWIN> {	[	Super_R			]	};
+    key <MENU> {	[	Menu			]	};
+
+    // the extra key on most European keyboards
+    key <LSGT> { [      less,    greater,          bar,    brokenbar ]	};
+};
diff --git a/symbols/pl b/symbols/pl
new file mode 100644
index 00000000..76774752
--- /dev/null
+++ b/symbols/pl
@@ -0,0 +1,25 @@
+
+// based on a keyboard map from an 'xkb/symbols/pl' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/pl,v 1.3 2003/04/19 12:22:12 pascal Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin"
+
+    name[Group1]="Polish";
+
+    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 <AB01>	{ [         z,          Z,    zabovedot,    Zabovedot ]	};
+    key <AB02>	{ [         x,          X,       zacute,       Zacute ]	};
+    key <AB03>	{ [         c,          C,       cacute,       Cacute ]	};
+    key <AB06>	{ [         n,          N,       nacute,       Nacute ]	};
+
+    include "level3(ralt_switch)"
+};
diff --git a/symbols/pl2 b/symbols/pl2
new file mode 100644
index 00000000..bb00cfaa
--- /dev/null
+++ b/symbols/pl2
@@ -0,0 +1,46 @@
+
+// based on a keyboard map from an 'xkb/symbols/pl2' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/pl2,v 1.4 2003/04/19 12:22:12 pascal Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a very simple QWERTZ Polish keybaord
+
+    include "pc/latin(type3)"
+
+    name[Group1]="Polish";
+
+    key <AE01>	{ [         1,     exclam,   asciitilde,   exclamdown ]	};
+    key <AE02>	{ [         2,   quotedbl,   dead_caron,    oneeighth ]	};
+    key <AE03>	{ [         3, numbersign, dead_circumflex,  sterling ]	};
+    key <AE04>	{ [         4,     dollar,   dead_breve,       dollar ]	};
+    key <AE05>	{ [         5,    percent,       degree, threeeighths ]	};
+    key <AE06>	{ [         6,  ampersand,  dead_ogonek,  fiveeighths ]	};
+    key <AE07>	{ [         7,      slash,   dead_grave, seveneighths ]	};
+    key <AE08>	{ [         8,  parenleft, dead_abovedot,   trademark ]	};
+    key <AE09>	{ [         9, parenright,   dead_acute,    plusminus ]	};
+    key <AE10>	{ [         0,      equal, dead_doubleacute,   degree ]	};
+    key <AE11>	{ [      plus,   question, dead_diaeresis, questiondown ] };
+    key <AE12>	{ [apostrophe,   asterisk, dead_cedilla,  dead_ogonek ]	};
+
+    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 <AC08>	{ [         k,          K,          kra,    ampersand ]	};
+    key <AC09>	{ [         l,          L,      lstroke,      Lstroke ]	};
+    key <AC10>	{ [   lstroke,    Lstroke,       dollar, dead_doubleacute ] };
+    key <AC11>	{ [   aogonek,    eogonek,       ssharp,   dead_caron ]	};
+    key <TLDE>	{ [  abovedot, dead_ogonek,     notsign,      notsign ]	};
+
+    key <BKSL>	{ [    oacute,     zacute,   dead_grave,   dead_breve ]	};
+    key <AB03>	{ [         c,          C,         cent,    copyright ]	};
+
+    include "level3(ralt_switch)"
+};
+
diff --git a/symbols/pt b/symbols/pt
new file mode 100644
index 00000000..266a9e82
--- /dev/null
+++ b/symbols/pt
@@ -0,0 +1,58 @@
+
+// based on a keyboard map from an 'xkb/symbols/pt' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/pt,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin(type4)"
+
+    name[Group1]="Portuguese";
+
+    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
+    key <AE04>	{ [         4,     dollar,      section,       dollar ]	};
+    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [guillemotleft, guillemotright, dead_cedilla, dead_ogonek ] };
+
+    key <AD11>	{ [      plus,   asterisk, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [dead_acute, dead_grave,   dead_tilde,  dead_macron ]	};
+
+    key <AC10>	{ [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };
+    key <AC11>	{ [ masculine, ordfeminine, dead_circumflex,   dead_caron ] };
+    key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};
+
+    key <BKSL>	{ [dead_tilde, dead_circumflex, dead_grave, dead_breve]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "Sundeadkeys" {
+
+    include "pc/pt(basic)" // for consistent naming
+
+    key <AD11>	{ [plus,   asterisk, SunFA_Diaeresis, SunFA_Diaeresis ]	};
+    key <BKSL>	{ [SunFA_Tilde, SunFA_Circum ]	};
+    key <AD12>	{ [SunFA_Acute, SunFA_Grave ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "sundeadkeys" {
+    include "pc/pt(Sundeadkeys)" // for consistent naming
+
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    include "pc/pt(basic)" // for consistent naming
+
+    key <AE12>	{ [guillemotleft, guillemotright, cedilla,     ogonek ]	};
+    key <AD11>	{ [      plus,   asterisk,     quotedbl,     quotedbl ]	};
+    key <AD12>	{ [     acute,      grave ]	};
+    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};
+    key <AC11>	{ [ masculine, ordfeminine, asciicircum,        caron ]	};
+    key <BKSL>	{ [asciitilde, asciicircum ]	};
+    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
+};
diff --git a/symbols/ro b/symbols/ro
new file mode 100644
index 00000000..c66e38bc
--- /dev/null
+++ b/symbols/ro
@@ -0,0 +1,99 @@
+// $XFree86: xc/programs/xkbcomp/symbols/pc/ro,v 1.6 2003/09/08 13:12:51 pascal Exp $
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Romanian keybaord
+    // Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003
+
+    include "pc/latin"
+
+    name[Group1]="Romanian";
+
+    // Alphanumeric section
+    key <TLDE> { [ bracketright, bracketleft		]	};
+
+    key <AE01> { [            1,      exclam,  asciitilde, asciitilde	] };
+    key <AE02> { [	      2,    quotedbl,          at,         at	] };
+    key <AE03> { [	      3,  numbersign, asciicircum,asciicircum	] };
+    key <AE04> { [	      4,    currency		]	};
+    key <AE05> { [	      5,     percent,      degree,     degree	] };
+    key <AE06> { [	      6,   ampersand		]	};
+    key <AE07> { [	      7,       slash,       grave,      grave	] };
+    key <AE08> { [	      8,   parenleft		]	};
+    key <AE09> { [	      9,  parenright		]	};
+    key <AE10> { [	      0,       equal		]	};
+    key <AE11> { [         plus,    question		]	};
+    key <AE12> { [   apostrophe,    asterisk		]	};
+
+    key <AD01> { [	     q,	          Q,    backslash,  backslash	] };
+    key <AD02> { [           w,           W,          bar,        bar	] };
+    key <AD03> { [	     e,	          E,     EuroSign,   EuroSign	] };
+    key <AD05> { [	     t,	          T		]	};
+    key <AD06> { [	     z,	          Z		]	};
+    key <AD07> { [	     u,	          U		]	};
+    key <AD08> { [	     i,	          I		]	};
+    key <AD11> { [      abreve,	     Abreve,     division,   division	] };
+    key <AD12> { [ icircumflex,	Icircumflex,     multiply,   multiply	] };
+
+    key <AC04> { [	     f,	          F		]	};
+    key <AC05> { [	     g,           G		]	};
+    key <AC10> { [    scedilla,    Scedilla,       dollar,     dollar	] };
+    key <AC11> { [    tcedilla,    Tcedilla,       ssharp,     ssharp	] };
+
+    key <AB01> { [	     y,	          Y 		]	};
+    key <AB05> { [           b,           B,    braceleft,  braceleft	] };
+    key <AB06> { [           n,           N,   braceright, braceright	] };
+    key <AB07> { [           m,           M,      section,    section	] };
+    key <AB08> { [       comma,	  semicolon,         less,       less	] };
+    key <AB09> { [      period,	      colon,      greater,    greater	] };
+    key <AB10> { [       minus,	 underscore		]	};
+
+    key <BKSL> { [ acircumflex,	Acircumflex		]	};
+
+    // End alphanumeric section, begin "Keypad"
+    key <KPDL> { [  KP_Delete,	KP_Separator		]	};
+    // End "Keypad" section
+
+    include "level3(ralt_switch_multikey)"
+};
+
+// based on a keyboard
+// Created by Cristian Gafton, <gafton@redhat.com> (C) 2000
+// Modified by Mi�u Moldovan, <dumol@go.ro> (C) 2001
+// Modified by Marius Andreiana, <mandreiana@yahoo.com> (C) 2001
+//
+partial alphanumeric_keys
+xkb_symbols "us_ro" {
+
+    include "pc/latin"
+
+    name[Group1]="Romanian for us-keyboard";
+
+    key <AD01>	{ [         q,          Q,  acircumflex,  Acircumflex ]	};
+    key <AD05>	{ [         t,          T,     tcedilla,     Tcedilla ]	};
+    key <AD08>	{ [         i,          I,  icircumflex,  Icircumflex ]	};
+
+    key <AC01>	{ [         a,          A,       abreve,       Abreve ]	};
+    key <AC02>	{ [         s,          S,     scedilla,     Scedilla ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+// Romanian keyboard with access to German umlauts";
+// Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003
+// German umlauts are accessible with <AltGr> and a, o , u, s (+shift for capital letters)
+//
+partial alphanumeric_keys
+xkb_symbols "ro_de" {
+
+    include "pc/ro(basic)"
+
+    name[Group1]="German for Romanian keyboard";
+
+    key <AD07> { [          u,   U,     udiaeresis,     Udiaeresis  ] };
+    key <AD09> { [          o,   O,     odiaeresis,     Odiaeresis  ] };
+    key <AC01> { [          a,   A,     adiaeresis,     Adiaeresis  ] };
+    key <AC02> { [          s,   S,     ssharp    ,     ssharp      ] };
+};
diff --git a/symbols/ru b/symbols/ru
new file mode 100644
index 00000000..c81857f9
--- /dev/null
+++ b/symbols/ru
@@ -0,0 +1,165 @@
+
+// based on
+// russian standard keyboard
+// AEN <aen@logic.ru>
+// Last Changes 2001/12/23 by Leon Kanter <leon@blackcatlinux.com>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/ru,v 1.3 2003/02/15 22:27:05 dawes Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Russian";
+
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,      numbersign	]	};
+    key	<AE04> {	[		4,        asterisk	]	};
+    key	<AE05> {	[		5,	     colon	]	};
+    key	<AE06> {	[		6,	     comma	]	};
+    key	<AE07> {	[		7,	    period	]	};
+    key	<AE08> {	[		8,	 semicolon	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+    key	<AE11> {	[	    minus,	underscore	]	};
+    key	<AE12> {	[	    equal,	      plus	]	};
+    key	<BKSL> {	[	backslash,             bar	]	};
+    key	<AB10> {	[	    slash,	  question	]	};
+    key <LSGT> {        [           slash,             bar      ]       };
+
+key.type[group1]="ALPHABETIC";
+
+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    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_yeru,   Cyrillic_YERU	]	};
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+
+key.type[group1]="TWO_LEVEL";
+
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+    include "pc/ru(basic)"
+    key <AE03> {        [               3,      numerosign      ]       };
+    key <AE04> {        [               4,       semicolon      ]       };
+    key <AE05> {        [               5,         percent      ]       };
+    key <AE06> {        [               6,           colon      ]       };
+    key <AE07> {        [               7,        question      ]       };
+    key <AE08> {        [               8,        asterisk      ]       };
+    key <AB10> {        [          period,           comma      ]       };
+    key <BKSL> {        [       backslash,           slash      ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "typewriter" {
+    include "pc/ru(basic)"
+    key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
+    key	<AE01> {	[	   exclam,		 1 	]	};
+    key	<AE02> {	[      numerosign,		 2	]	};
+    key	<AE03> {	[	    slash,		 3	]	};
+    key	<AE04> {	[	semicolon,		 4	]	};
+    key	<AE05> {	[	    colon,		 5	]	};
+    key	<AE06> {	[	    comma,		 6	]	};
+    key	<AE07> {	[	   period,		 7	]	};
+    key	<AE08> {	[      underscore,		 8	]	};
+    key	<AE09> {	[	 question,		 9	]	};
+    key	<AE10> {	[	  percent,		 0	]	};
+    key	<BKSL> {	[	parenleft,	parenright	]	};
+
+key.type[group1]="ALPHABETIC";
+
+    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "phonetic" {
+
+    name[Group1]= "Russian(phonetic)";
+
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        	at	]	};
+    key	<AE03> {	[		3,     Cyrillic_io 	]	};
+    key	<AE04> {	[		4,     Cyrillic_IO	]	};
+    key	<AE05> {	[		5,	   percent	]	};
+    key	<AE06> {	[		6,     asciicircum	]	};
+    key	<AE07> {	[		7,	 ampersand	]	};
+    key	<AE08> {	[		8,        asterisk	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+
+    key	<AB09> {	[	   period,	   greater	]	};
+    key	<AB10> {	[	    slash,	  question	]	};
+    key	<AB08> {	[	    comma,	      less	]	};
+    key	<AC10> {	[	semicolon,	     colon	]	};
+    key	<AC11> {	[      apostrophe,	  quotedbl	]	};
+    key	<LSGT> {	[	      bar,	 brokenbar	]	};
+
+key.type[group1]="ALPHABETIC";
+
+    key	<TLDE> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<LatQ> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<LatZ> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<LatS> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<LatA> {	[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<LatW> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<LatC> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<LatX> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<LatD> {	[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<LatE> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<LatV> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<LatF> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<LatT> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<LatR> {	[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<LatN> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<LatB> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<LatH> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<LatG> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<LatY> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
+    key	<LatM> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<LatJ> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<LatU> {	[      Cyrillic_u,	Cyrillic_U	]	};
+    key	<LatK> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<LatI> {	[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<LatO> {	[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<LatL> {	[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<LatP> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+
+    key	<AE11> {	[	    minus, Cyrillic_hardsign	]	};
+    key	<AD11> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AE12> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AD12> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	]	};
+};
diff --git a/symbols/sapmi b/symbols/sapmi
new file mode 100644
index 00000000..e9f3cd43
--- /dev/null
+++ b/symbols/sapmi
@@ -0,0 +1,94 @@
+
+// based on
+// Northern Sami keyboards for Finland, Norway and Sweden
+//
+// Describes the differences between a very simple en_US
+// keyboard and a Norwegian Northern Sami keyboard (with
+// dead key support) according to the spec on
+// http://www.hum.uit.no/a/trond/se-lat9-no-keys.html
+// Written by B�rre Gaup <boerre.gaup@pc.nu>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/sapmi,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+partial alphanumeric_keys
+xkb_symbols "basic" {
+    include "pc/latin"
+
+    name[Group1]= "S�megiella";
+
+    key <AE01>	{ [         1,     exclam,    copyright,   exclamdown ]	};
+    key <AE02>	{ [         2,   quotedbl,           at,   registered ]	};
+    key <AE03>	{ [         3, numbersign,     sterling,         less ]	};
+    key <AE04>	{ [         4,     dollar,       dollar,      greater ]	};
+    key <AE05>	{ [         5,    percent,        U2022,        U2030 ]	};
+    key <AE06>	{ [         6,  ampersand,      section,    paragraph ]	};
+    key <AE07>	{ [         7,      slash,    braceleft,          bar ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
+    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
+    key <AE10>	{ [         0,      equal,   braceright,     notequal ]	};
+    key <AE11>	{ [      plus,   question,     division, questiondown ]	};
+    key <AE12>	{ [ backslash,      grave,        acute,   asciitilde ]	};
+
+    key <AD01>	{ [    aacute,     Aacute,            q,            Q ]	};
+    key <AD02>	{ [    scaron,     Scaron,            w,            W ]	};
+    key <AD03>	{ [         e,          E,       eacute,       Eacute ]	};
+    key <AD04>	{ [         r,          R,   registered,    trademark ]	};
+    key <AD06>	{ [         y,          Y,       yacute,       Yacute ]	};
+    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
+    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
+    key <AD09>	{ [         o,          O,           oe,           OE ]	};
+    key <AD11>	{ [     aring,      Aring,  acircumflex,  Acircumflex ]	};
+    key <AD12>	{ [       eng,        ENG,     quotedbl,  asciicircum ]	};
+
+    key <AC01>	{ [         a,          A,       agrave,       Agrave ]	};
+    key <AC02>	{ [         s,          S,       ssharp,   apostrophe ]	};
+    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};
+    key <AC05>	{ [         g,          G,       gcaron,       Gcaron ]	};
+    key <AC06>	{ [         h,          H,        U01E5,        U01E4 ]	};
+    key <AC07>	{ [         j,          J,      notsign,     multiply ]	};
+    key <AC08>	{ [         k,          K,        U01E9,        U01E8 ]	};
+    key <AC09>	{ [         l,          L,       degree,       hyphen ]	};
+    key <AC10>	{ [    oslash,   Ooblique,   odiaeresis,   Odiaeresis ]	};
+    key <AC11>	{ [        ae,         AE,   adiaeresis,   Adiaeresis ]	};
+    key <TLDE>	{ [       bar,    section,    brokenbar,    paragraph ]	};
+
+    key <BKSL>	{ [   dstroke,    Dstroke,   apostrophe,     asterisk ]	};
+    key <AB01>	{ [         z,          Z,        U0292,        U01B7 ]	};
+    key <AB02>	{ [    ccaron,     Ccaron,            x,            X ]	};
+    key <AB03>	{ [         c,          C,     ccedilla,     Ccedilla ]	};
+    key <AB04>	{ [         v,          V, lessthanequal, guillemotleft ] };
+    key <AB05>	{ [         b,          B, greaterthanequal, guillemotright ] };
+    key <AB06>	{ [         n,          N, leftsinglequotemark, leftdoublequotemark ] };
+    key <AB07>	{ [         m,          M, rightsinglequotemark, rightdoublequotemark ]	};
+    key <AB08>	{ [     comma,  semicolon, singlelowquotemark, doublelowquotemark ] };
+    key <AB09>	{ [    period,      colon,     ellipsis, periodcentered ] };
+    key <AB10>	{ [     minus, underscore,       endash,       emdash ]	};
+
+    key <LSGT>	{ type[Group1] = "FOUR_LEVEL",
+                  [    zcaron,     Zcaron,        U01EF,        U01EE ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+ xkb_symbols "sefi" {
+
+    // Describes the differences between a Norwegian Northern Sami
+    // (keyboard with dead key support) and a Swedish/Finnish Sami
+    // keyboard according to the specs at:
+    // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html
+
+    include "pc/sapmi(basic)"
+
+    key <AC10>	{ [odiaeresis, Odiaeresis,       oslash,     Ooblique ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis,           ae,           AE ]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Norwegian layout to eliminate dead keys
+
+    include "pc/sapmi(basic)"
+
+    key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
+};
diff --git a/symbols/se b/symbols/se
new file mode 100644
index 00000000..ddcfa9d1
--- /dev/null
+++ b/symbols/se
@@ -0,0 +1,46 @@
+
+// based on a keyboard map from an 'xkb/symbols/se' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/se,v 1.5 2003/01/26 02:01:48 dawes Exp $
+
+partial alphanumeric_keys
+xkb_symbols "basic" {
+    include "pc/latin(type2)"
+    include "pc/se(se)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "se" {
+
+    name[Group1]="Swedish";
+
+    key <AE05>	{ [         5,    percent,     EuroSign,         cent ]	};
+    key <AE11>	{ [      plus,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [dead_acute, dead_grave,    plusminus,      notsign ]	};
+
+
+    key <AC10>	{ [odiaeresis, Odiaeresis,       oslash,     Ooblique ]	};
+    key <AC11>	{ [adiaeresis, Adiaeresis,           ae,           AE ]	};
+    key <TLDE>	{ [   section,    onehalf,    paragraph, threequarters]	};
+
+    key <BKSL>	{ [apostrophe,   asterisk,        acute,     multiply ]	};
+
+    key <SPCE>	{ [     space,      space,        space, nobreakspace ]	};
+
+    key <KPDL>  { [ KP_Delete, KP_Separator                           ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "nodeadkeys" {
+
+    // Modifies the basic Swedish layout to eliminate all dead keys
+
+    include "pc/latin(type2)"
+    include "pc/latin(type2_nodeadkeys)"
+    include "pc/se(se)"
+
+    key <AE12>	{ [     acute,      grave,    plusminus,      notsign ]	};
+
+};
diff --git a/symbols/se_FI b/symbols/se_FI
new file mode 100644
index 00000000..72479189
--- /dev/null
+++ b/symbols/se_FI
@@ -0,0 +1,10 @@
+// Northern Sami keyboard for Finland
+// Written by B�rre Gaup <boerre.gaup@pc.nu>
+// Quick usage: setxkbmap se_FI
+//
+// $XFree86: xc/programs/xkbcomp/symbols/se_FI,v 1.1 2001/11/21 21:20:55 dawes Exp $
+
+partial alphanumeric_keys 
+ xkb_symbols "basic" {
+	include "pc/sapmi(sefi)"
+};
diff --git a/symbols/se_NO b/symbols/se_NO
new file mode 100644
index 00000000..48942f54
--- /dev/null
+++ b/symbols/se_NO
@@ -0,0 +1,10 @@
+// Northern Sami keyboard for Norway
+// Written by B�rre Gaup <boerre.gaup@pc.nu>
+// Quick usage: setxkbmap se_FI
+//
+// $XFree86: xc/programs/xkbcomp/symbols/se_NO,v 1.1 2001/11/21 21:20:55 dawes Exp $
+
+partial alphanumeric_keys 
+ xkb_symbols "basic" {
+	include "pc/sapmi(basic)"
+};
diff --git a/symbols/se_SE b/symbols/se_SE
new file mode 100644
index 00000000..06af1372
--- /dev/null
+++ b/symbols/se_SE
@@ -0,0 +1,10 @@
+// Northern Sami keyboard for Sweden
+// Written by B�rre Gaup <boerre.gaup@pc.nu>
+// Quick usage: setxkbmap se_FI
+//
+// $XFree86: xc/programs/xkbcomp/symbols/se_SE,v 1.1 2001/11/21 21:20:55 dawes Exp $
+
+partial alphanumeric_keys 
+ xkb_symbols "basic" {
+	include "pc/sapmi(sefi)"
+};
diff --git a/symbols/sgi.vndr/jp b/symbols/sgi.vndr/jp
new file mode 100644
index 00000000..31bb3b59
--- /dev/null
+++ b/symbols/sgi.vndr/jp
@@ -0,0 +1,46 @@
+// $Xorg: jp,v 1.3 2000/08/17 19:54:45 cpqbld Exp $
+xkb_symbols "jp106" {
+
+    name[group1]="Japan/ASCII";
+
+    key <HZTG> {         [ Zenkaku_Hankaku 		    ] };
+    key <AE01> {         [               1,          exclam ] };
+    key <AE02> {         [               2,        quotedbl ] };
+    key <AE03> {         [               3,      numbersign ] };
+    key <AE04> {         [               4,          dollar ] };
+    key <AE05> {         [               5,         percent ] };
+    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,         overbar ] };
+    key <AE13> {         [             yen,             bar ] };
+
+    // keys <TAB> and <AD01> - <AD10> are identical to US/ASCII keyboard
+    key <AD11> {         [              at,           grave ] };
+    key <AD12> {         [     bracketleft,       braceleft ] };
+
+    key <CAPS> {         [      Eisu_Shift,       Caps_Lock ] };
+    // keys <AC01> - <AC09> are identical to US/ASCII keyboard
+    key <AC10> {         [       semicolon,            plus ] };
+    key <AC11> {         [           colon,        asterisk ] };
+    key <AC12> {         [    bracketright,      braceright ] };
+
+    // keys <LFSH> and <AB01> - <AB10> are identical to US/ASCII keyboard
+    key <AB11> {         [       backslash,      underscore ] };
+
+    key <NFER> {         [        Muhenkan ] };
+    key <XFER> {         [           Kanji ] };
+    key <HKTG> {         [ Hiragana_Katakana ] };
+};
+
+xkb_symbols "alternate106" {
+    key <AE10> {         [               0,      overbar ] };
+    key <AE12> {         [     asciicircum,      asciitilde] };
+    key <AE13> {         [       backslash,             bar ] };
+    key <AB11> {         [        underbar,      underscore ] };
+    augment "sgi/jp(jp106)"
+};
+
diff --git a/symbols/si b/symbols/si
new file mode 100644
index 00000000..9d81ca55
--- /dev/null
+++ b/symbols/si
@@ -0,0 +1,46 @@
+
+// based on
+// Slovenian keyboards
+// by Marko Samastur (markos@elite.org) and
+// Primoz Peterlin (primoz.peterlin@biofiz.mf.uni-lj.si)
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/si,v 1.3 2003/02/05 01:38:36 dawes Exp $
+
+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    include "pc/latin(type3)"
+
+    name[Group1]="Slovene";
+
+    key <AE01>	{ [         1,     exclam,   asciitilde,   dead_tilde ]	};
+    key <AE02>	{ [         2,   quotedbl,   dead_caron,        caron ]	};
+    key <AE03>	{ [         3, numbersign,  asciicircum, dead_circumflex ] };
+    key <AE04>	{ [         4,     dollar,   dead_breve,        breve ]	};
+    key <AE05>	{ [         5,    percent,       degree, dead_abovering ] };
+    key <AE06>	{ [         6,  ampersand,  dead_ogonek,       ogonek ]	};
+    key <AE07>	{ [         7,      slash,        grave,   dead_grave ]	};
+    key <AE08>	{ [         8,  parenleft, dead_abovedot,    abovedot ]	};
+    key <AE09>	{ [         9, parenright,   dead_acute,   apostrophe ]	};
+    key <AE10>	{ [         0,      equal, dead_doubleacute, doubleacute ] };
+    key <AE11>	{ [apostrophe,   question, dead_diaeresis,  diaeresis ]	};
+    key <AE12>	{ [      plus,   asterisk, dead_cedilla,      cedilla ]	};
+
+    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
+    key <AD11>	{ [    scaron,     Scaron,     division, dead_abovering ] };
+    key <AD12>	{ [   dstroke,    Dstroke,     multiply,  dead_macron ]	};
+
+    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 ]	};
+
+    key <KPDL>	{ [ KP_Delete, KP_Separator ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
diff --git a/symbols/sk b/symbols/sk
new file mode 100644
index 00000000..28808636
--- /dev/null
+++ b/symbols/sk
@@ -0,0 +1,83 @@
+// $XFree86: xc/programs/xkbcomp/symbols/pc/sk,v 1.2 2002/11/22 04:02:22 dawes 
+// Exp $
+
+partial alphanumeric_keys 
+xkb_symbols "basic" {
+     
+     // This layout conforms to a new sk compromise standard designed 
+     // to satisfy most unix, windows and mac users.
+     // 2001 by Kamil Toman <ktoman@email.cz>
+
+    include "pc/latin"
+
+    name[Group1] = "Slovak";
+
+    key <TLDE>	{ [ semicolon, dead_abovering,    grave,   asciitilde ]	};
+    key <AE01>	{ [      plus,          1,       exclam,   dead_tilde ]	};
+    key <AE02>	{ [    lcaron,          2,           at,   dead_caron ]	};
+    key <AE03>	{ [    scaron,          3,   numbersign, dead_circumflex ] };
+    key <AE04>	{ [    ccaron,          4,       dollar,   dead_breve ]	};
+    key <AE05>	{ [    tcaron,          5,      percent, dead_abovering ] };
+    key <AE06>	{ [    zcaron,          6,  asciicircum,  dead_ogonek ]	};
+    key <AE07>	{ [    yacute,          7,    ampersand,   dead_grave ]	};
+    key <AE08>	{ [    aacute,          8,     asterisk, dead_abovedot ] };
+    key <AE09>	{ [    iacute,          9,    braceleft,   dead_acute ]	};
+    key <AE10>	{ [    eacute,          0,   braceright, dead_doubleacute ] };
+    key <AE11>	{ [     equal,    percent,     NoSymbol, dead_diaeresis ] };
+    key <AE12>	{ [dead_acute, dead_caron,  dead_macron, dead_cedilla ]	};
+
+    key <AD01>	{ [         q,          Q,    backslash,     NoSymbol ]	};
+    key <AD02>	{ [         w,          W,          bar,     Nosymbol ]	};
+    key <AD03>	{ [         e,          E,     EuroSign,     NoSymbol ]	};
+    key <AD04>	{ [         r,          R,     NoSymbol,     NoSymbol ]	};
+    key <AD05>	{ [         t,          T,     NoSymbol,     NoSymbol ]	};
+    key <AD06>	{ [         z,          Z,     NoSymbol,     NoSymbol ]	};
+    key <AD07>	{ [         u,          U,     NoSymbol,     NoSymbol ]	};
+    key <AD08>	{ [         i,          I,     NoSymbol,     NoSymbol ]	};
+    key <AD09>	{ [         o,          O,     NoSymbol,     NoSymbol ]	};
+    key <AD10>	{ [         p,          P,     NoSymbol,     NoSymbol ]	};
+
+    key <AD11>	{ [    uacute,      slash,  bracketleft,     division ]	};
+    key <AD12>	{ [adiaeresis,  parenleft, bracketright,     multiply ]	};
+
+    key <AC01>	{ [         a,          A,   asciitilde,     NoSymbol ]	};
+    key <AC02>	{ [         s,          S,      dstroke,     NoSymbol ]	};
+    key <AC03>	{ [         d,          D,      Dstroke,     NoSymbol ]	};
+    key <AC04>	{ [         f,          F,  bracketleft,     NoSymbol ]	};
+    key <AC05>	{ [         g,          G, bracketright,     NoSymbol ]	};
+    key <AC06>	{ [         h,          H,        grave,     NoSymbol ]	};
+    key <AC07>	{ [         j,          J,   apostrophe,     NoSymbol ]	};
+    key <AC08>	{ [         k,          K,      lstroke,     NoSymbol ]	};
+    key <AC09>	{ [         l,          L,      Lstroke,     NoSymbol ]	};
+                  
+    key <AC10>	{ [ocircumflex,   quotedbl,      dollar,     NoSymbol ]	};
+    key <AC11>	{ [   section,     exclam,   apostrophe,       ssharp ]	};
+    key <AC12>	{ [  EuroSign, dead_diaeresis, NoSymbol,     NoSymbol ]	};
+    key <BKSL>	{ [    ncaron, parenright,    backslash,          bar ]	};
+
+    key <LSGT>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+    key <AB01>	{ [         y,          Y,       degree,     NoSymbol ]	};
+    key <AB02>	{ [         x,          X,   numbersign,     Nosymbol ]	};
+    key <AB03>	{ [         c,          C,    ampersand,     NoSymbol ]	};
+    key <AB04>	{ [         v,          V,           at,     NoSymbol ]	};
+    key <AB05>	{ [         b,          B,    braceleft,     NoSymbol ]	};
+    key <AB06>	{ [         n,          N,   braceright,     NoSymbol ]	};
+    key <AB07>	{ [         m,          M,  asciicircum,     NoSymbol ]	};
+    key <AB08>	{ [     comma,   question,         less,     NoSymbol ]	};
+    key <AB09>	{ [    period,      colon,      greater,     NoSymbol ]	};
+    key <AB10>	{ [     minus, underscore,     asterisk,     NoSymbol ]	};
+
+    key <SPCE>  { [     space,      space, nobreakspace, nobreakspace ] };
+
+    key <KPDL>	{ type[Group1]="FOUR_LEVEL_KEYPAD",
+                  [ KP_Delete,      comma,    KP_Delete,   KP_Decimal ]	};
+
+    include "level3(ralt_switch_multikey)"
+};
+
+// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+xkb_symbols "bksl" {
+    include "pc/sk(basic)"
+
+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+};
diff --git a/symbols/sk_qwerty b/symbols/sk_qwerty
new file mode 100644
index 00000000..d434e226
--- /dev/null
+++ b/symbols/sk_qwerty
@@ -0,0 +1,21 @@
+// $XFree86$
+
+partial alphanumeric_keys 
+xkb_symbols "basic" {
+ 
+    // This layout should work exactly as a sk with the exception 
+    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
+    // 2001 by Kamil Toman <ktoman@email.cz>
+    
+    include "pc/sk(basic)"
+
+    key <AB01>	{ [         z,          Z,       degree,     NoSymbol ]	};
+    key <AD06>	{ [         y,          Y,     NoSymbol,     NoSymbol ]	};
+};
+
+// Use <BKSL> instead of <LSGT> (useful for keyboard without <LSGT> key)
+xkb_symbols "bksl" {
+    include "pc/sk_qwerty(basic)"
+
+    key <BKSL>	{ [ backslash,        bar,        slash,     NoSymbol ]	};
+};
diff --git a/symbols/sony.vndr/us b/symbols/sony.vndr/us
new file mode 100644
index 00000000..76d41053
--- /dev/null
+++ b/symbols/sony.vndr/us
@@ -0,0 +1,93 @@
+// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// US/ASCII layout for a nwp5461 keyboard
+xkb_symbols "nwp5461" {
+    include "us(basic)"
+
+    key <LALT> { [ Alt_L, Meta_L	]	};
+    key <RTSH> { [ Shift_R	]	};
+    key <AB11> { [ NoSymbol	]	};
+
+    // Begin "Function" section
+    key <FK01> { [ F1		]	};
+    key <FK02> { [ F2		]	};
+    key <FK03> { [ F3		]	};
+    key <FK04> { [ F4		]	};
+    key <FK05> { [ F5		]	};
+    key <FK06> { [ F6		]	};
+    key <FK07> { [ F7		]	};
+    key <FK08> { [ F8		]	};
+    key <FK09> { [ F9		]	};
+    key <FK10> { [ F10		]	};
+    key <FK11> { [ F11		]	};
+    key <FK12> { [ F12		]	};
+    key <HELP> { [ Help		]	};
+    key <STOP> { [ Cancel	]	};
+    key <CUT>  { [ Select	]	};
+    key <EXEC> { [ Execute	]	};
+    key <DELE> { [ Delete	]	};
+    key <LEFT> { [ Left		]	};
+    key <RGHT> { [ Right	]	};
+    key <UP>   { [ Up		]	};
+    key <DOWN> { [ Down		]	};
+    key <PGUP> { [ Prior	]	};
+    key <PGDN> { [ Next		]	};
+    key <INS>  { [ Insert	]	};
+    key <CLR>  { [ Clear	]	};
+    // End "Function" section
+
+    // Begin "Keypad" section
+    key <KPMU> { [ KP_Multiply	]	};
+    key <KPDV> { [ KP_Divide	]	};
+    key <KPAD> { [ KP_Add	]	};
+
+    key  <KP7> { [ KP_7		]	};
+    key  <KP8> { [ KP_8		]	};
+    key  <KP9> { [ KP_9		]	};
+    key <KPSU> { [ KP_Subtract	]	};
+
+    key  <KP4> { [ KP_4		]	};
+    key  <KP5> { [ KP_5		]	};
+    key  <KP6> { [ KP_6		]	};
+    key <KPSP> { [ KP_Separator ]	};
+
+    key  <KP1> { [ KP_1		]	};
+    key  <KP2> { [ KP_2		]	};
+    key  <KP3> { [ KP_3		]	};
+    key <KPEN> { [ KP_Enter	]	}; 
+
+    key  <KP0> { [ KP_0		]	};
+    key <KPDC> { [ KP_Decimal	]	};
+    key <KPTB> { [ KP_Tab	]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift  	{ Shift_R };
+    modifier_map Mod3   	{ Alt_L };
+};
+
diff --git a/symbols/sr b/symbols/sr
new file mode 100644
index 00000000..ee1b1f9c
--- /dev/null
+++ b/symbols/sr
@@ -0,0 +1,211 @@
+// $XFree86$
+// Serbian 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 (Данило Шеган) <dsegan@gmx.net>
+//  Chusslove Illich (Часлав Илић) <chaslav@sezampro.yu>
+//
+// Modified for inclusion in XFree86 by Danilo Segan <dsegan@gmx.net>
+//  
+//
+
+default partial alphanumeric_keys
+xkb_symbols "default" {
+
+  name[Group1]= "Serbian Cyrillic";
+
+  include "pc/sr(level3)"
+  include "pc/sr(common)"
+  include "pc/sr(cyralpha)"
+  include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "yz" {
+  // Cyrillic_zhe and Cyrillic_ze swapped.
+
+  name[Group1]= "Serbian Cyrillic (swap Zhe, Ze)";
+
+  include "pc/sr(default)"
+
+  key <AD06> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // y
+  key <AB01> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // z
+};
+
+partial 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 ]   }; //
+};
+
+partial 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 alphanumeric_keys
+xkb_symbols "latalpha" {
+
+  key.type[Group1] = "SERBIAN_ALPHABETIC";
+
+  key <AD01> {   [ q,                   Q,             any,any ]   }; //
+  key <AD02> {   [ w,                   W,             any,any ]   }; //
+  key <AD03> {   [ e,                   E,             any,any ]   }; //
+  key <AD04> {   [ r,                   R,             any,any ]   }; //
+  key <AD05> {   [ t,                   T,             any,any ]   }; //
+  key <AD06> {   [ z,                   Z,             any,any ]   }; //
+  key <AD07> {   [ u,                   U,             any,any ]   }; //
+  key <AD08> {   [ i,                   I,             any,any ]   }; //
+  key <AD09> {   [ o,                   O,             any,any ]   }; //
+  key <AD10> {   [ p,                   P,             any,any ]   }; //
+  key <AD11> {   [ scaron,              Scaron,        any,any ]   }; //
+  key <AD12> {   [ dstroke,             Dstroke,       any,any ]   }; //
+
+  key <AC01> {   [ a,                   A,             any,any ]   }; //
+  key <AC02> {   [ s,                   S,             any,any ]   }; //
+  key <AC03> {   [ d,                   D,             any,any ]   }; //
+  key <AC04> {   [ f,                   F,             any,any ]   }; //
+  key <AC05> {   [ g,                   G,             any,any ]   }; //
+  key <AC06> {   [ h,                   H,             any,any ]   }; //
+  key <AC07> {   [ j,                   J,             any,any ]   }; //
+  key <AC08> {   [ k,                   K,             any,any ]   }; //
+  key <AC09> {   [ l,                   L,             any,any ]   }; //
+  key <AC10> {   [ ccaron,              Ccaron,        any,any ]   }; //
+  key <AC11> {   [ cacute,              Cacute,        any,any ]   }; //
+  key <BKSL> {   [ zcaron,              Zcaron,        any,any ]   }; //
+
+  key <AB01> {   [ y,                   Y,             any,any ]   }; //
+  key <AB02> {   [ x,                   X,             any,any ]   }; //
+  key <AB03> {   [ c,                   C,             any,any ]   }; //
+  key <AB04> {   [ v,                   V,             any,any ]   }; //
+  key <AB05> {   [ b,                   B,             any,any ]   }; //
+  key <AB06> {   [ n,                   N,             any,any ]   }; //
+  key <AB07> {   [ m,                   M,             any,any ]   }; //
+};
+
+partial alphanumeric_keys
+xkb_symbols "twoletter" {
+  // These are letters which are written in latin transcription with two-characters.
+
+  key <AD01> {   type[Group1] = "SERBIAN_CAPS",
+                 [ U1C9,                U1C8,         any,   U1C7 ]   }; // q
+  key <AD02> {   type[Group1] = "SERBIAN_CAPS",
+                 [ U1CC,                U1CB,         any,   U1CA ]   }; // w
+  key <AB02> {   type[Group1] = "SERBIAN_CAPS",
+                 [ 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 alphanumeric_keys
+xkb_symbols "level3" {
+  key <TLDE> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // ` ~
+  key <AE01> {   [ any,any,     dead_tilde,          NoSymbol ]   }; // 1 !
+  key <AE02> {   [ any,any,     dead_caron,          NoSymbol ]   }; // 2 @
+  key <AE03> {   [ any,any,     dead_circumflex,     NoSymbol ]   }; // 3 #
+  key <AE04> {   [ any,any,     dead_breve,          NoSymbol ]   }; // 4 $
+  key <AE05> {   [ any,any,     dead_abovering,      NoSymbol ]   }; // 5 %
+  key <AE06> {   [ any,any,     dead_ogonek,         NoSymbol ]   }; // 6 ^
+  key <AE07> {   [ any,any,     dead_grave,          NoSymbol ]   }; // 7 &
+  key <AE08> {   [ any,any,     dead_abovedot,       NoSymbol ]   }; // 8 *
+  key <AE09> {   [ any,any,     dead_acute,          NoSymbol ]   }; // 9 (
+  key <AE10> {   [ any,any,     dead_doubleacute,    NoSymbol ]   }; // 0 )
+  key <AE11> {   [ any,any,     dead_diaeresis,      NoSymbol ]   }; // - _
+  key <AE12> {   [ any,any,     dead_cedilla,        NoSymbol ]   }; // = +
+
+  key <AD01> {   [ any,any,     backslash,           NoSymbol ]   }; // q
+  key <AD02> {   [ any,any,     bar,                 NoSymbol ]   }; // w
+  key <AD03> {   [ any,any,     EuroSign,            NoSymbol ]   }; // e
+  key <AD04> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // r
+  key <AD05> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // t
+  key <AD06> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // y
+  key <AD07> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // u
+  key <AD08> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // i
+  key <AD09> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // o
+  key <AD10> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // p
+  key <AD11> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // [
+  key <AD12> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // ]
+
+  key <AC01> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // a
+  key <AC02> {   [ any,any,     doublelowquotemark,  NoSymbol ]   }; // s
+  key <AC03> {   [ any,any,     leftdoublequotemark, NoSymbol ]   }; // d
+  key <AC04> {   [ any,any,     bracketleft,         NoSymbol ]   }; // f
+  key <AC05> {   [ any,any,     bracketright,        NoSymbol ]   }; // g
+  key <AC06> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // h
+  key <AC07> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // j
+  key <AC08> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // k
+  key <AC09> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // l
+  key <AC10> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // ;
+  key <AC11> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // '
+  key <BKSL> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // \
+
+  key <AB01> {   [ any,any,     leftsinglequotemark, NoSymbol ]   }; // z
+  key <AB02> {   [ any,any,     rightsinglequotemark,NoSymbol ]   }; // x
+  key <AB03> {   [ any,any,     NoSymbol,            NoSymbol ]   }; // c
+  key <AB04> {   [ any,any,     at,                  NoSymbol ]   }; // v
+  key <AB05> {   [ any,any,     braceleft,           NoSymbol ]   }; // b
+  key <AB06> {   [ any,any,     braceright,          NoSymbol ]   }; // n
+  key <AB07> {   [ any,any,     asciicircum,         NoSymbol ]   }; // m
+  key <AB08> {   [ any,any,     less,                NoSymbol ]   }; // , <
+  key <AB09> {   [ any,any,     greater,             NoSymbol ]   }; // . >
+  key <AB10> {   [ any,any,     emdash,              endash   ]   }; // / ?
+
+};
diff --git a/symbols/sun.vndr/se b/symbols/sun.vndr/se
new file mode 100644
index 00000000..40e8a875
--- /dev/null
+++ b/symbols/sun.vndr/se
@@ -0,0 +1,193 @@
+// $XFree86: xc/programs/xkbcomp/symbols/sun/se,v 1.2 1998/12/20 09:40:28 dawes Exp $
+//
+// Swedish layout for a Type 5/5c Sun keyboard
+xkb_symbols "sun5" {
+    include "en_US(basic)+se(basic)"
+
+    // Begin alphanumeric section
+    // These two are not supposed to be dead.
+    // A few others supposedly ARE dead, but don't care for now.
+    key <AC12> { [ apostrophe, asterisk	], 	[ 	grave ] };
+    key <AD12> { [			],	[  asciitilde ] };
+
+    key <RTSH> { [ 	Shift_R		]	};
+
+    key <LALT> { [	Alt_L		]	};
+    key <ALGR> { [	Mode_switch	]	};
+    key <LMTA> { [	Meta_L		]	};
+    key <RMTA> { [	Meta_R		]	};
+    key <COMP> { [	Multi_key	]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1		]			};
+    key <FK02> { [ F2		]			};
+    key <FK03> { [ F3		]			};
+    key <FK04> { [ F4		]			};
+    key <FK05> { [ F5		]			};
+    key <FK06> { [ F6		]			};
+    key <FK07> { [ F7		]			};
+    key <FK08> { [ F8		]			};
+    key <FK09> { [ F9		]			};
+    key <FK10> { [ F10		]			};
+    key <FK11> { [ F11		],	[ SunF36]	};
+    key <FK12> { [ F12		],	[ SunF37]	};
+    key <STOP> { [ Cancel 	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Print	],	[ Sys_Req, SunSys_Req ]	};
+    key <SCLK> { [ Scroll_Lock	]			};
+    key <PAUS> { [ Pause	],	[ Break	]	};
+    key <LEFT> { [ Left		]			};
+    key <RGHT> { [ Right	]			};
+    key <UP>   { [ Up		]			};
+    key <DOWN> { [ Down		]			};
+
+    key <DELE> { [ Delete	]			};
+    key <INS>  { [ Insert	]			};
+    key <PGUP> { [ Prior	]			};
+    key <PGDN> { [ Next		]			};
+    key <HOME> { [ Home		]			};
+    key <END>  { [ End		]			};
+    key <HELP> { [ Help		]			};
+    // End "Editing" section
+    
+    // Begin "Keypad" section
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ KP_Divide		],	[	F25	]	};
+    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
+    key <KPSU> { [ KP_Subtract		]				};
+
+    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
+    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
+    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
+    key <KPAD> { [  	KP_Add		]				};
+
+    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
+    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
+    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
+
+    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
+    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
+    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
+    key <KPEN> { [  	KP_Enter	]				};
+
+    key  <KP0> { [  KP_Insert,	KP_0	]				};
+    key <KPDL> { [  KP_Delete,	KP_Decimal ]				};
+    // End "Keypad" section, 
+
+    // Begin "four keys up on the right"
+    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
+    // End "four keys up on the right"
+
+    // Begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Meta_L, Meta_R };
+    modifier_map Mod2	{ Alt_L };
+    modifier_map Mod3	{ Mode_switch };
+    modifier_map Mod4	{ Num_Lock };
+    // End modifier mappings
+};
+
+// Swedish layout for a Type 4 Sun keyboard
+xkb_symbols "sun4" {
+    include "en_US(basic)+se(basic)"
+
+    // Begin alphanumeric section
+    // These two are not supposed to be dead.
+    // A few others supposedly ARE dead, but don't care for now.
+    key <AC12> { [ apostrophe, asterisk	], 	[ 	grave ] };
+    key <AD12> { [			],	[  asciitilde ] };
+
+    key <AF14> { [	asciitilde,	asciicircum	] };
+
+    key <RTSH> { [ 	Shift_R		]	};
+
+    key <LALT> { [	Alt_L		]	};
+    key <ALGR> { [	Mode_switch	]	};
+    key <LMTA> { [	Meta_L		]	};
+    key <RMTA> { [	Meta_R		]	};
+    key <COMP> { [	Multi_key	]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1		]			};
+    key <FK02> { [ F2		]			};
+    key <FK03> { [ F3		]			};
+    key <FK04> { [ F4		]			};
+    key <FK05> { [ F5		]			};
+    key <FK06> { [ F6		]			};
+    key <FK07> { [ F7		]			};
+    key <FK08> { [ F8		]			};
+    key <FK09> { [ F9		]			};
+    key <FK10> { [ F10		]			};
+    key <FK11> { [ F11		],	[ SunF36]	};
+    key <FK12> { [ F12		],	[ SunF37]	};
+    key <STOP> { [ Cancel 	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <LNFD> { [ Linefeed	]	};
+    key <DELE> { [ Delete	]			};
+    key <PRSC> { [ Print	],	[ Sys_Req, SunSys_Req ]	};
+    key <SCLK> { [ Scroll_Lock	]			};
+    key <PAUS> { [ Pause	],	[ Break	]	};
+    key <HELP> { [ Help		]			};
+    // End "Editing" section
+    
+    // Begin "Keypad" section
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPEQ> { [ KP_Equal		]				};
+    key <KPDV> { [ KP_Divide		],	[	F25	]	};
+    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
+    key <KPSU> { [ KP_Subtract		]				};
+
+    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
+    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
+    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
+    key <KPAD> { [  	KP_Add		]				};
+
+    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
+    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
+    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
+
+    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
+    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
+    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
+    key <KPEN> { [  	KP_Enter	]				};
+
+    key  <KP0> { [  KP_Insert,	KP_0	]				};
+    key <KPDL> { [  KP_Delete,	KP_Decimal ]				};
+    // End "Keypad" section, 
+
+    // Begin modifier mappings
+    modifier_map Shift	{ Shift_R };
+    modifier_map Mod1	{ Alt_L };
+    modifier_map Mod2	{ Num_Lock };
+    modifier_map Mod3	{ Mode_switch };
+    modifier_map Mod4	{ Meta_L };
+    modifier_map Mod5	{ Meta_R };
+    // End modifier mappings
+};
diff --git a/symbols/sun.vndr/us b/symbols/sun.vndr/us
new file mode 100644
index 00000000..520e0216
--- /dev/null
+++ b/symbols/sun.vndr/us
@@ -0,0 +1,338 @@
+// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $
+//
+//Copyright 1996, 1998  The Open Group
+//
+//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.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//from The Open Group.
+//
+// $XFree86: xc/programs/xkbcomp/symbols/sun/us,v 1.6 2001/12/14 20:02:05 dawes Exp $
+//
+// US/ASCII layout for a Type 4 Sun keyboard
+xkb_symbols "sun4" {
+    include "us(basic)"
+
+    // A few alphanumeric keys are different
+    key <TLDE> { [     grave,	asciitilde	],	[ acute	]	};
+    key <AC11> { [ apostrophe,	quotedbl	],	[ acute	]	};
+
+    key <RTSH> { [ 	Shift_R		]	};
+    key <LALT> { [	Alt_L		]	};
+    key <ALGR> { [	Mode_switch	]	};
+    key <LMTA> { [	Meta_L		]	};
+    key <RMTA> { [	Meta_R		]	};
+    key <LNFD> { [	Linefeed	]	};
+    key <COMP> { [	Multi_key	]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1	]				};
+    key <FK02> { [ F2	]				};
+    key <FK03> { [ F3	]				};
+    key <FK04> { [ F4	]				};
+    key <FK05> { [ F5	]				};
+    key <FK06> { [ F6	]				};
+    key <FK07> { [ F7	]				};
+    key <FK08> { [ F8	]				};
+    key <FK09> { [ F9	]				};
+    key <FK10> { [ F10	]				};
+    key <FK11> { [ F11	],		[ SunF36]	};
+    key <FK12> { [ F12	],		[ SunF37]	};
+    key <STOP> { [ Cancel	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Print			],[ 	F21	]	};
+    key <SCLK> { [ Break,	Scroll_Lock	],[ 	F22	]	};
+    key <PAUS> { [ Pause			],[ 	F23	]	};
+    key <DELE> { [ Delete			]			};
+    key <HELP> { [ Help				]			};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPEQ> { [ KP_Equal 		],	[	F24	]	};
+    key <KPDV> { [ KP_Divide		],	[	F25	]	};
+    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
+    key <KPSU> { [ KP_Subtract		]				};
+
+    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
+    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
+    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
+    key <KPAD> { [  	KP_Add		]				};
+
+    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
+    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
+    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
+
+    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
+    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
+    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
+    key <KPEN> { [  	KP_Enter	]				};
+    key  <KP0> { [  KP_Insert,	KP_0	]	};
+    key <KPDL> { [  KP_Delete,	KP_Decimal ]	};
+    // End "Keypad" section
+
+
+    // begin modifier mappings
+    modifier_map Shift 	{ Shift_R };
+    modifier_map Mod1  	{ Meta_L, Meta_R };
+    modifier_map Mod2  	{ Alt_L };
+    modifier_map Mod3  	{ Mode_switch };
+    modifier_map Mod4  	{ Num_Lock };
+    modifier_map Mod5  	{ F13, F18, F20 };
+};
+
+hidden partial function_keys xkb_symbols "broken_openlook_map" {
+    key <STOP> { [ F11	],	[ Cancel	]	};
+    key <AGAI> { [ F12	],	[ Redo		]	};
+    key <PROP> { [ F13	],	[ SunProps	]	};
+    key <UNDO> { [ F14	],	[ Undo		]	};
+    key <FRNT> { [ F15	],	[ SunFront	]	};
+    key <COPY> { [ F16	],	[ SunCopy	]	};
+    key <OPEN> { [ F17	],	[ SunOpen	]	};
+    key <PAST> { [ F18	],	[ SunPaste	]	};
+    key <FIND> { [ F19	],	[ Find		]	};
+    key <CUT>  { [ F20	],	[ SunCut	]	};
+};
+
+// US/ASCII layout for a Type 4 Sun keyboard w/ broken OpenLook keymap
+xkb_symbols "sun4ol" {
+    override "sun/us(sun4)"
+    include "sun/us(broken_openlook_map)"
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "sun5" {
+    augment "us(basic)"
+
+    // A alphanumeric keys are different
+    key <TLDE> { [     grave,	asciitilde	],	[ acute	]	};
+    key <AC11> { [ apostrophe,	quotedbl	],	[ acute	]	};
+
+    key <RTSH> { [ 	Shift_R		]	};
+
+    key <LALT> { [	Alt_L		]	};
+    key <ALGR> { [	Mode_switch	]	};
+    key <LMTA> { [	Meta_L		]	};
+    key <RMTA> { [	Meta_R		]	};
+    key <COMP> { [	Multi_key	]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> { [ F1	]				};
+    key <FK02> { [ F2	]				};
+    key <FK03> { [ F3	]				};
+    key <FK04> { [ F4	]				};
+    key <FK05> { [ F5	]				};
+    key <FK06> { [ F6	]				};
+    key <FK07> { [ F7	]				};
+    key <FK08> { [ F8	]				};
+    key <FK09> { [ F9	]				};
+    key <FK10> { [ F10	]				};
+    key <FK11> { [ F11	],		[ SunF36]	};
+    key <FK12> { [ F12	],		[ SunF37]	};
+    key <STOP> { [ Cancel	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> { [ Print 	],	[ Sys_Req, SunSys_Req ]	};
+    key <SCLK> { [ Scroll_Lock	]				};
+    key <PAUS> { [ Pause	],	[	Break	]	};
+    key <LEFT> { [ Left		]	};
+    key <RGHT> { [ Right	]	};
+    key <UP>   { [ Up		]	};
+    key <DOWN> { [ Down		]	};
+
+    key <DELE> { [ Delete	]	};
+    key <INS>  { [ Insert	]	};
+    key <PGUP> { [ Prior	]	};
+    key <PGDN> { [ Next		]	};
+    key <HOME> { [ Home		]	};
+    key <END>  { [ End		]	};
+    key <HELP> { [ Help		]	};
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> { [ Num_Lock 		]				};
+    key <KPDV> { [ KP_Divide		],	[	F25	]	};
+    key <KPMU> { [ KP_Multiply		],	[	F26	]	};
+    key <KPSU> { [ KP_Subtract		]				};
+
+    key  <KP7> { [  KP_Home,	KP_7	],	[	F27	]	};
+    key  <KP8> { [  KP_Up,	KP_8	],	[	F28	]	};
+    key  <KP9> { [  KP_Prior,	KP_9	],	[	F29	]	};
+    key <KPAD> { [  	KP_Add		]				};
+
+    key  <KP4> { [  KP_Left,	KP_4	],	[	F30	]	};
+    key  <KP5> { [  KP_Begin,	KP_5	],	[	F31	]	};
+    key  <KP6> { [  KP_Right,	KP_6	],	[	F32	]	};
+
+    key  <KP1> { [  KP_End,	KP_1	],	[	F33	]	};
+    key  <KP2> { [  KP_Down,	KP_2	],	[	F34	]	};
+    key  <KP3> { [  KP_Next,	KP_3	],	[	F35	]	};
+    key <KPEN> { [  	KP_Enter	]				};
+
+    key  <KP0> { [  KP_Insert,	KP_0	]	};
+    key <KPDL> { [  KP_Delete,	KP_Decimal ]	};
+    // End "Keypad" section,
+    // begin "four keys up on the right"
+
+    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_R };
+    modifier_map Mod1	{ Alt_L };
+    modifier_map Mod2	{ Num_Lock };
+    modifier_map Mod3	{ Mode_switch };
+    modifier_map Mod4	{ Meta_L, Meta_R};
+    modifier_map Mod5	{ Scroll_Lock };
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard w/ broken OpenLook keymap
+xkb_symbols "sun5ol" {
+    override "sun/us(sun5)"
+    include "sun/us(broken_openlook_map)"
+};
+
+// US/ASCII layout for a Type 6 Sun keyboard
+xkb_symbols "sun6" {
+    augment "us(basic)"
+
+    key <RTSH> {       [       Shift_R         ]       };
+    key <LALT> {       [       Alt_L           ]       };
+    key <RCTL> {       [       Control_R       ]       };
+    key <RALT> {       [       Alt_R           ]       };
+    key <LMTA> {       [       Meta_L          ]       };
+    key <RMTA> {       [       Meta_R          ]       };
+    key <COMP> {       [       Multi_key       ]       };
+
+    // Begin "Function" section
+    key <FK01> {       [       F1      ]       };
+    key <FK02> {       [       F2      ]       };
+    key <FK03> {       [       F3      ]       };
+    key <FK04> {       [       F4      ]       };
+    key <FK05> {       [       F5      ]       };
+    key <FK06> {       [       F6      ]       };
+    key <FK07> {       [       F7      ]       };
+    key <FK08> {       [       F8      ]       };
+    key <FK09> {       [       F9      ]       };
+    key <FK10> {       [       F10     ]       };
+    key <FK11> {       [       F11     ]       };
+    key <FK12> {       [       F12     ]       };
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <PRSC> {
+       type= "PC_SYSRQ",
+       symbols[Group1]= [      Print, Execute  ]
+    };
+    key <SCLK> {       [       Scroll_Lock     ]       };
+    key <PAUS> {
+       type= "PC_BREAK",
+       symbols[Group1]= [      Pause, Break    ]
+    };
+    key  <INS> {       [       Insert  ]       };
+    key <HOME> {       [       Home    ]       };
+    key <PGUP> {       [       Prior   ]       };
+    key <DELE> {       [       Delete  ]       };
+    key  <END> {       [       End     ]       };
+    key <PGDN> {       [       Next    ]       };
+
+    key   <UP> {       [       Up      ]       };
+    key <LEFT> {       [       Left    ]       };
+    key <DOWN> {       [       Down    ]       };
+    key <RGHT> {       [       Right   ]       };
+
+    // End "Editing" section, begin "Keypad"
+    key <NMLK> {       [       Num_Lock, Pointer_EnableKeys    ]       };
+    key <KPDV> {       [       KP_Divide       ]       };
+    key <KPMU> {       [       KP_Multiply     ]       };
+    key <KPSU> {       [       KP_Subtract     ]       };
+
+    key  <KP7> {       [       KP_Home,        KP_7            ]       };
+    key  <KP8> {       [       KP_Up,          KP_8            ]       };
+    key  <KP9> {       [       KP_Prior,       KP_9            ]       };
+    key <KPAD> {       [       KP_Add                          ]       };
+
+    key  <KP4> {       [       KP_Left,        KP_4            ]       };
+    key  <KP5> {       [       KP_Begin,       KP_5            ]       };
+    key  <KP6> {       [       KP_Right,       KP_6            ]       };
+
+    key  <KP1> {       [       KP_End,         KP_1            ]       };
+    key  <KP2> {       [       KP_Down,        KP_2            ]       };
+    key  <KP3> {       [       KP_Next,        KP_3            ]       };
+    key <KPEN> {       [       KP_Enter                        ]       };
+
+    key  <KP0> {       [       KP_Insert,      KP_0            ]       };
+    key <KPDL> {       [       KP_Delete,      KP_Decimal      ]       };
+    // End "Keypad" section
+
+    key <MUTE> { [  SunAudioMute,      SunVideoDegauss         ]       };
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]      };
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness        ]       };
+    key <POWR> { [  SunPowerSwitch,    SunPowerSwitchShift     ]       };
+
+    // from symbols/sun/us(type5)
+    key <STOP> { [ Cancel      ],      [ F11           ]       };
+    key <AGAI> { [ Redo                ],      [ F12           ]       };
+    key <PROP> { [ SunProps    ],      [ F13           ]       };
+    key <UNDO> { [ Undo                ],      [ F14           ]       };
+    key <FRNT> { [ SunFront    ],      [ F15           ]       };
+    key <COPY> { [ SunCopy     ],      [ F16           ]       };
+    key <OPEN> { [ SunOpen     ],      [ F17           ]       };
+    key <PAST> { [ SunPaste    ],      [ F18           ]       };
+    key <FIND> { [ Find                ],      [ F19           ]       };
+    key <CUT>  { [ SunCut      ],      [ F20           ]       };
+    key <HELP> { [ Help                ]       };
+
+    // begin modifier mappings
+    modifier_map Shift { Shift_R };
+    modifier_map Mod1  { Meta_L, Meta_R };
+    modifier_map Mod2  { Alt_L };
+    modifier_map Mod3  { Mode_switch };
+    modifier_map Mod4  { Num_Lock };
+};
+
+// US/ASCII layout for a Type 6 Sun keyboard w/ broken OpenLook keymap
+xkb_symbols "sun6ol" {
+    override "sun/us(sun6)"
+    include "sun/us(broken_openlook_map)"
+};
diff --git a/symbols/sun.vndr/usb b/symbols/sun.vndr/usb
new file mode 100644
index 00000000..067c4af1
--- /dev/null
+++ b/symbols/sun.vndr/usb
@@ -0,0 +1,28 @@
+// $XFree86$
+//
+// Additional keys for Sun USB keyboard
+
+xkb_symbols "sun_usb" {
+
+    key <STOP> { [ Cancel	],	[ F11	]	};
+    key <AGAI> { [ Redo		],	[ F12	]	};
+    key <PROP> { [ SunProps	],	[ F13	]	};
+    key <UNDO> { [ Undo		],	[ F14	]	};
+    key <FRNT> { [ SunFront	],	[ F15	]	};
+    key <COPY> { [ SunCopy	],	[ F16	]	};
+    key <OPEN> { [ SunOpen	],	[ F17	]	};
+    key <PAST> { [ SunPaste	],	[ F18	]	};
+    key <FIND> { [ Find		],	[ F19	]	};
+    key <CUT>  { [ SunCut	],	[ F20	]	};
+    key <HELP> { [ Help		]	};
+
+    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
+    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
+    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
+    key <POWR> { [  SunPowerSwitch,	SunPowerSwitchShift	]	};
+
+    key <LMTA> { [	Meta_L		]	};
+    key <RMTA> { [	Meta_R		]	};
+    key <COMP> { [	Multi_key	]	};
+};
+
diff --git a/symbols/syr b/symbols/syr
new file mode 100644
index 00000000..4be65aa5
--- /dev/null
+++ b/symbols/syr
@@ -0,0 +1,72 @@
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/syr,v 1.1 2002/11/22 03:06:50 dawes Exp $
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    name[Group1]= "Syriac";
+
+    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
+    key <AE01> {  [  	1,		exclam,		0x1000701		]     };
+    key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };
+    key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };
+    key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };
+    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };
+    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };
+    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };
+    key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };
+    key <AE09> {  [  	9,		parenright,	0x100070C		]     };
+    key <AE10> {  [  	0,		parenleft,	0x100070D		]     };
+    key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };
+    key <AE12> {  [  	equal,		plus,		0x1002510		]     };
+						
+    key <AD01> {  [  	0x1000714,	0x1000730,	Arabic_fatha		]     };
+    key <AD02> {  [  	0x1000728,	0x1000733,	Arabic_fathatan		]     };
+    key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };
+    key <AD04> {  [  	0x1000729,	0x100073A,	Arabic_dammatan		]     };
+    key <AD05> {  [  	0x1000726,	0x100073D,	Arabic_madda_above	]     };
+    key <AD06> {  [  	0x100071C,	0x1000740,	Arabic_hamza_above	]     };
+    key <AD07> {  [  	0x1000725,	0x1000741,	0x1000747		]     };
+    key <AD08> {  [  	0x1000717,	0x1000308,	0x1000743		]     };
+    key <AD09> {  [  	0x100071E,      0x1000304,	0x1000745		]     };
+    key <AD10> {  [  	0x100071A,      0x1000307,	0x100032D		]     };
+    key <AD11> {  [ 	0x1000713,      0x1000303				]     };
+    key <AD12> {  [  	0x1000715,	0x100074A				]     };
+    key <BKSL> {  [  	0x1000706,	colon					]     };
+
+    key <AC01> {  [  	0x100072B,	0x1000731,	Arabic_kasra		]     };
+    key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };
+    key <AC03> {  [	0x100071D,	0x1000737				]     };
+    key <AC04> {  [  	0x1000712,	0x100073B,	Arabic_hamza		]     };
+    key <AC05> {  [  	0x1000720,	0x100073E,	Arabic_hamza_below	]     };
+    key <AC06> {  [  	0x1000710,      0x1000711, 	Arabic_superscript_alef	]     };
+    key <AC07> {  [  	0x100072C,	Arabic_tatweel,	0x1000748		]     };
+    key <AC08> {  [  	0x1000722,	0x1000324, 	0x1000744		]     };
+    key <AC09> {  [	0x1000721,	0x1000331,	0x1000746		]     };
+    key <AC10> {  [  	0x100071F,      0x1000323				]     };
+    key <AC11> {  [  	0x100071B,	0x1000330				]     };
+
+    key <SPCE> {  [  	space,		0x100200c				]     };
+    key <AB01> {  [  	bracketright,	0x1000732,	Arabic_sukun		]     };
+    key <AB02> {  [  	bracketleft,	0x1000735				]     };
+    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };
+    key <AB04> {  [  	0x100072A,	0x100073C, 	0x100200C		]     };
+    key <AB05> {  [  	0x1000727,      0x100073F,      0x100200E		]     };
+    key <AB06> {  [  	0x1000700,	0x1000739,	0x100200F		]     };
+    key <AB07> {  [  	0x100002E,	0x1000742				]     };
+    key <AB08> {  [  	0x1000718,	Arabic_comma				]     };
+    key <AB09> {  [  	0x1000719,	Arabic_semicolon			]     };
+    key <AB10> {  [  	0x1000707,	Arabic_question_mark			]     };
+
+    // End Alphanumeric Section
+
+    
+    // Begin Modifier Mappings
+    
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod2   { Mode_switch };
+
+};
diff --git a/symbols/syr_phonetic b/symbols/syr_phonetic
new file mode 100644
index 00000000..ac20ad01
--- /dev/null
+++ b/symbols/syr_phonetic
@@ -0,0 +1,72 @@
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/syr_phonetic,v 1.1 2002/11/22 03:06:50 dawes Exp $
+//
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+    name[Group1]= "Syriac(phonetic)";
+
+    key <TLDE> {  [	0x100070F,	0x100032E,	Arabic_shadda		]     };
+    key <AE01> {  [  	1,		exclam,		0x1000701		]     };
+    key <AE02> {  [  	2,		0x100030A,	0x1000702		]     };
+    key <AE03> {  [  	3,		0x1000325,	0x1000703		]     };
+    key <AE04> {  [  	4,		0x1000749,	0x1000704		]     };
+    key <AE05> {  [  	5,		0x1002670,      0x1000705		]     };
+    key <AE06> {  [  	6,		0x1002671,    	0x1000708		]     };
+    key <AE07> {  [  	7,		0x100070A,   	0x1000709		]     };
+    key <AE08> {  [  	8,		0x10000BB,	0x100070B		]     };
+    key <AE09> {  [  	9,		parenright,	0x100070C		]     };
+    key <AE10> {  [  	0,		parenleft,	0x100070D		]     };
+    key <AE11> {  [  	minus,		0x10000AB,	0x100250C		]     };
+    key <AE12> {  [  	equal,		plus,		0x1002510		]     };
+						
+    key <AD01> {  [  	0x1000729,	0x1000730,	Arabic_fatha		]     };
+    key <AD02> {  [  	0x1000718,	0x1000733,	Arabic_fathatan		]     };
+    key <AD03> {  [  	0x1000716,	0x1000736,	Arabic_damma		]     };
+    key <AD04> {  [  	0x100072A,	0x100073A,	Arabic_dammatan		]     };
+    key <AD05> {  [  	0x100072C,	0x100073D,	Arabic_madda_above	]     };
+    key <AD06> {  [  	0x100071D,	0x1000740,	Arabic_hamza_above	]     };
+    key <AD07> {  [  	0x100071C,	0x1000741,	0x1000747		]     };
+    key <AD08> {  [  	0x1000725,	0x1000308,	0x1000743		]     };
+    key <AD09> {  [  	0x1000727,      0x1000304,	0x1000745		]     };
+    key <AD10> {  [  	0x1000726,      0x1000307,	0x100032D		]     };
+    key <AD11> {  [ 	bracketright,   0x1000303				]     };
+    key <AD12> {  [  	bracketleft,	0x100074A				]     };
+    key <BKSL> {  [  	0x1000706,	colon					]     };
+
+    key <AC01> {  [  	0x1000710,	0x1000731,	Arabic_kasra		]     };
+    key <AC02> {  [  	0x1000723,	0x1000734,	Arabic_kasratan		]     };
+    key <AC03> {  [	0x1000715,	0x1000737				]     };
+    key <AC04> {  [  	0x1000714,	0x100073B,	Arabic_hamza		]     };
+    key <AC05> {  [  	0x1000713,	0x100073E,	Arabic_hamza_below	]     };
+    key <AC06> {  [  	0x1000717,      0x1000711, 	Arabic_superscript_alef	]     };
+    key <AC07> {  [  	0x100071B,	Arabic_tatweel,	0x1000748		]     };
+    key <AC08> {  [  	0x100071F,	0x1000324, 	0x1000744		]     };
+    key <AC09> {  [	0x1000720,	0x1000331,	0x1000746		]     };
+    key <AC10> {  [  	0x100071A,      0x1000323				]     };
+    key <AC11> {  [  	0x100071E,	0x1000330				]     };
+
+    key <SPCE> {  [  	space,		0x100200c				]     };
+    key <AB01> {  [  	0x1000719,	0x1000732,	Arabic_sukun		]     };
+    key <AB02> {  [  	0x1000728,	0x1000735				]     };
+    key <AB03> {  [  	0x1000724,      0x1000738,	0x100200D		]     };
+    key <AB04> {  [  	0x100072B,	0x100073C, 	0x100200C		]     };
+    key <AB05> {  [  	0x1000712,      0x100073F,      0x100200E		]     };
+    key <AB06> {  [  	0x1000722,	0x1000739,	0x100200F		]     };
+    key <AB07> {  [  	0x1000721,	0x1000742				]     };
+    key <AB08> {  [  	0x1000700,	Arabic_comma				]     };
+    key <AB09> {  [  	0x100002E,	Arabic_semicolon			]     };
+    key <AB10> {  [  	0x1000707,	Arabic_question_mark			]     };
+
+    // End Alphanumeric Section
+
+    
+    // Begin Modifier Mappings
+    
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock, ISO_Lock };
+    modifier_map Control{ Control_L, Control_R };
+    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod2   { Mode_switch };
+
+};
diff --git a/symbols/tel b/symbols/tel
new file mode 100644
index 00000000..b7a34def
--- /dev/null
+++ b/symbols/tel
@@ -0,0 +1,69 @@
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Inscript layout for Telugu using Unicode 
+    // Author: G Karunakar <karunakar@freedomink.org>
+    // Date:
+    // See layout at http://www.indlinux.org/keymap/telugu.php
+
+    name[Group1]= "Telugu";
+
+    key <TLDE> { [  0x01000c4a, 0x01000c12	] };
+    key <AE01> { [  0x01000c67, 0x01000c0d	] };
+    key <AE02> { [  0x01000c68, 0x01000c45	] };
+    key <AE03> { [  0x01000c69, numbersign	] };
+    key <AE04> { [  0x01000c6a, dollar		] };
+    key <AE05> { [  0x01000c6b, percent		] };
+    key <AE06> { [  0x01000c6c, asciicircum	] };
+    key <AE07> { [  0x01000c6d, ampersand	] };
+    key <AE08> { [  0x01000c6e, asterisk	] };
+    key <AE09> { [  0x01000c6f, parenleft	] };
+    key <AE10> { [  0x01000c66, parenright	] };
+    key <AE11> { [  0x01000c03, underscore	] };
+    key <AE12> { [  0x01000c43, 0x01000c0b	] };
+    key <BKSP> { [  BackSpace			] };    
+ 
+    key <AD01> { [  0x01000c4c, 0x01000c14	] };
+    key <AD02> { [  0x01000c48, 0x01000c10	] };
+    key <AD03> { [  0x01000c3e, 0x01000c06	] };
+    key <AD04> { [  0x01000c40, 0x01000c08	] };
+    key <AD05> { [  0x01000c42, 0x01000c0a	] };
+    key <AD06> { [  0x01000c2c, 0x01000c2d	] };
+    key <AD07> { [  0x01000c39, 0x01000c19	] };
+    key <AD08> { [  0x01000c17, 0x01000c18	] };
+    key <AD09> { [  0x01000c26, 0x01000c27	] };
+    key <AD10> { [  0x01000c1c, 0x01000c1d	] };
+    key <AD11> { [  0x01000c21, 0x01000c22	] };
+    key <AD12> { [  0x01000c3c, 0x01000c1e	] };
+  
+    key <AC01> { [  0x01000c4b, 0x01000c13	] };
+    key <AC02> { [  0x01000c47, 0x01000c0f	] };
+    key <AC03> { [  0x01000c4d, 0x01000c05	] };
+    key <AC04> { [  0x01000c3f, 0x01000c07	] };
+    key <AC05> { [  0x01000c41, 0x01000c09	] };
+    key <AC06> { [  0x01000c2a, 0x01000c2b	] };
+    key <AC07> { [  0x01000c30, 0x01000c31	] };
+    key <AC08> { [  0x01000c15, 0x01000c16	] };
+    key <AC09> { [  0x01000c24, 0x01000c25	] };
+    key <AC10> { [  0x01000c1a, 0x01000c1b	] };
+    key <AC11> { [  0x01000c1f, 0x01000c20	] };
+ 
+    key <AB01> { [  0x01000c46, 0x01000c0e	] };
+    key <AB02> { [  0x01000c02, 0x01000c01	] };
+    key <AB03> { [  0x01000c2e, 0x01000c23	] };
+    key <AB04> { [  0x01000c28, 0x01000c29	] };
+    key <AB05> { [  0x01000c35, 0x01000c34	] };
+    key <AB06> { [  0x01000c32, 0x01000c33	] };
+    key <AB07> { [  0x01000c38, 0x01000c36	] };
+    key <AB08> { [  comma     , 0x01000c37	] };
+    key <AB09> { [  period    , 0x01000c64	] };
+    key <AB10> { [  0x01000c2f, 0x01000040	] };
+    key <BKSL> { [  0x01000c49, 0x01000c11	] };
+
+    key <RALT> {        
+        symbols[Group1] = [ Mode_switch , Multi_key ],
+        virtualMods = AltGr
+    };
+};
diff --git a/symbols/th b/symbols/th
new file mode 100644
index 00000000..7b8297fb
--- /dev/null
+++ b/symbols/th
@@ -0,0 +1,63 @@
+
+// based on a keyboard map from an 'xkb/symbols/th' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/th,v 1.3 2003/04/03 16:34:51 dawes Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    name[Group1]= "Thai (Kedmanee)";
+
+    // converted to THai keysysms - Pablo Saratxaga <pablo@mandrakesoft.com>
+
+    key <TLDE> { [ underscore,		percent		]	};
+    key <AE01> { [ Thai_lakkhangyao,	plus		]	};
+    key <AE02> { [ slash,		Thai_leknung	]	};
+    key <AE03> { [ minus,		Thai_leksong	]	};
+    key <AE04> { [ Thai_phosamphao,	Thai_leksam	]	};
+    key <AE05> { [ Thai_thothung,	Thai_leksi	]	};
+    key <AE06> { [ Thai_sarau,		Thai_sarauu	]	};
+    key <AE07> { [ Thai_saraue,		Thai_baht	]	};
+    key <AE08> { [ Thai_khokhwai,	Thai_lekha	]	};
+    key <AE09> { [ Thai_totao,		Thai_lekhok	]	};
+    key <AE10> { [ Thai_chochan,	Thai_lekchet	]	};
+    key <AE11> { [ Thai_khokhai,	Thai_lekpaet	]	};
+    key <AE12> { [ Thai_chochang,	Thai_lekkao	]	};
+
+    key <AD01> { [ Thai_maiyamok,	Thai_leksun	]	};
+    key <AD02> { [ Thai_saraaimaimalai,	quotedbl	]	};
+    key <AD03> { [ Thai_saraam,		Thai_dochada	]	};
+    key <AD04> { [ Thai_phophan,	Thai_thonangmontho ]	};
+    key <AD05> { [ Thai_saraa,		Thai_thothong	]	};
+    key <AD06> { [ Thai_maihanakat,	Thai_nikhahit	]	};
+    key <AD07> { [ Thai_saraii,		Thai_maitri	]	};
+    key <AD08> { [ Thai_rorua,		Thai_nonen	]	};
+    key <AD09> { [ Thai_nonu,		Thai_paiyannoi	]	};
+    key <AD10> { [ Thai_yoyak,		Thai_yoying	]	};
+    key <AD11> { [ Thai_bobaimai,	Thai_thothan	]	};
+    key <AD12> { [ Thai_loling,		comma		]	};
+
+    key <AC01> { [ Thai_fofan,		Thai_ru		]	};
+    key <AC02> { [ Thai_hohip,		Thai_khorakhang	]	};
+    key <AC03> { [ Thai_kokai,		Thai_topatak	]	};
+    key <AC04> { [ Thai_dodek,		Thai_sarao	]	};
+    key <AC05> { [ Thai_sarae,		Thai_chochoe	]	};
+    key <AC06> { [ Thai_maitho,		Thai_maitaikhu	]	};
+    key <AC07> { [ Thai_maiek,		Thai_maichattawa ]	};
+    key <AC08> { [ Thai_saraaa,		Thai_sorusi	]	};
+    key <AC09> { [ Thai_sosua,		Thai_sosala	]	};
+    key <AC10> { [ Thai_wowaen,		Thai_soso	]	};
+    key <AC11> { [ Thai_ngongu,		period		]	};
+
+    key <AB01> { [ Thai_phophung,	parenleft	]	};
+    key <AB02> { [ Thai_popla,		parenright	]	};
+    key <AB03> { [ Thai_saraae,		Thai_choching	]	};
+    key <AB04> { [ Thai_oang,		Thai_honokhuk	]	};
+    key <AB05> { [ Thai_sarai,		Thai_phinthu	]	};
+    key <AB06> { [ Thai_sarauee,	Thai_thanthakhat ]	};
+    key <AB07> { [ Thai_thothahan,	question	]	};
+    key <AB08> { [ Thai_moma,		Thai_thophuthao	]	};
+    key <AB09> { [ Thai_saraaimaimuan,	Thai_lochula	]	};
+    key <AB10> { [ Thai_fofa,		Thai_lu		]	};
+
+    key <BKSL> { [ Thai_khokhuat,	Thai_khokhon	]	};
+};
diff --git a/symbols/th_pat b/symbols/th_pat
new file mode 100644
index 00000000..1f733dbf
--- /dev/null
+++ b/symbols/th_pat
@@ -0,0 +1,64 @@
+// $XFree86$
+//
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    name[Group1]= "Thai (Pattachote)";
+    // The thai layout defines a second keyboard group and changes
+    // the behavior of a few modifier keys.
+    
+    // converted to THai keysysms - Pablo Saratxaga pablo@mandrakesoft.com
+    // Pattachote modification by Visanu Euarchukiati -- visanu@inet.co.th
+    key <TLDE> { [ underscore,		Thai_baht	] };
+    key <AE01> { [ equal,		plus		] };
+    key <AE02> { [ Thai_leksong,	quotedbl	] };
+    key <AE03> { [ Thai_leksam,		slash		] };
+    key <AE04> { [ Thai_leksi,		comma		] };
+    key <AE05> { [ Thai_lekha,		question	] };
+    key <AE06> { [ Thai_sarauu,		Thai_sarau	] };
+    key <AE07> { [ Thai_lekchet,	underscore	] };
+    key <AE08> { [ Thai_lekpaet,	period		] };
+    key <AE09> { [ Thai_lekkao,		parenleft	] };
+    key <AE10> { [ Thai_leksun,		parenright	] };
+    key <AE11> { [ Thai_leknung,	minus		] };
+    key <AE12> { [ Thai_lekhok,		percent		] };
+
+    key <AD01> { [ Thai_maitaikhu,	Thai_maitri	] };
+    key <AD02> { [ Thai_totao,		Thai_ru		] };
+    key <AD03> { [ Thai_yoyak,		Thai_maiyamok	] };
+    key <AD04> { [ Thai_oang,		Thai_yoying	] };
+    key <AD05> { [ Thai_rorua,		Thai_sorusi	] };
+    key <AD06> { [ Thai_maiek,		Thai_saraue	] };
+    key <AD07> { [ Thai_dodek,		Thai_fofa	] };
+    key <AD08> { [ Thai_moma,		Thai_soso	] };
+    key <AD09> { [ Thai_wowaen,		Thai_thothung	] };
+    key <AD10> { [ Thai_saraae,		Thai_thophuthao	] };
+    key <AD11> { [ Thai_saraaimaimuan,	Thai_paiyannoi	] };
+    key <AD12> { [ Thai_chochoe,	Thai_lu		] };
+
+    key <AC01> { [ Thai_maitho,		Thai_maichattawa] };
+    key <AC02> { [ Thai_thothahan,	Thai_thothong	] };
+    key <AC03> { [ Thai_ngongu,		Thai_saraam	] };
+    key <AC04> { [ Thai_kokai,		Thai_nonen	] };
+    key <AC05> { [ Thai_maihanakat,	Thai_thanthakhat] };
+    key <AC06> { [ Thai_saraii,		Thai_sarauee	] };
+    key <AC07> { [ Thai_saraaa,		Thai_phophung	] };
+    key <AC08> { [ Thai_nonu,		Thai_chochang	] };
+    key <AC09> { [ Thai_sarae,		Thai_sarao	] };
+    key <AC10> { [ Thai_saraaimaimalai,	Thai_khorakhang	] };
+    key <AC11> { [ Thai_khokhai,	Thai_thonangmontho ] };
+
+    key <AB01> { [ Thai_bobaimai,	Thai_dochada	] };
+    key <AB02> { [ Thai_popla,		Thai_topatak	] };
+    key <AB03> { [ Thai_loling,		Thai_thothan	] };
+    key <AB04> { [ Thai_hohip,		Thai_phosamphao	] };
+    key <AB05> { [ Thai_sarai,		Thai_phinthu	] };
+    key <AB06> { [ Thai_khokhwai,	Thai_sosala	] };
+    key <AB07> { [ Thai_sosua,		Thai_honokhuk	] };
+    key <AB08> { [ Thai_saraa,		Thai_fofan	] };
+    key <AB09> { [ Thai_chochan,	Thai_choching	] };
+    key <AB10> { [ Thai_phophan,	Thai_lochula	] };
+
+    key <BKSL> { [ Thai_lakkhangyao,	Thai_nikhahit	] };
+};
+
+
diff --git a/symbols/th_tis b/symbols/th_tis
new file mode 100644
index 00000000..4ba166cb
--- /dev/null
+++ b/symbols/th_tis
@@ -0,0 +1,63 @@
+// $XFree86$
+//
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    name[Group1]= "Thai (TIS-820.2538)";
+    // The thai layout defines a second keyboard group and changes
+    // the behavior of a few modifier keys.  
+
+    // converted to THai keysysms - Pablo Saratxaga <pablo@mandrakesoft.com>
+    // modified to TIS-820.2538 - Theppitak Karoonboonyanan <thep@linux.thai.net>
+    key <TLDE> {	[ 0x1000e4f,		0x1000e5b	]	};
+    key <AE01> {	[ Thai_baht,		Thai_lakkhangyao]	};
+    key <AE02> {	[ slash,  		Thai_leknung	]	};
+    key <AE03> {	[ minus,		Thai_leksong	]	};
+    key <AE04> {	[ Thai_phosamphao, 	Thai_leksam	]	};
+    key <AE05> {	[ Thai_thothung,   	Thai_leksi	]	};
+    key <AE06> {	[ Thai_sarau,		Thai_sarauu	]	};
+    key <AE07> {	[ Thai_saraue,		0x1000e4e	]	};
+    key <AE08> {	[ Thai_khokhwai,	Thai_lekha	]	};
+    key <AE09> {	[ Thai_totao,		Thai_lekhok	]	};
+    key <AE10> {	[ Thai_chochan,		Thai_lekchet	]	};
+    key <AE11> {	[ Thai_khokhai,		Thai_lekpaet	]	};
+    key <AE12> {	[ Thai_chochang,	Thai_lekkao	]	};
+
+    key <AD01> {	[ Thai_maiyamok,	Thai_leksun	]	};
+    key <AD02> {	[ Thai_saraaimaimalai, 	quotedbl	]	};
+    key <AD03> {	[ Thai_saraam,		Thai_dochada	]	};
+    key <AD04> {	[ Thai_phophan,		Thai_thonangmontho ]	};
+    key <AD05> {	[ Thai_saraa,		Thai_thothong	]	};
+    key <AD06> {	[ Thai_maihanakat,	Thai_nikhahit	]	};
+    key <AD07> {	[ Thai_saraii,		Thai_maitri	]	};
+    key <AD08> {	[ Thai_rorua,		Thai_nonen	]	};
+    key <AD09> {type[Group1]="THREE_LEVEL",
+    			[   Thai_nonu,	Thai_paiyannoi,	0x1000e5a]	};
+    key <AD10> {	[ Thai_yoyak,		Thai_yoying	]	};
+    key <AD11> {	[ Thai_bobaimai,	Thai_thothan	]	};
+    key <AD12> {	[ Thai_loling,		comma		]	};
+
+    key <AC01> {	[ Thai_fofan,		Thai_ru		]	};
+    key <AC02> {	[ Thai_hohip,		Thai_khorakhang	]	};
+    key <AC03> {	[ Thai_kokai,		Thai_topatak	]	};
+    key <AC04> {	[ Thai_dodek,		Thai_sarao	]	};
+    key <AC05> {	[ Thai_sarae,		Thai_chochoe	]	};
+    key <AC06> {	[ Thai_maitho,		Thai_maitaikhu	]	};
+    key <AC07> {	[ Thai_maiek,		Thai_maichattawa ]	};
+    key <AC08> {	[ Thai_saraaa,		Thai_sorusi	]	};
+    key <AC09> {	[ Thai_sosua,		Thai_sosala	]	};
+    key <AC10> {	[ Thai_wowaen,		Thai_soso	]	};
+    key <AC11> {	[ Thai_ngongu,		period		]	};
+
+    key <AB01> {	[ Thai_phophung,	parenleft	]	};
+    key <AB02> {	[ Thai_popla,		parenright	]	};
+    key <AB03> {	[ Thai_saraae,		Thai_choching	]	};
+    key <AB04> {	[ Thai_oang,		Thai_honokhuk	]	};
+    key <AB05> {	[ Thai_sarai,		Thai_phinthu	]	};
+    key <AB06> {	[ Thai_sarauee,		Thai_thanthakhat ]	};
+    key <AB07> {	[ Thai_thothahan,	question	]	};
+    key <AB08> {	[ Thai_moma,		Thai_thophuthao	]	};
+    key <AB09> {	[ Thai_saraaimaimuan,	Thai_lochula 	]	};
+    key <AB10> {	[ Thai_fofa,		Thai_lu		]	};
+
+    key <BKSL> {	[ Thai_khokhon,		Thai_khokhuat	]	};
+};
diff --git a/symbols/tj b/symbols/tj
new file mode 100644
index 00000000..aed9adef
--- /dev/null
+++ b/symbols/tj
@@ -0,0 +1,82 @@
+
+// based on
+// Tajik keyboard 
+// it is a Russian layout keyboard, with SHCHA replaced with 
+// dead_cedilla/dead_macron
+// that allows to type the SHCHA with dead_cedilla + SHA
+// and all the extra Tajik keys:
+// dead_cedilla + KA, HA --> KA descender, HA descender
+// dead_macron + I, U, GHE --> I macron, U macron, GHE horizontal stroke
+// it requires proper dead_cedilla and dead_macron entries in Compose file
+// it also allows to use Mode_switch when in cyrillic mode to enter
+// special letters by doing Mode_switch + base letter
+//
+// AEN <aen@logic.ru> (for the Russian layout)
+// Pablo Saratxaga <pablo@mandrakesoft> (for the dead keys changes)
+//
+// $XFree86$
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Tajik";
+
+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<LSGT> {	[	      bar,	 brokenbar	]	};
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	],
+			[     0x010004b7,      0x010004b6	]	 };
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	],
+			[     0x010004ef,      0x010004ee	]	 };
+    key	<AE04> {	[		4,        asterisk	]	};
+    key	<AE03> {	[		3,      apostrophe	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	],
+			[     0x0100049b,      0x0100049a	]	 };
+    key	<AE05> {	[		5,	     colon	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	],
+			[     0x010004e3,      0x010004e2	]	 };
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AE06> {	[		6,	     comma	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	],
+			[     0x01000493,      0x01000492	]	 };
+    key	<AE07> {	[		7,	    period	]	};
+    key	<AE08> {	[		8,	 semicolon	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	],
+			[    Cyrillic_shcha,  Cyrillic_SHCHA]	 };
+    key	<AD09> {	[    dead_cedilla,     dead_macron	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<AB10> {	[	    slash,	  question	]	};
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	],
+			[     0x01000497,      0x01000496	]	 };
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AE11> {	[	    minus,	underscore	]	};
+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	],
+			[     0x010004b3,      0x010004b2	]	 };
+    key	<AE12> {	[	    equal,	      plus	]	};
+    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
+
+    // End alphanumeric section
+
+};
diff --git a/symbols/tml b/symbols/tml
new file mode 100644
index 00000000..973b0817
--- /dev/null
+++ b/symbols/tml
@@ -0,0 +1,234 @@
+
+// based on a keyboard map from an 'xkb/symbols/tml' file
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/tml,v 1.2 2002/11/22 04:03:28 dawes Exp $
+
+default partial alphanumeric_keys 
+xkb_symbols "TSCII" {
+
+// Description	: A Tamil typewrite-style keymap 
+//		  loosely based on TamilNet'99 reommendations 
+// Encoding	: TSCII (http://www.tscii.org)
+// Author	: Thuraiappah Vaseeharan <vasee@ieee.org>
+// Last Modified: Sat Jan  5 17:11:26 CST 2002
+
+    name[Group1]= "TSCII";
+
+    key <AE01> {  [ 0x10000b7, 0x10000a4 ] }; // aytham
+    key <AE02> {  [ 0x1000082, 0x10000a5 ] }; // shri
+    key <AE03> {  [ 0x1000083, 0x1000088 ] }; // ja
+    key <AE04> {  [ 0x1000084, 0x1000089 ] }; // sha
+    key <AE05> {  [ 0x1000085, 0x100008a ] }; // sa
+    key <AE06> {  [ 0x1000086, 0x100008b ] }; // ha
+    key <AE07> {  [ 0x1000087, 0x100008c ] }; // ksha
+	
+    // Qrow
+    key <AD01> {  [ 0x10000bb, 0x100009a ] }; // nja
+    key <AD02> {  [ 0x10000c8, 0x10000da ] }; // Ra
+    key <AD03> {  [ 0x10000bf, 0x10000d1 ] }; // NNa
+    key <AD04> {  [ 0x10000ba, 0x10000cd ] }; // ca
+    key <AD05> {  [ 0x10000c5, 0x10000d7 ] }; // va
+    key <AD06> {  [ 0x10000c4, 0x10000d6 ] }; // la
+    key <AD07> {  [ 0x10000c3, 0x10000d5 ] }; // ra
+    key <AD08> {  [ 0x10000a8, 0x10000b3 ] }; // sangili, ai
+    key <AD09> {  [ 0x10000ca, 0x10000cb ] }; // di, dI
+    key <AD10> {  [ 0x10000a2, 0x10000a3 ] }; // visiri
+    key <AD11> {  [ dead_acute, 0x10000a3 ] }; // Ukaaram
+
+    // Arow
+    key <AC01> { [ 0x10000c2, 0x10000d4 ] }; // ya
+    key <AC02> { [ 0x10000c7, 0x10000d9 ] }; // La
+    key <AC03> { [ 0x10000c9, 0x10000db ] }; // na
+    key <AC04> { [ 0x10000b8, 0x10000cc ] }; // ka
+    key <AC05> { [ 0x10000c0, 0x10000d2 ] }; // pa
+    key <AC06> { [ dead_grave,0x10000a1 ] }; // pulli,aravu
+    key <AC07> { [ 0x10000be, 0x10000d0 ] }; // tha
+    key <AC08> { [ 0x10000c1, 0x10000d3 ] }; // ma
+    key <AC09> { [ 0x10000bc, 0x10000ce ] }; // da
+    key <AC10> { [ 0x10000c6, 0x10000d8 ] }; // zha
+    key <AC11> { [ 0x10000b9, 0x1000099 ] }; // nga
+    
+    // Zrow
+    key <AB01> { [ 0x10000bd, 0x10000cf ] }; // Na
+    key <AB02> { [ 0x10000b4, 0x10000b5 ] }; // o, O
+    key <AB03> { [ 0x10000af, 0x10000b0 ] }; // u, U
+    key <AB04> { [ 0x10000b1, 0x10000b2 ] }; // e, E
+    key <AB05> { [ 0x10000a6, 0x10000a7 ] }; // kombus
+    key <AB06> { [ 0x10000b6, 0x10000aa ] }; // au
+    key <AB07> { [ 0x10000ab, 0x10000ac ] }; // a, A
+    key <AB08> { [ 0x10000fe, 0x10000ae ] }; // i, I
+
+};
+
+partial alphanumeric_keys 
+xkb_symbols "TAB" {
+
+// Description: A keymap based on the TamilNet'99 typewriter keyboard 
+// Encoding: TAB (http://www.tamilnet99.org)
+// Author: Thuraiappah Vaseeharan <t_vasee@yahoo.com>
+// Date  : Sun Aug 12 02:23:00 CDT 2001
+
+    name[Group1]= "Tamil";
+
+    // numeral row
+    key <AE01> {  [ 0x10000e7, 0x10000a7 ] } ;
+    key <AE02> {  [ 0x10000fa, 0x10000a8 ] } ;
+    key <AE03> {  [ 0x10000fb ] } ;
+    key <AE04> {  [ 0x10000fc ] } ;
+    key <AE05> {  [ 0x10000fd ] } ;
+    key <AE06> {  [ 0x10000fe ] } ;
+    key <AE07> {  [ 0x10000ff ] } ;
+	
+    // q-row
+    key <AD01> {  [ 0x10000eb, 0x10000b3 ] };
+    key <AD02> {  [ 0x10000f8, 0x10000c1 ] };
+    key <AD03> {  [ 0x10000ef, 0x10000b8 ] };
+    key <AD04> {  [ 0x10000ea, 0x10000b2 ] };
+    key <AD05> {  [ 0x10000f5, 0x10000be ] };
+    key <AD06> {  [ 0x10000f4, 0x10000bd ] };
+    key <AD07> {  [ 0x10000f3, 0x10000bc ] };
+    key <AD08> {  [ 0x10000ac, 0x10000e4 ] };
+    key <AD09> {  [ 0x10000ae, 0x10000af ] };
+    key <AD10> {  [ 0x10000a4, 0x10000a6 ] };
+    key <AD11> {  [ dead_circumflex, 0x10000a6 ] }; // Ukaaram
+
+    // a-row
+    key <AC01> {  [ 0x10000f2, 0x10000bb ] };
+    key <AC02> {  [ 0x10000f7, 0x10000c0 ] };
+    key <AC03> {  [ 0x10000f9, 0x10000c2 ] };
+    key <AC04> {  [ 0x10000e8, 0x10000b0 ] };
+    key <AC05> {  [ 0x10000f0, 0x10000b9 ] };
+    key <AC06> {  [ 0x10000a2, 0x10000a3 ] };
+    key <AC07> {  [ 0x10000ee, 0x10000b6 ] };
+    key <AC08> {  [ 0x10000f1, 0x10000ba ] };
+    key <AC09> {  [ 0x10000ec, 0x10000b4 ] };
+    key <AC10> {  [ 0x10000f6, 0x10000bf ] };
+    key <AC11> {  [ 0x10000e9, 0x10000b1 ] };
+    
+    // z-row
+    key <AB01> {  [ 0x10000ed, 0x10000b5 ] };
+    key <AB02> {  [ 0x10000e5, 0x10000e6 ] };
+    key <AB03> {  [ 0x10000e0, 0x10000e1 ] };
+    key <AB04> {  [ 0x10000e2, 0x10000e3 ] };
+    key <AB05> {  [ 0x10000aa, 0x10000ab ] };
+    key <AB06> {  [ 0x10000ac, 0x10000a3 ] };
+    key <AB07> {  [ 0x10000dc, 0x10000dd ] };
+    key <AB08> {  [ 0x10000de, 0x10000df ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "UNI" {
+
+// Description: A keymap based on the TamilNet'99 typewriter keyboard 
+// Encoding: Unicode (http://www.unicode.org)
+// Author: Thuraiappah Vaseeharan <vasee@ieee.org>
+// Date  : Sat Feb  9 21:10:48 CST 2002
+// Mapping:
+  
+    name[Group1]= "Tamil";
+
+    // granthas
+    key <AE01> {  [ 0x1000b83 ] } ;
+    key <AE03> {  [ 0x1000b9c ] } ;
+    key <AE04> {  [ 0x1000bb7 ] } ;
+    key <AE05> {  [ 0x1000bb8 ] } ;
+    key <AE06> {  [ 0x1000bb9 ] } ;
+	
+    // Qrow
+    key <AD01> {  [ 0x1000b9e ] };
+    key <AD02> {  [ 0x1000bb1 ] };
+    key <AD03> {  [ 0x1000ba8 ] };
+    key <AD04> {  [ 0x1000b9a ] };
+    key <AD05> {  [ 0x1000bb5 ] };
+    key <AD06> {  [ 0x1000bb2 ] };
+    key <AD07> {  [ 0x1000bb0 ] };
+    key <AD08> {  [ 0x1000bc8, 0x1000b90 ] };
+    key <AD09> {  [ 0x1000bca, 0x1000bcb ] };
+    key <AD10> {  [ 0x1000bbf, 0x1000bc0 ] };
+    key <AD11> {  [ 0x1000bc1, 0x1000bc2 ] };
+
+    // Arow
+    key <AC01> { [ 0x1000baf ] };
+    key <AC02> { [ 0x1000bb3 ] };
+    key <AC03> { [ 0x1000ba9 ] };
+    key <AC04> { [ 0x1000b95 ] };
+    key <AC05> { [ 0x1000baa ] };
+    key <AC06> { [ 0x1000bbe, 0x1000bb4 ] };
+    key <AC07> { [ 0x1000ba4 ] };
+    key <AC08> { [ 0x1000bae ] };
+    key <AC09> { [ 0x1000b9f ] };
+    key <AC10> { [ 0x1000bcd ] };
+    key <AC11> { [ 0x1000b99 ] };
+    
+    // Zrow
+    key <AB01> { [ 0x1000ba3 ]  };
+    key <AB02> { [ 0x1000b92, 0x1000b93 ]  };
+    key <AB03> { [ 0x1000b89, 0x1000b8a ]  };
+    key <AB04> { [ 0x1000b8e, 0x1000b8f ]  };
+    key <AB05> { [ 0x1000bc6, 0x1000bc7 ]  };
+    key <AB06> { [ 0x1000b94, 0x1000bcc ]  };
+    key <AB07> { [ 0x1000b85, 0x1000b86 ]  };
+    key <AB08> { [ 0x1000b87, 0x1000b88 ]  };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "INSCRIPT" {
+      name[Group1]= "Tamil";
+
+      key <TLDE> { [      0x1000BCA, 0x1000B92	]	};
+
+      // Mainly numbers.
+      key <AE01> { [      0x1000BE7 		]	};
+      key <AE02> { [      0x1000BE8 		]	};
+      key <AE03> { [      0x1000BE9 		]	};
+      key <AE04> { [      0x1000BEA 		]	};
+      key <AE05> { [      0x1000BEB 		]	};
+      key <AE06> { [      0x1000BEC 		]	};
+      key <AE07> { [      0x1000BED        	]	};
+      key <AE08> { [      0x1000BEE 		]	};
+      key <AE09> { [      0x1000BEF, parenleft	]	};
+      key <AE10> { [      0x1000BF0, parenright	]	};
+      key <AE11> { [      0x1000BF1, 0x1000B83  ]	};
+      key <AE12> { [      0x1000BF2, plus	] 	};
+
+// Mainly long vowels
+
+      key <AD01> { [      0x1000BCC,  0x1000B94 ]	};
+      key <AD02> { [      0x1000BC8,  0x1000B90 ]	};
+      key <AD03> { [      0x1000BBE,  0x1000B86 ]	};
+      key <AD04> { [      0x1000BC0,  0x1000B88 ]	};
+      key <AD05> { [      0x1000BC2,  0x1000B8A ]	};
+
+// Mainly voiced consonants
+
+      key <AD07> { [      0x1000BB9, 0x1000B99	]	};
+      key <AD12> { [      0x1000BBC, 0x1000B9E	]	};
+
+// Mainly short vowels
+      key <AC01> { [      0x1000BCB,  0x1000B93 ]	};
+      key <AC02> { [      0x1000BC7,  0x1000B8F ]	};
+      key <AC03> { [      0x1000BCD,  0x1000B85 ]	};
+      key <AC04> { [      0x1000BBF,  0x1000B87 ]	};
+      key <AC05> { [      0x1000BC1,  0x1000B89 ]	};
+
+// Mainly unvoiced consonants
+
+      key <AC06> { [      0x1000BAA 		]	};
+      key <AC07> { [      0x1000BB0,  0x1000BB1 ]	};
+      key <AC08> { [      0x1000B95 		]	};
+      key <AC09> { [      0x1000BA4 		]	};
+      key <AC10> { [      0x1000B9A 		]	};
+      key <AC11> { [      0x1000B9F 		]	};
+      key <BKSL> { [      backslash, bar 	]	};
+
+      key <AB01> { [      0x1000BC6,  0x1000B8E	]	};
+      key <AB02> { [      0x1000B82   		]       };
+      key <AB03> { [      0x1000BAE,  0x1000BA3 ]       };
+      key <AB04> { [      0x1000BA8,  0x1000BA9 ]       };
+      key <AB05> { [      0x1000BB5,  0x1000BB4 ]       };
+      key <AB06> { [      0x1000BB2,  0x1000BB3 ]       };
+      key <AB07> { [      0x1000BB8		]       };
+      key <AB08> { [      comma,      0x1000BB7 ]       };
+      key <AB09> { [      period,     0x1000964 ]       };
+      key <AB10> { [      0x1000BAF,  question  ]       };
+};
diff --git a/symbols/tr b/symbols/tr
new file mode 100644
index 00000000..b74a1748
--- /dev/null
+++ b/symbols/tr
@@ -0,0 +1,153 @@
+
+// based on
+// Turkish keyboard symbols for PC and xkb
+// This file distributed without any expressed or implied warranty
+// Nilgün Belma Bugüner <nilgun@superonline.com>, 2002
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/tr,v 1.5 2003/04/19 12:22:12 pascal Exp $
+
+//Default Layout (Turkish Q)
+default partial
+xkb_symbols "basic" {
+
+    include "pc/latin"
+
+    name[Group1]="Turkish";
+
+    key <AE01>	{ [         1,    exclam,    onesuperior,    exclamdown ] };
+    key <AE02>	{ [         2, apostrophe,      sterling,   twosuperior ] };
+    key <AE03>	{ [        3, asciicircum,    numbersign, threesuperior ] };
+    key <AE04>	{ [         4,       plus,        dollar,    onequarter ] };
+    key <AE06>	{ [         6,  ampersand, threequarters,    VoidSymbol ] };
+    key <AE07>	{ [         7,      slash,     braceleft,    VoidSymbol ] };
+    key <AE08>	{ [         8,  parenleft,   bracketleft,    VoidSymbol ] };
+    key <AE09>	{ [         9, parenright,  bracketright,     plusminus ] };
+    key <AE10>	{ [         0,      equal,    braceright,        degree ] };
+    key <AE11>	{ [  asterisk,   question,     backslash,  questiondown ] };
+    key <AE12>	{ [     minus, underscore,      division,    VoidSymbol ] };
+
+    key <AD02>	{ [         w,          W,   VoidSymbol,   VoidSymbol ]	};
+    key <AD03>	{ [         e,          E,     EuroSign,   VoidSymbol ]	};
+    key <AD05>	{ [         t,          T,    trademark,   VoidSymbol ]	};
+    key <AD07>	{ [         u,          U,  ucircumflex,  Ucircumflex ]	};
+    key <AD08>	{ [  idotless,          I,  icircumflex,  Icircumflex ]	};
+    key <AD09>	{ [         o,          O,  ocircumflex,  Ocircumflex ]	};
+    key <AD10>	{ [         p,          P,   VoidSymbol,   VoidSymbol ]	};
+    key <AD11>	{ [    gbreve,     Gbreve ] };
+    key <AD12>	{ [udiaeresis, Udiaeresis,   asciitilde,  dead_macron ]	};
+
+    key <AC01>	{ [         a,          A,  acircumflex,  Acircumflex ]	};
+    key <AC02>	{ [         s,          S,      section,   VoidSymbol ]	};
+    key <AC03>	{ [         d,          D,   VoidSymbol,   VoidSymbol ]	};
+    key <AC04>	{ [         f,          F,  ordfeminine,   VoidSymbol ]	};
+    key <AC05>	{ [         g,          G,   VoidSymbol,   VoidSymbol ]	};
+    key <AC06>	{ [         h,          H,   VoidSymbol,   VoidSymbol ]	};
+    key <AC08>	{ [         k,          K,   VoidSymbol,   VoidSymbol ]	};
+    key <AC09>	{ [         l,          L,   VoidSymbol,   VoidSymbol ]	};
+    key <AC10>	{ [  scedilla,   Scedilla,        acute,   dead_acute ]	};
+    key <AC11>	{ [         i,  Iabovedot,   apostrophe,   dead_caron ]	};
+    key <TLDE>	{ [  quotedbl,  backslash,    plusminus,       degree ]	};
+
+    key <BKSL>	{ [     comma,  semicolon,        grave,   dead_grave ]	};
+    key <LSGT>	{ [      less,    greater,          bar,    brokenbar ]	};
+    key <AB08>	{ [odiaeresis, Odiaeresis,     multiply,   VoidSymbol ]	};
+    key <AB09>	{ [  ccedilla,   Ccedilla, periodcentered,     division ] };
+    key <AB10>	{ [    period,      colon, dead_abovedot, dead_abovedot ] };
+    key <SPCE>	{ [     space,      space, nobreakspace,   nobreakspace ] };
+
+    include "level3(ralt_switch_multikey)"
+};
+
+
+// Turkish F Layout
+partial
+xkb_symbols "tr_f" {
+
+    include "pc/latin"
+
+    name[Group1]="Turkish";
+
+    key <AE01>	{ [         1,     exclam,  onesuperior,   exclamdown ]	};
+    key <AE02>	{ [         2,   quotedbl,  twosuperior,   VoidSymbol ]	};
+    key <AE03>	{ [         3, asciicircum, numbersign, threesuperior ] };
+    key <AE04>	{ [         4,     dollar,   onequarter,   VoidSymbol ]	};
+    key <AE06>	{ [         6,  ampersand, threequarters,  VoidSymbol ]	};
+    key <AE07>	{ [         7, apostrophe,    braceleft,   VoidSymbol ]	};
+    key <AE08>	{ [         8,  parenleft,  bracketleft,   VoidSymbol ]	};
+    key <AE09>	{ [         9, parenright, bracketright,    plusminus ]	};
+    key <AE10>	{ [         0,      equal,   braceright,       degree ]	};
+    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};
+    key <AE12>	{ [     minus, underscore,     division,   VoidSymbol ]	};
+
+    key <AD01>	{ [         f,          F,           at,   VoidSymbol ]	};
+    key <AD02>	{ [         g,          G,   VoidSymbol,   VoidSymbol ]	};
+    key <AD03>	{ [    gbreve,     Gbreve,   VoidSymbol,   VoidSymbol ]	};
+    key <AD04>	{ [  idotless,          I,    paragraph,   VoidSymbol ]	};
+    key <AD05>	{ [         o,          O,  ocircumflex,  Ocircumflex ]	};
+    key <AD06>	{ [         d,          D,          yen,   VoidSymbol ]	};
+    key <AD07>	{ [         r,          R,   registered,   VoidSymbol ]	};
+    key <AD08>	{ [         n,          N,   VoidSymbol,   VoidSymbol ]	};
+    key <AD09>	{ [         h,          H,       degree,   VoidSymbol ]	};
+    key <AD10>	{ [         p,          P,     sterling,   VoidSymbol ]	};
+    key <AD11>	{ [         q,          Q, dead_diaeresis, dead_abovering ] };
+    key <AD12>	{ [         w,          W,   asciitilde,   dead_breve ]	};
+
+    key <AC01>	{ [         u,          U,  ucircumflex,  Ucircumflex ]	};
+    key <AC02>	{ [         i,  Iabovedot,  icircumflex,  Icircumflex ]	};
+    key <AC03>	{ [         e,          E,     EuroSign,   VoidSymbol ]	};
+    key <AC04>	{ [         a,          A,  acircumflex,  Acircumflex ]	};
+    key <AC05>	{ [udiaeresis, Udiaeresis,  ucircumflex,  Ucircumflex ]	};
+    key <AC06>	{ [         t,          T,    trademark,   VoidSymbol ]	};
+    key <AC07>	{ [         k,          K,   VoidSymbol,   VoidSymbol ]	};
+    key <AC08>	{ [         m,          M,           mu,   VoidSymbol ]	};
+    key <AC09>	{ [         l,          L,   VoidSymbol,   VoidSymbol ]	};
+    key <AC10>	{ [         y,          Y,        acute,   dead_acute ]	};
+    key <AC11>	{ [  scedilla,   Scedilla,   numbersign,   dead_caron ]	};
+    key <TLDE>	{ [      plus,   asterisk,      notsign,    plusminus ]	};
+
+    key <BKSL>	{ [         x,          X,        grave,   dead_grave ]	};
+    key <AB01>	{ [         j,          J, guillemotleft,  VoidSymbol ]	};
+    key <AB02>	{ [odiaeresis, Odiaeresis, guillemotright, VoidSymbol ]	};
+    key <AB03>	{ [         v,          V, leftdoublequotemark, VoidSymbol ] };
+    key <AB04>	{ [         c,          C,         cent,    copyright ]	};
+    key <AB05>	{ [  ccedilla,   Ccedilla, rightdoublequotemark, VoidSymbol] };
+    key <AB06>	{ [         z,          Z,   VoidSymbol,   VoidSymbol ]	};
+    key <AB07>	{ [         s,          S,      section,   VoidSymbol ]	};
+    key <AB08>	{ [         b,          B,     multiply, nobreakspace ]	};
+    key <AB09>	{ [    period,      colon,     division, dead_abovedot]	};
+    key <AB10>	{ [     comma,  semicolon, periodcentered, VoidSymbol ]	};
+    key <SPCE>	{ [    space,       space, nobreakspace, nobreakspace ]	};
+    key <LSGT>	{ [     less,     greater,          bar,    brokenbar ]	};
+   
+    include "level3(ralt_switch_multikey)"
+};
+
+// Turkish Alt-Q Layout
+partial
+xkb_symbols "tr_alt" {
+
+    include "pc/latin"
+
+    name[Group1]="Turkish";
+
+    key <AE07>  { [         7,   ampersand,  lowleftcorner,  upleftcorner ] };
+    key <AE08>  { [         8,    asterisk,          leftt,          topt ] };
+    key <AE09>  { [         9,   parenleft,         rightt,          bott ] };
+    key <AE10>  { [         0,  parenright, lowrightcorner, uprightcorner ] };
+    key <AE11>  { [     minus,  underscore, horizlinescan5,      vertbar  ] };
+    key <AE12>  { [     equal,        plus,  crossinglines  ] };
+
+    key <AD03>  { [         e,           E,     EuroSign,   VoidSymbol ] };
+//    key <AD05>        { [         t,           T,    trademark,   VoidSymbol >
+    key <AD07>  { [         u,           U,   udiaeresis,   Udiaeresis ] };
+    key <AD08>  { [         i,           I,     idotless,    Iabovedot ] };
+    key <AD09>  { [         o,           O,   odiaeresis,   Odiaeresis ] };
+    key <AC01>  { [         a,           A,  acircumflex,  Acircumflex ] };
+    key <AC02>  { [         s,           S,     scedilla,     Scedilla ] };
+    key <AC05>  { [         g,           G,       gbreve,       Gbreve ] };
+
+    key <AB03>  { [         c,           C,     ccedilla,     Ccedilla ] };
+    key <SPCE>  { [     space,       space, nobreakspace, nobreakspace ] };
+
+    include "level3(ralt_switch_multikey)"
+};
diff --git a/symbols/ua b/symbols/ua
new file mode 100644
index 00000000..1f398c69
--- /dev/null
+++ b/symbols/ua
@@ -0,0 +1,149 @@
+
+// based on
+// ukrainian standard keyboard 
+// AEN <aen@logic.ru> & Leon Kanter <leon@geon.donetsk.ua>
+// Last Changes 2003/09/03 by Andriy Rysin <arysin@yahoo.com>
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/ua,v 1.4 2003/05/15 11:29:47 pascal Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Ukrainian";
+
+    key	<TLDE> {	[      apostrophe,	asciitilde	]	};
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,      numbersign	]	};
+    key	<AE04> {	[		4,        asterisk	]	};
+    key	<AE05> {	[		5,	     colon	]	};
+    key	<AE06> {	[		6,	     comma	]	};
+    key	<AE07> {	[		7,	    period	]	};
+    key	<AE08> {	[		8,	 semicolon	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+    key	<AE11> {	[	    minus,	underscore	]	};
+    key	<AE12> {	[	    equal,	      plus	]	};
+
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<AD12> {	[    Ukrainian_yi,    Ukrainian_YI	]	};
+    key	<BKSL> {	[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[     Ukrainian_i,     Ukrainian_I	]	};
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[    Ukrainian_ie,    Ukrainian_IE	]	};
+
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<AB10> {	[	    slash,	  question	]	};
+
+    key <LSGT> {        [           slash,             bar      ]       };
+    // End alphanumeric section
+};
+
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+    include "pc/ua(basic)"
+ 
+    key <AE03> {        [               3,      numerosign      ]       };
+    key <AE04> {        [               4,       semicolon      ]       };
+    key <AE05> {        [               5,         percent      ]       };
+    key <AE06> {        [               6,           colon      ]       };
+    key <AE07> {        [               7,        question      ]       };
+    key <AE08> {        [               8,        asterisk      ]       };
+    key <AB10> {        [          period,           comma      ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "typewriter" {
+    include "pc/ua(basic)"
+
+    key	<TLDE> {	[      apostrophe,	  quotedbl	] 	};
+    key	<AE01> {	[	   exclam,		 1 	]	};
+    key	<AE02> {	[      numerosign,		 2	]	};
+    key	<AE03> {	[	    slash,		 3	]	};
+    key	<AE04> {	[	semicolon,		 4	]	};
+    key	<AE05> {	[	    colon,		 5	]	};
+    key	<AE06> {	[	    comma,		 6	]	};
+    key	<AE07> {	[	   period,		 7	]	};
+    key	<AE08> {	[      underscore,		 8	]	};
+    key	<AE09> {	[	 question,		 9	]	};
+    key	<AE10> {	[	  percent,		 0	]	};
+
+    key	<AD12> {	[ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key	<AC02> {	[      Cyrillic_i,	Cyrillic_I	]	};
+
+    key	<AB05> {	[     Ukrainian_i,     Ukrainian_I	]	};
+
+    key	<AB10> {	[    Ukrainian_yi,    Ukrainian_YI	]	};
+
+    key	<BKSL> {	[	parenleft,	parenright	]	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "phonetic" {
+  include "pc/ua(basic)"
+  
+  key <LatQ> {   [ Cyrillic_ya,       Cyrillic_YA         ]    };
+  key <LatW> {   [ Cyrillic_ve,       Cyrillic_VE         ]    };
+  key <LatE> {   [ Cyrillic_ie,       Cyrillic_IE         ]    };
+  key <LatR> {   [ Cyrillic_er,       Cyrillic_ER         ]    };
+  key <LatT> {   [ Cyrillic_te,       Cyrillic_TE         ]    };
+  key <LatY> {   [ Cyrillic_i,        Cyrillic_i          ]    };
+  key <LatU> {   [ Cyrillic_u,        Cyrillic_U          ]    };
+  key <LatI> {   [ Ukrainian_i,       Ukrainian_I         ]    };
+  key <LatO> {   [ Cyrillic_o,        Cyrillic_O          ]    };
+  key <LatP> {   [ Cyrillic_pe,       Cyrillic_PE         ]    };
+  key <AD11> {   [ Cyrillic_sha,      Cyrillic_SHA        ]    };
+  key <AD12> {   [ Cyrillic_shcha,    Cyrillic_SHCHA      ]    };
+
+  key <LatA> {   [ Cyrillic_a,        Cyrillic_A          ]    };
+  key <LatS> {   [ Cyrillic_es,       Cyrillic_ES         ]    };
+  key <LatD> {   [ Cyrillic_de,       Cyrillic_DE         ]    };
+  key <LatF> {   [ Cyrillic_ef,       Cyrillic_EF         ]    };
+  key <LatG> {   [ Cyrillic_ghe,      Cyrillic_GHE        ]    };
+  key <LatH> {   [ Cyrillic_ha,       Cyrillic_HA         ]    };
+  key <LatJ> {   [ Cyrillic_shorti,   Cyrillic_SHORTI     ]    };
+  key <LatK> {   [ Cyrillic_ka,       Cyrillic_KA         ]    };
+  key <LatL> {   [ Cyrillic_el,       Cyrillic_EL         ]    };
+  key <AC10> {   [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+  key <AC11> {   [ Cyrillic_che,      Cyrillic_CHE        ]    };
+  key <BKSL> {   [ Cyrillic_yu,       Cyrillic_YU         ]    };
+
+  key <LatZ> {   [ Cyrillic_ze,       Cyrillic_ZE         ]    };
+  key <LatX> {   [ Cyrillic_softsign, Cyrillic_SOFTSIGN   ]    };
+  key <LatC> {   [ Cyrillic_tse,      Cyrillic_TSE        ]    };
+  key <LatV> {   [ Cyrillic_zhe,      Cyrillic_ZHE        ]    };
+  key <LatB> {   [ Cyrillic_be,       Cyrillic_BE         ]    };
+  key <LatN> {   [ Cyrillic_en,       Cyrillic_EN         ]    };
+  key <LatM> {   [ Cyrillic_em,       Cyrillic_EM         ]    };
+  key <AB08> {   [ Ukrainian_yi,      Ukrainian_YI	  ]    };
+  key <AB09> {   [ Ukrainian_ie,      Ukrainian_IE	  ]    };
+  key <AB10> {   [ slash,             question            ]    };
+};
diff --git a/symbols/us b/symbols/us
new file mode 100644
index 00000000..6d1b13ae
--- /dev/null
+++ b/symbols/us
@@ -0,0 +1,122 @@
+//
+// $XdotOrg: xc/programs/xkbcomp/symbols/pc/us,v 1.1.4.3 2004/03/05 13:41:33 eich Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/pc/us,v 1.6 2003/10/31 14:32:05 pascal Exp $
+
+default
+partial hidden alphanumeric_keys modifier_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "US/ASCII";
+
+    include "pc/pc(common)"
+
+    // Alphanumeric section
+    key <TLDE> {	[     grave,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[     minus,	underscore	]	};
+    key <AE12> {	[     equal,	plus		]	};
+
+    key <AD01> {	[	  q,	Q 		]	};
+    key <AD02> {	[	  w,	W		]	};
+    key <AD03> {	[	  e,	E		]	};
+    key <AD04> {	[	  r,	R		]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  y,	Y		]	};
+    key <AD07> {	[	  u,	U		]	};
+    key <AD08> {	[	  i,	I		]	};
+    key <AD09> {	[	  o,	O		]	};
+    key <AD10> {	[	  p,	P		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+
+    key <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ apostrophe,	quotedbl	]	};
+
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[     comma,	less		]	};
+    key <AB09> {	[    period,	greater		]	};
+    key <AB10> {	[     slash,	question	]	};
+
+    key <BKSL> {	[ backslash,         bar	]	};
+    // End alphanumeric section
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "intl" {
+
+    name[Group1]= "US International";
+
+    include "pc/us(basic)"
+
+    // Alphanumeric section
+    key <TLDE> { [dead_grave, dead_tilde,         grave,       asciitilde ] };
+    key <AE01> { [	   1,     exclam,    exclamdown,      onesuperior ] };
+    key <AE02> { [	   2,         at,   twosuperior, dead_doubleacute ] };
+    key <AE03> { [	   3, numbersign, threesuperior,      dead_macron ] };
+    key <AE04> { [	   4,     dollar,      currency,         sterling ] };
+    key <AE05> { [	   5,    percent,      EuroSign                   ] };
+    key <AE06> { [    6, dead_circumflex,    onequarter,      asciicircum ] };
+    key <AE07> { [	   7,  ampersand,       onehalf,	dead_horn ] };
+    key <AE08> { [	   8,   asterisk, threequarters,      dead_ogonek ] };
+    key <AE09> { [	   9,  parenleft, leftsinglequotemark, dead_breve ] };
+    key <AE10> { [	   0, parenright, rightsinglequotemark, dead_abovering ] };
+    key <AE11> { [     minus, underscore,           yen,    dead_belowdot ] };
+    key <AE12> { [     equal,       plus,      multiply,         division ] };
+
+    key <AD01> { [	   q,          Q,    adiaeresis,       Adiaeresis ] };
+    key <AD02> { [	   w,          W,         aring,            Aring ] };
+    key <AD03> { [	   e,          E,        eacute,           Eacute ] };
+    key <AD04> { [	   r,          R,    registered,       registered ] };
+    key <AD05> { [	   t,          T,         thorn,            THORN ] };
+    key <AD06> { [	   y,          Y,    udiaeresis,       Udiaeresis ] };
+    key <AD07> { [	   u,          U,        uacute,           Uacute ] };
+    key <AD08> { [	   i,          I,        iacute,           Iacute ] };
+    key <AD09> { [	   o,          O,        oacute,           Oacute ] };
+    key <AD10> { [	   p,          P,    odiaeresis,       Odiaeresis ] };
+    key <AD11> { [ bracketleft,  braceleft,  guillemotleft, guillemotleft ] };
+    key <AD12> { [bracketright, braceright, guillemotright,guillemotright ] };
+
+    key <AC01> { [	   a,          A,        aacute,           Aacute ] };
+    key <AC02> { [	   s,          S,        ssharp,          section ] };
+    key <AC03> { [	   d,          D,           eth,              ETH ] };
+
+    key <AC09> { [	   l,          L,        oslash,         Ooblique ] };
+    key <AC10> { [ semicolon,      colon,     paragraph,           degree ] };
+    key <AC11> { [dead_acute, dead_diaeresis, apostrophe,        quotedbl ] };
+
+    key <AB01> { [	   z,          Z,            ae,               AE ] };
+    key <AB03> { [	   c,          C,     copyright,             cent ] };
+    key <AB06> { [	   n,          N,        ntilde,           Ntilde ] };
+    key <AB07> { [	   m,          M,            mu,               mu ] };
+    key <AB08> { [     comma,       less,      ccedilla,         Ccedilla ] };
+    key <AB09> { [    period,    greater, dead_abovedot,       dead_caron ] };
+    key <AB10> { [     slash,   question,  questiondown,        dead_hook ] };
+    key <BKSL> { [ backslash,        bar,       notsign,        brokenbar ] };
+
+    include "level3(ralt_switch_multikey)"
+};
diff --git a/symbols/us_intl b/symbols/us_intl
new file mode 100644
index 00000000..d33058b8
--- /dev/null
+++ b/symbols/us_intl
@@ -0,0 +1,54 @@
+// $XFree86$
+
+// Based on symbols/us_intl keyboard map:
+// Dead-keys definition for a very simple US/ASCII layout.
+// by Conectiva (http://www.conectiva.com.br)
+// modified by Ricardo Y. Igarashi (iga@that.com.br)
+
+// Added the following deadkeys, to make it truly international:
+//
+// dead_macron: on AltGr-minus
+// dead_breve: on AltGr-parenleft
+// dead_abovedot: on AltGr-period
+// dead_abovering: on AltGr-0
+// dead_doubleacute: on AltGr-equal (as quotedbl is already used)
+// dead_caron: on AltGr-less (AltGr-shift-comma)
+// dead_cedilla: on AltGr-comma
+// dead_ogonek: on AltGr-semicolon
+// dead_belowdot: on AltGr-underscore (AltGr-shift-minus)
+// dead_hook: on AltGr-question
+// dead_horn: on AltGr-plus (AltGr-shift-equal)
+// dead_diaeresis: on AltGr-colon (Alt-shift-semicolon)
+//
+// those were already there:
+// dead_grave
+// dead_acute
+// dead_circumflex
+// dead_tilde
+// dead_diaeresis
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+
+  name[Group1]= "US/ASCII";
+  include "pc/us"
+
+  key <TLDE> { [ dead_grave, dead_tilde,    grave,	      asciitilde    ] };
+  key <AE05> { [          5, percent,	    EuroSign			    ] };
+  key <AE06> { [	  6, dead_circumflex, asciicircum,    asciicircum   ] };
+  key <AE09> { [	  9, parenleft,	    dead_breve,	      dead_breve    ] };
+  key <AE10> { [	  0, parenright,    dead_abovering,   dead_abovering] };
+  key <AE11> { [      minus, underscore,    dead_macron,      dead_belowdot ] };
+  key <AE12> { [      equal, plus,	    dead_doubleacute, dead_horn	    ] };
+
+  key <AD03> { [          e, E,		     EuroSign,         cent	    ] };
+
+  key <AC10> { [  semicolon, colon,	     dead_ogonek,   dead_diaeresis  ] };
+  key <AC11> { [ dead_acute, dead_diaeresis, apostrophe,    quotedbl	    ] };
+
+  key <AB08> { [      comma, less,	     dead_cedilla,  dead_caron	    ] };
+  key <AB09> { [     period, greater,	     dead_abovedot, dead_circumflex ] };
+  key <AB10> { [      slash, question,	     dead_hook,	    dead_hook	    ] };
+
+  include "level3(ralt_switch_multikey)"
+};
diff --git a/symbols/uz b/symbols/uz
new file mode 100644
index 00000000..82e2e90f
--- /dev/null
+++ b/symbols/uz
@@ -0,0 +1,81 @@
+// Uzbek standard keyboard
+//
+// Mashrab Kuvatov <kmashrab@uni-bremen.de>
+//
+// History:
+//
+// Jun 2, 2003. Mashrab Kuvatov <kmashrab@uni-bremen.de>
+//
+// Created based on Russian standard keyboard. AEN <aen@logic.ru> 
+// The following symbols of Russian standard keyboard were replaced:
+// minus (key <AE11>) with Cyrillic_shortu (U045e),
+// equal (key <AE12>) with Cyrillic_kadescender (U049b)
+// Cyrillic_ha (key <AD11>) with Cyrillic_ghestoke (U0493)
+// Cyrillic_hardsign (key <AD11>) with Cyrillic_hadescender (U0493)
+// The following symbols of Russian standard keyboard were moved:
+// Cyrillic_ze       to key <AC02> (english 's'), 
+// Cyrillic_sha      to key <AD08> (english 'i'),
+// Cyrillic_ha       to key <AD09> (english 'o'),
+// Cyrillic_hardsign to key <AD10> (english 'p'). 
+//
+// $XFree86: xc/programs/xkbcomp/symbols/pc/uz,v 1.2 2003/06/21 13:01:59 pascal Exp $
+
+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    name[Group1]= "Uzbek";
+
+    key	<AE01> {	[		1,	    exclam 	]	};
+    key	<AE02> {	[		2,        quotedbl	]	};
+    key	<AE03> {	[		3,      numbersign	]	};
+    key	<AE04> {	[		4,       semicolon 	]	};
+    key	<AE05> {	[		5,	   percent 	]	};
+    key	<AE06> {	[		6,	     colon	]	};
+    key	<AE07> {	[		7,	  question	]	};
+    key	<AE08> {	[		8,	  asterisk	]	};
+    key	<AE09> {	[		9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright	]	};
+    key	<BKSL> {	[	backslash,             bar	]	};
+    key	<AB10> {	[	   period,	     comma	]	};
+    key <LSGT> {        [           slash,             bar      ]       };
+
+key.type[group1]="ALPHABETIC";
+
+    key	<AE11> {	[           U045e,           U040e      ]	};
+    key	<AE12> {	[           U049b,           U049a      ]	};
+    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
+    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
+    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> {	[           U0493,           U0492      ]	};
+    key	<AD12> {	[           U04b3,           U04b2	]	};
+    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
+    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
+
+    // End alphanumeric section
+};
diff --git a/symbols/xfree68.vndr/amiga b/symbols/xfree68.vndr/amiga
new file mode 100644
index 00000000..dcc143bb
--- /dev/null
+++ b/symbols/xfree68.vndr/amiga
@@ -0,0 +1,132 @@
+// $Xorg: amiga,v 1.3 2000/08/17 19:54:46 cpqbld Exp $
+
+
+
+// $XFree86: xc/programs/xkbcomp/symbols/xfree68/amiga,v 1.2 2000/06/23 00:44:37 dawes Exp $
+
+default xkb_symbols "usa1" {
+
+    name[Group1]= "usa1";
+    key <ESC>  {	[	 Escape			]	};
+
+    // Begin "Function" section
+    key <FK01> {	[	 F1			]	};
+    key <FK02> {	[	 F2			]	};
+    key <FK03> {	[	 F3			]	};
+    key <FK04> {	[	 F4			]	};
+    key <FK05> {	[	 F5			]	};
+    key <FK06> {	[	 F6			]	};
+    key <FK07> {	[	 F7			]	};
+    key <FK08> {	[	 F8			]	};
+    key <FK09> {	[	 F9			]	};
+    key <FK10> {	[	 F10			]	};
+    // End "Function" section
+
+    // Alphanumeric section
+    key <TLDE> {	[ quoteleft,	asciitilde	]	};
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[ minus,	underscore	]	};
+    key <AE12> {	[ equal,	plus		]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+    key <BKSP> {	[	BackSpace		]	};
+
+    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
+    key <AD01> {	[	  q,	Q 		]	};
+    key <AD02> {	[	  w,	W		]	};
+    key <AD03> {	[	  e,	E		]	};
+    key <AD04> {	[	  r,	R		]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  y,	Y		]	};
+    key <AD07> {	[	  u,	U		]	};
+    key <AD08> {	[	  i,	I		]	};
+    key <AD09> {	[	  o,	O		]	};
+    key <AD10> {	[	  p,	P		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+    key <RTRN> {	[	 Return			]	};
+
+    key <LCTL> {	[	 Control_L		]	};
+    key <CAPS> {	[	 Caps_Lock		]	};
+    key <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ quoteright,	quotedbl	]	};
+
+    key <LFSH> {	[ 	 Shift_L		]	};
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[ comma,	less		]	};
+    key <AB09> {	[ period,	greater		]	};
+    key <AB10> {	[ slash,	question	]	};
+    key <RTSH> {	[	 Shift_R		]	};
+
+    key <LALT> {	[ Alt_L,	Meta_L 		]	};
+    key <LAMI>  {	[	 Mode_switch		]	};
+    key <SPCE> {	[	 space			]	};
+    key <RAMI>  {	[	 Multi_key		]	};
+    key <RALT> {	[ Alt_R,	Meta_R		]	};
+    // End alphanumeric section
+
+    // Begin "Editing" section
+    key <DELE> {	[	 Delete		]	};
+    key <HELP> {	[	 Help		]	};
+    key <UP>   {	[	 Up		]	};
+    key <LEFT> {	[	 Left		]	};
+    key <DOWN> {	[	 Down		]	};
+    key <RGHT> {	[	 Right		]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <KPLP> {	[	 Num_Lock		]	};
+    key <KPRP> {	[	 Scroll_Lock		]	};
+    key <KPDV> {	[	 KP_Divide		]	};
+    key <KPMU> {	[ KP_Multiply,	Print		]	};
+
+    key <KP7>  {	[ KP_7,		KP_Home		]	};
+    key <KP8>  {	[ KP_8,		KP_Up		]	};
+    key <KP9>  {	[ KP_9,		KP_Prior	]	};
+    key <KPSU> {	[	 KP_Subtract		]	};
+
+    key <KP4>  {	[ KP_4,		KP_Left		]	};
+    key <KP5>  {	[	 KP_5			]	};
+    key <KP6>  {	[ KP_6,		KP_Right	]	};
+    key <KPAD> {	[	 KP_Add			]	};
+
+    key <KP1>  {	[ KP_1,		KP_End		]	};
+    key <KP2>  {	[ KP_2,		KP_Down		]	};
+    key <KP3>  {	[ KP_3,		KP_Next		]	};
+
+    key <KP0>  {	[ KP_0,		KP_Insert	]	};
+    key <KPDC> {	[ KP_Decimal,	KP_Delete	]	};
+    key <KPEN> {	[	 KP_Enter	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod1	{ Alt_L, Alt_R };
+    modifier_map Mod2	{ Mode_switch };
+    modifier_map Mod3	{ Meta_L, Meta_R };
+};
diff --git a/symbols/xfree68.vndr/ataritt b/symbols/xfree68.vndr/ataritt
new file mode 100644
index 00000000..c06431fb
--- /dev/null
+++ b/symbols/xfree68.vndr/ataritt
@@ -0,0 +1,161 @@
+// $Xorg: ataritt,v 1.3 2000/08/17 19:54:46 cpqbld Exp $
+
+
+
+// $XFree86: xc/programs/xkbcomp/symbols/xfree68/ataritt,v 1.2 2000/06/23 00:44:37 dawes Exp $
+
+default xkb_symbols "us" {
+
+    name[Group1]= "US/ASCII";
+    key <ESC>  {	[	Escape			]	};
+
+    // Alphanumeric section
+    key <AE01> {	[	  1,	exclam 		]	};
+    key <AE02> {	[	  2,	at		]	};
+    key <AE03> {	[	  3,	numbersign	]	};
+    key <AE04> {	[	  4,	dollar		]	};
+    key <AE05> {	[	  5,	percent		]	};
+    key <AE06> {	[	  6,	asciicircum	]	};
+    key <AE07> {	[	  7,	ampersand	]	};
+    key <AE08> {	[	  8,	asterisk	]	};
+    key <AE09> {	[	  9,	parenleft	]	};
+    key <AE10> {	[	  0,	parenright	]	};
+    key <AE11> {	[ minus,	underscore	]	};
+    key <AE12> {	[ equal,	plus		]	};
+    key <TLDE> {	[ quoteleft,	asciitilde	]	};
+    key <BKSP> {	[	BackSpace		]	};
+
+    key  <TAB> {	[	Tab,	ISO_Left_Tab	]	};
+    key <AD01> {	[	  q,	Q 		]	};
+    key <AD02> {	[	  w,	W		]	};
+    key <AD03> {	[	  e,	E		]	};
+    key <AD04> {	[	  r,	R		]	};
+    key <AD05> {	[	  t,	T		]	};
+    key <AD06> {	[	  y,	Y		]	};
+    key <AD07> {	[	  u,	U		]	};
+    key <AD08> {	[	  i,	I		]	};
+    key <AD09> {	[	  o,	O		]	};
+    key <AD10> {	[	  p,	P		]	};
+    key <AD11> {	[ bracketleft,	braceleft	]	};
+    key <AD12> {	[ bracketright,	braceright	]	};
+    key <RTRN> {	[	Return			]	};
+    key <DELE> {	[	Delete			]	};
+
+    key <LCTL> {	[	Control_L		]	};
+    key <AC01> {	[	  a,	A 		]	};
+    key <AC02> {	[	  s,	S		]	};
+    key <AC03> {	[	  d,	D		]	};
+    key <AC04> {	[	  f,	F		]	};
+    key <AC05> {	[	  g,	G		]	};
+    key <AC06> {	[	  h,	H		]	};
+    key <AC07> {	[	  j,	J		]	};
+    key <AC08> {	[	  k,	K		]	};
+    key <AC09> {	[	  l,	L		]	};
+    key <AC10> {	[ semicolon,	colon		]	};
+    key <AC11> {	[ quoteright,	quotedbl	]	};
+    key <BKSL> {	[ backslash,	bar		]	};
+
+    key <LFSH> {	[ 	 Shift_L		]	};
+    key <AB01> {	[	  z,	Z 		]	};
+    key <AB02> {	[	  x,	X		]	};
+    key <AB03> {	[	  c,	C		]	};
+    key <AB04> {	[	  v,	V		]	};
+    key <AB05> {	[	  b,	B		]	};
+    key <AB06> {	[	  n,	N		]	};
+    key <AB07> {	[	  m,	M		]	};
+    key <AB08> {	[ comma,	less		]	};
+    key <AB09> {	[ period,	greater		]	};
+    key <AB10> {	[ slash,	question	]	};
+    key <RTSH> {	[	 Shift_R		]	};
+
+    key <ALT>  {	[	 Meta_L			]	};
+    key <SPCE> {	[	 space			]	};
+    key <CAPS> {	[	 Caps_Lock		]	};
+    // End alphanumeric section
+
+    // Begin "Function" section
+    key <FK01> {	[	F1		]	};
+    key <FK02> {	[	F2		]	};
+    key <FK03> {	[	F3		]	};
+    key <FK04> {	[	F4		]	};
+    key <FK05> {	[	F5		]	};
+    key <FK06> {	[	F6		]	};
+    key <FK07> {	[	F7		]	};
+    key <FK08> {	[	F8		]	};
+    key <FK09> {	[	F9		]	};
+    key <FK10> {	[	F10		]	};
+    // End "Function" section
+
+    // Begin "Editing" section
+    key <HELP> {	[	Help		]	};
+    key <UNDO> {	[	Undo		]	};
+    key <INS>  {	[	Insert		]	};
+    key <UP>   {	[	Up		]	};
+    key <HOME> {	[	Home,	Clear	]	};
+    key <LEFT> {	[	Left		]	};
+    key <DOWN> {	[	Down		]	};
+    key <RGHT> {	[	Right		]	};
+    // End "Editing" section
+
+    // Begin "Keypad" section
+    key <KPLP> {	[	KP_F1		]	};
+    key <KPRP> {	[	KP_F2		]	};
+    key <KPDV> {	[	KP_Divide	]	};
+    key <KPMU> {	[	KP_Multiply	]	};
+    key <KP7>  {	[	KP_7		]	};
+    key <KP8>  {	[	KP_8		]	};
+    key <KP9>  {	[	KP_9		]	};
+    key <KPSU> {	[	KP_Subtract	]	};
+    key <KP4>  {	[	KP_4		]	};
+    key <KP5>  {	[	KP_5		]	};
+    key <KP6>  {	[	KP_6		]	};
+    key <KPAD> {	[	KP_Add		]	};
+    key <KP1>  {	[	KP_1		]	};
+    key <KP2>  {	[	KP_2		]	};
+    key <KP3>  {	[	KP_3		]	};
+    key <KP0>  {	[	KP_0		]	};
+    key <KPDC> {	[	KP_Decimal	]	};
+    key <KPEN> {	[	KP_Enter	]	};
+    // End "Keypad" section
+
+    // begin modifier mappings
+    modifier_map Shift  { Shift_L, Shift_R };
+    modifier_map Lock   { Caps_Lock };
+    modifier_map Control{ Control_L };
+    modifier_map Mod1	{ Meta_L };
+};
+
+xkb_symbols "de" {
+    include "ataritt(us)"
+
+    name[Group1]= "German";
+
+    // Alphanumeric section
+    key <AE02> {	[	  2,	quotedbl	]	};
+    key <AE03> {	[	  3,	section		]	};
+    key <AE06> {	[	  6,	ampersand	]	};
+    key <AE07> {	[	  7,	slash		]	};
+    key <AE08> {	[	  8,	parenleft	]	};
+    key <AE09> {	[	  9,	parenright	]	};
+    key <AE10> {	[	  0,	equal		]	};
+    key <AE11> {	[    ssharp,	question	]	};
+    key <AE12> {	[ quoteright,	quoteleft	]	};
+    key <TLDE> {	[ numbersign,	asciicircum	]	};
+
+    key <AD06> {	[	  z,	Z		]	};
+    key <AD11> {	[ udiaeresis,	Udiaeresis	],
+			[        at,	backslash	]	};
+    key <AD12> {	[      plus,	asterisk	]	};
+
+    key <AC10> {	[ odiaeresis,	Odiaeresis	],
+			[ bracketleft,	braceleft	]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis	],
+			[ bracketright,	braceright	]	};
+    key <BKSL> {	[ asciitilde,	bar		]	};
+
+    key <LSGT> {	[      less,	greater		]	};
+    key <AB01> {	[	  y,	Y 		]	};
+    key <AB08> {	[     comma,	semicolon	]	};
+    key <AB09> {	[    period,	colon		]	};
+    key <AB10> {	[     minus,	underscore	]	};
+};
diff --git a/symbols/yu b/symbols/yu
new file mode 100644
index 00000000..3d6de22a
--- /dev/null
+++ b/symbols/yu
@@ -0,0 +1,58 @@
+// $XFree86$
+// Serbian 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 (Данило Шеган) <dsegan@gmx.net>
+//  Chusslove Illich (Часлав Илић) <chaslav@sezampro.yu>
+//
+// Modified for inclusion in XFree86 by Danilo Segan <dsegan@gmx.net>
+//  
+//
+
+default partial alphanumeric_keys
+xkb_symbols "default" {
+
+  name[Group1]= "Serbian Latin";
+
+  include "pc/sr(level3)"
+  include "pc/sr(common)"
+  include "pc/sr(latalpha)"
+  include "level3(ralt_switch_multikey)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "unicode" {
+  // 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]= "Serbian Latin Unicode";
+
+  include "pc/yu(default)"
+  include "pc/sr(twoletter)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "yz" {
+  // For those who insist on using "english-position" Z and Y.
+
+  name[Group1]= "Serbian Latin (swap Y, Z)";
+
+  include "pc/yu(default)"
+
+  key <AD06> {   [ y,                   Y,             any,any ]   }; // y
+  key <AB01> {   [ z,                   Z,             any,any ]   }; // z
+};
+
+partial alphanumeric_keys
+xkb_symbols "unicodeyz" {
+  // Unicode, ZHE and Z swapped.
+
+  name[Group1]= "Serbian Latin Unicode (swap ZHE, Z)";
+
+  include "pc/yu(unicode)"
+
+  key <AD06> {   [ zcaron,              Zcaron,        any,any ]   }; // y
+  key <AB01> {   [ z,                   Z,             any,any ]   }; // z
+};
diff --git a/types/README b/types/README
new file mode 100644
index 00000000..039d8f42
--- /dev/null
+++ b/types/README
@@ -0,0 +1,8 @@
+The types component of a keyboard mapping specifies the key types that can be
+associated with the various keyboard keys. The types component can also
+optionally contain real modifiers binding and symbolic names for one
+or more virtual modifiers.
+
+
+
+/* $XFree86$ */
diff --git a/types/basic b/types/basic
new file mode 100644
index 00000000..735fe03d
--- /dev/null
+++ b/types/basic
@@ -0,0 +1,40 @@
+// $Xorg: basic,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+// $XFree86$
+default xkb_types "basic" {
+
+    // Fairly standard definitions for
+    // the four required key types
+
+    virtual_modifiers NumLock;
+
+    type "ONE_LEVEL" {
+	modifiers = None;
+	map[None] = Level1;
+	level_name[Level1]= "Any";
+    };
+
+    type "TWO_LEVEL" {
+	modifiers = Shift;
+	map[Shift] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+    };
+
+    type "ALPHABETIC" {
+        modifiers = Shift+Lock;
+        map[Shift] = Level2;
+        map[Lock] = Level2;
+        level_name[Level1] = "Base";
+        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";
+    };
+};
diff --git a/types/cancel b/types/cancel
new file mode 100644
index 00000000..478c99c4
--- /dev/null
+++ b/types/cancel
@@ -0,0 +1,12 @@
+// $Xorg: cancel,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+partial default xkb_types "Shift_Cancels_Caps" {
+
+override type "TWO_LEVEL" {
+    modifiers = Shift+Lock;
+    map[Shift] = Level2;
+    preserve[Lock]= Lock;
+    level_name[Level1] = "Base";
+    level_name[Level2] = "Shift";
+};
+
+};
diff --git a/types/caps b/types/caps
new file mode 100644
index 00000000..efcae864
--- /dev/null
+++ b/types/caps
@@ -0,0 +1,170 @@
+// $XFree86: xc/programs/xkbcomp/types/caps,v 1.3 2002/11/26 02:14:02 dawes Exp $
+
+// CapsLock uses internal capitalization rules
+// Shift cancels CapsLock
+partial xkb_types "internal" {
+    type "ALPHABETIC" {
+	modifiers = Shift+Lock;
+	map[Shift] = Level2;
+	preserve[Lock] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Caps";
+    };
+
+    type "FOUR_LEVEL_ALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	preserve[Lock] = Lock;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level3;
+	preserve[Lock+LevelThree] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+
+    type "FOUR_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	preserve[Lock] = Lock;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+};
+// CapsLock uses internal capitalization rules
+// Shift doesn't cancel CapsLock
+partial xkb_types "internal_nocancel" {
+    type "ALPHABETIC" {
+	modifiers = Shift;
+	map[Shift] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Caps";
+    };
+
+    type "FOUR_LEVEL_ALPHABETIC" {
+	modifiers = Shift+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+
+    type "FOUR_LEVEL_SEMIALPHABETIC" {
+        // the same as FOUR_LEVEL_ALPHABETIC
+	modifiers = Shift+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+};
+// CapsLock acts as Shift with locking
+// Shift cancels CapsLock
+partial xkb_types "shift" {
+    type "ALPHABETIC" {
+	modifiers = Shift+Lock;
+	map[Shift] = Level2;
+	map[Lock] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Caps";
+    };
+
+    type "FOUR_LEVEL_ALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level4;
+	map[Shift+Lock+LevelThree] =  Level3;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+
+    type "FOUR_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+};
+// CapsLock acts as Shift with locking
+// Shift doesn't cancel CapsLock
+partial xkb_types "shift_nocancel" {
+    type "ALPHABETIC" {
+	modifiers = Shift+Lock;
+	map[Shift] = Level2;
+	map[Lock] = Level2;
+	map[Shift+Lock] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Caps";
+    };
+
+    type "FOUR_LEVEL_ALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] =  Level1;
+	map[Shift] = Level2;
+	map[Lock] =  Level2;
+	map[Shift+Lock] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level4;
+	map[Shift+Lock+LevelThree] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+
+    type "FOUR_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] =  Level1;
+	map[Shift] = Level2;
+	map[Lock] =  Level2;
+	map[Shift+Lock] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+};
diff --git a/types/complete b/types/complete
new file mode 100644
index 00000000..ecf6ec13
--- /dev/null
+++ b/types/complete
@@ -0,0 +1,14 @@
+// $Xorg: complete,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+//
+//
+//
+//
+// $XFree86: xc/programs/xkbcomp/types/complete,v 1.2 2001/05/18 23:35:35 dawes Exp $
+
+default xkb_types "complete" {
+    include "basic"
+    include "mousekeys"
+    include "pc"
+    include "iso9995"
+    include "extra"
+};
diff --git a/types/default b/types/default
new file mode 100644
index 00000000..5d6ba744
--- /dev/null
+++ b/types/default
@@ -0,0 +1,14 @@
+// $Xorg: default,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+//
+//
+//
+//
+// $XFree86$
+
+default xkb_types "default" {
+    include "basic"
+    include "pc"
+    include "iso9995"
+    include "extra"
+    include "mousekeys"
+};
diff --git a/types/extra b/types/extra
new file mode 100644
index 00000000..d9907e56
--- /dev/null
+++ b/types/extra
@@ -0,0 +1,96 @@
+// $XFree86: xc/programs/xkbcomp/types/extra,v 1.3 2002/11/26 02:14:02 dawes Exp $
+
+partial default xkb_types "default" {
+    // Definition for a key type used for the czech keymap, for instance.
+    // Defines style a with four level shift. It is similar to three_level
+    // type used for iso9995 but it lets the shift key behave "normally".
+
+    virtual_modifiers LevelThree;
+
+    type "FOUR_LEVEL" {
+        modifiers = Shift+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";  
+	level_name[Level4] = "Shift Alt";  
+    };
+
+    type "FOUR_LEVEL_ALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level4;
+	map[Shift+Lock+LevelThree] =  Level3;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift Alt";
+    };
+
+    type "FOUR_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level4;
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Alt Base";
+	level_name[Level4] = "Shift 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 
+// (forms like LJ, Lj, and lj; NJ, Nj, and nj; etc)
+//
+// Could probably prove useful for other languages too, so it
+// better be renamed
+
+    type "SERBIAN_CAPS" {
+        modifiers = Shift+Lock+LevelThree;
+        map[None] = Level1;
+        map[Shift] = Level2;
+        map[Lock] = Level4;
+        map[LevelThree] = Level3;
+        map[Shift+LevelThree] = Level4;
+        map[Lock+LevelThree] =  Level3;
+        map[Lock+Shift+LevelThree] = Level3;
+        preserve[Lock]= Lock;
+        preserve[Lock+LevelThree]= Lock;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "AltGr Base";
+        level_name[Level4] = "Shift AltGr";
+    };
+};
+
diff --git a/types/iso9995 b/types/iso9995
new file mode 100644
index 00000000..80f3ee5c
--- /dev/null
+++ b/types/iso9995
@@ -0,0 +1,20 @@
+// $Xorg: iso9995,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+partial default xkb_types "default" {
+
+    // Definition for a key type which 
+    // can be used to implement ISO9995
+    // style level three shift
+    virtual_modifiers LevelThree;
+
+    type "THREE_LEVEL" {
+	modifiers = Shift+LevelThree;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level3;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift";
+	level_name[Level3] = "Level3";
+    };
+};
+
diff --git a/types/mousekeys b/types/mousekeys
new file mode 100644
index 00000000..85440ca7
--- /dev/null
+++ b/types/mousekeys
@@ -0,0 +1,13 @@
+// $Xorg: mousekeys,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+// 
+partial default xkb_types "default" {
+    virtual_modifiers Alt;
+
+    type "SHIFT+ALT" {
+   	modifiers = Shift+Alt;
+    	map[Shift+Alt] = Level2;
+    	level_name[Level1] = "Base";
+	level_name[Level2] = "Shift+Alt";
+    };
+};
+
diff --git a/types/numpad b/types/numpad
new file mode 100644
index 00000000..46b6822c
--- /dev/null
+++ b/types/numpad
@@ -0,0 +1,13 @@
+// $XFree86$
+
+xkb_types "microsoft" {
+
+    type "KEYPAD" {
+        modifiers = Shift+NumLock;
+        map[None] = Level1;
+        preserve[Shift] = Shift;
+        map[NumLock] = Level2;
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Number";
+    };
+};
diff --git a/types/pc b/types/pc
new file mode 100644
index 00000000..5671f426
--- /dev/null
+++ b/types/pc
@@ -0,0 +1,33 @@
+// $Xorg: pc,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+// 
+
+partial default xkb_types "default" {
+
+    // Some types that are necessary
+    // for a full implementation of
+    // a PC compatible keyboard.
+    virtual_modifiers Alt;
+
+    type "PC_BREAK" {
+	modifiers = Control;
+	map[None] = Level1;
+	map[Control] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Control";
+    };
+
+    type "PC_SYSRQ" {
+	modifiers = Alt;
+	map[None] = Level1;
+	map[Alt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Alt";
+    };
+
+    type "CTRL+ALT" {
+	modifiers = Control+Alt;
+	map[Control+Alt] = Level2;
+	level_name[Level1] = "Base";
+	level_name[Level2] = "Ctrl+Alt";
+    };
+};
diff --git a/xfree86_xkb_xml.spec.in b/xkbdesc.spec.in
index b0e8f44c..b0e8f44c 100644
--- a/xfree86_xkb_xml.spec.in
+++ b/xkbdesc.spec.in